diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-06-24 06:18:31 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-06-24 06:18:31 +0000 |
| commit | f2cc31aea63ff20f543c0a004db6b42bd75360da (patch) | |
| tree | 462e249e28ca2a79bd546bfe76350baaab8db9f2 /app-office | |
| parent | disable SDL support for now since the code wants sdl-mixer internal functions (diff) | |
| download | historical-f2cc31aea63ff20f543c0a004db6b42bd75360da.tar.gz historical-f2cc31aea63ff20f543c0a004db6b42bd75360da.tar.bz2 historical-f2cc31aea63ff20f543c0a004db6b42bd75360da.zip | |
Fix for vcl/gtk problem
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'app-office')
4 files changed, 44 insertions, 4 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index 2bf6581ed4b2..d534d75676f4 100644 --- a/app-office/openoffice-ximian/ChangeLog +++ b/app-office/openoffice-ximian/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/openoffice-ximian # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.133 2005/06/17 06:35:06 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.134 2005/06/24 06:18:31 suka Exp $ + + 24 Jun 2005; Andreas Proschofsky <suka@gentoo.org> + +files/1.1.4/vcl-gtk-mainloop-m79.diff, openoffice-ximian-1.3.14.ebuild: + Fix for broken oslCondition reset / signalling in vcl / gtk. This silently + lifts the version to 1.3.15, just not doing a revision bump for a sole + patch. *openoffice-ximian-1.3.14 (17 Jun 2005) diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest index 93aac1342a15..d4253d51404d 100644 --- a/app-office/openoffice-ximian/Manifest +++ b/app-office/openoffice-ximian/Manifest @@ -1,7 +1,7 @@ -MD5 c9bc539e169e41a76925afe6cab7f08c openoffice-ximian-1.3.14.ebuild 17815 +MD5 7a718b7002feb46ed1a9817261e02e24 openoffice-ximian-1.3.14.ebuild 17901 MD5 ce67e2b1dc445c93428e0abc29835bee openoffice-ximian-1.3.6-r1.ebuild 17073 MD5 ca8add812e406335562b69941a364865 openoffice-ximian-1.3.9-r1.ebuild 17907 -MD5 c6ae212c11e7bb9f1fe6dcb7ed3db9b9 ChangeLog 32491 +MD5 2b59c723d76c0427398f73132b779b98 ChangeLog 32779 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300 MD5 2595967ac130a541e50bffc75e105041 files/digest-openoffice-ximian-1.3.6-r1 502 MD5 e84e07ee231b9ceaabacc5556a63f647 files/digest-openoffice-ximian-1.3.9-r1 492 @@ -27,6 +27,7 @@ MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576 MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.4/getcompver.awk.patch 418 MD5 964398ef88829e5a2935d0c0f8389c9d files/1.1.4/xooffice-wrapper-1.3 6091 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598 +MD5 d14fafce0cfe0c8d399902a2c3d83e64 files/1.1.4/vcl-gtk-mainloop-m79.diff 1130 MD5 6938dc2e28e840cebf4fdbde9d6e2d4b files/1.1.4/gentoo-1.3.9.patch 859 MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.4/pthreadlink-fix.patch 1163 MD5 3f008e2c5595512c7f6306b1a722612e files/1.1.4/nptl.patch 243 diff --git a/app-office/openoffice-ximian/files/1.1.4/vcl-gtk-mainloop-m79.diff b/app-office/openoffice-ximian/files/1.1.4/vcl-gtk-mainloop-m79.diff new file mode 100644 index 000000000000..b5a4f44b2cd3 --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.4/vcl-gtk-mainloop-m79.diff @@ -0,0 +1,30 @@ +=================================================================== +RCS file: /cvs/gnome/ooo-build/patches/vclplug/Attic/vcl-gtk-mainloop-m79.diff,v +retrieving revision 1.1.2.3 +retrieving revision 1.1.2.4 +diff -u -r1.1.2.3 -r1.1.2.4 +--- patches/vclplug/vcl-gtk-mainloop-m79.diff 2005/04/04 14:14:54 1.1.2.3 ++++ patches/vclplug/vcl-gtk-mainloop-m79.diff 2005/06/23 11:52:33 1.1.2.4 +@@ -120,7 +120,21 @@ + diff -u -p -u -r1.4 conditn.c + --- sal/osl/unx/conditn.c 16 Mar 2001 13:14:43 -0000 1.4 + +++ sal/osl/unx/conditn.c 10 Mar 2005 10:11:43 -0000 +-@@ -278,7 +278,7 @@ oslConditionResult SAL_CALL osl_waitCond ++@@ -234,13 +234,6 @@ sal_Bool SAL_CALL osl_resetCondition(osl ++ } ++ ++ pCond->m_State = sal_False; ++- nRet = pthread_cond_broadcast(&pCond->m_Condition); ++- if ( nRet != 0 ) ++- { ++- OSL_TRACE("osl_resetCondition : condition broadcast failed. Errno: %d; %s\n", ++- nRet, strerror(nRet)); ++- return sal_False; ++- } ++ ++ nRet = pthread_mutex_unlock(&pCond->m_Lock); ++ if ( nRet != 0 ) ++@@ -278,7 +271,7 @@ oslConditionResult SAL_CALL osl_waitCond + return osl_cond_result_error; + } + diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.14.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.14.ebuild index 8061405cb0b5..f665a3e5947e 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.14.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.14.ebuild,v 1.1 2005/06/17 06:35:06 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.14.ebuild,v 1.2 2005/06/24 06:18:31 suka Exp $ # Notes: # @@ -254,6 +254,9 @@ src_unpack() { cd ${PATCHDIR} epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}.patch + # Correct some broken patch + epatch ${FILESDIR}/${OO_VER}/vcl-gtk-mainloop-m79.diff + cd ${S} #Still needed: The STLport patch |