From: Andreas Proschofsky Date: Fri, 14 Jan 2005 15:34:24 +0000 (+0000) Subject: another fix for java build problems, closes bug #77866 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1ab2a54dc2902020bf5ebd2f61412ccd40ec2203;p=gentoo.git another fix for java build problems, closes bug #77866 Package-Manager: portage-2.0.51-r12 --- diff --git a/app-office/mozilla-sunbird-bin/Manifest b/app-office/mozilla-sunbird-bin/Manifest index ef55ee439d0d..3474b3c5fbcd 100644 --- a/app-office/mozilla-sunbird-bin/Manifest +++ b/app-office/mozilla-sunbird-bin/Manifest @@ -1,6 +1,6 @@ -MD5 550181fddce5b2a41b9bd94cd9adaf4d mozilla-sunbird-bin-0.2.20041112.ebuild 1843 -MD5 7a4b51fff631f8103ff204112dccd184 mozilla-sunbird-bin-0.2.20040812.ebuild 1843 -MD5 4389796ba1fd45a10af43594468812c9 ChangeLog 919 +MD5 5a249b0c45d92eb8e45f228f55673ba2 mozilla-sunbird-bin-0.2.20041112.ebuild 1820 +MD5 f0c0c44ab58e4351f888f36dc38133ed mozilla-sunbird-bin-0.2.20040812.ebuild 1820 +MD5 e522601b504aac711725714b8427b6f7 ChangeLog 1097 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 MD5 e0bba3fd8ec5b2e7a7894d053162e4ad files/digest-mozilla-sunbird-bin-0.2.20040812 80 MD5 f7ff8c3d10e4af0dc6b1cff980261255 files/digest-mozilla-sunbird-bin-0.2.20041112 80 diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index 1ce0e97730f9..c93e7e0d9ae8 100644 --- a/app-office/openoffice-ximian/ChangeLog +++ b/app-office/openoffice-ximian/ChangeLog @@ -1,10 +1,14 @@ # 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.89 2005/01/14 15:28:10 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.90 2005/01/14 15:34:24 suka Exp $ + + 14 Jan 2005; Andreas Proschofsky + +files/1.1.3/javafix.patch, openoffice-ximian-1.3.7.ebuild: + Another fix for java build problems, closes bug #77866 14 Jan 2005; Andreas Proschofsky files/1.1.3/gentoo-1.3.7.patch: - Fix for building with -gnome and -kde + Fix for building with -gnome and -kde, closes bug#77911 *openoffice-ximian-1.3.7 (13 Jan 2005) diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest index 8889786e42cd..133403eb2abe 100644 --- a/app-office/openoffice-ximian/Manifest +++ b/app-office/openoffice-ximian/Manifest @@ -1,7 +1,7 @@ MD5 f881d3e35a8d3a9c27e1d29984b9d3fd openoffice-ximian-1.3.6.ebuild 16873 MD5 26f1b4de2d99cba28eb2b09825c69475 openoffice-ximian-1.3.5-r1.ebuild 16129 -MD5 7dda26d4577d9455b4bc3c1743bb192e openoffice-ximian-1.3.7.ebuild 17017 -MD5 49b294338ed66f44e93d86d9fc6fde58 ChangeLog 22209 +MD5 6b0e7cc7c057b13995f25e47bf5d7685 openoffice-ximian-1.3.7.ebuild 17085 +MD5 0c34da2ed426b5b20ee6c676752737ab ChangeLog 22400 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300 MD5 b7a3ab0336f7e514b6641e5871c1bbbb files/digest-openoffice-ximian-1.3.5-r1 437 MD5 2595967ac130a541e50bffc75e105041 files/digest-openoffice-ximian-1.3.6 502 @@ -17,6 +17,7 @@ MD5 04621a43bfeb4fac8077a770a8eba7e3 files/1.1.3/gcc34.patch.bz2 33661 MD5 a5ef896f6a59b91fa3367c92de077769 files/1.1.3/gentoo-1.3.6.patch 597 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.3/ximian-openoffice.applications 980 MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.3/gentoo-splash.diff 890 +MD5 6144a4583b7cfd7116e10baba31054a0 files/1.1.3/javafix.patch 1590 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.3/ximian-openoffice.keys 6298 MD5 03a4e552b53cb7fc9da8d844369ff647 files/1.1.3/gentoo-1.3.7.patch 995 MD5 d36ed3c83eb2dc4c5f52c2cd24f023cf files/1.1.3/xooffice-wrapper-1.3 9336 diff --git a/app-office/openoffice-ximian/files/1.1.3/javafix.patch b/app-office/openoffice-ximian/files/1.1.3/javafix.patch new file mode 100644 index 000000000000..f5c242ef34e2 --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.3/javafix.patch @@ -0,0 +1,27 @@ +--- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx 24 Apr 2003 13:20:29 -0000 1.4 ++++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx 27 Dec 2004 09:35:38 -0000 +@@ -184,7 +184,12 @@ + { + jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;"); + if(id) +- return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), ::rtl::OUString(),java_lang_String(NULL,NULL)); ++ return copyArrayAndDelete( ++ t.pEnv, ++ (jobjectArray)t.pEnv->GetObjectField( object, id), ++ static_cast< const ::rtl::OUString* >( NULL ), ++ static_cast< const java_lang_String* >( NULL ) ++ ); + } //t.pEnv + return Sequence< ::rtl::OUString>(); + } +--- connectivity/source/inc/java/tools.hxx 1 Nov 2002 10:58:49 -0000 1.5 ++++ connectivity/source/inc/java/tools.hxx 27 Dec 2004 09:35:42 -0000 +@@ -101,7 +101,7 @@ + + java_util_Properties* createStringPropertyArray(JNIEnv *pEnv,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + +- template ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const T& _rD1,const JT& _rD2) ++ template ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array, const T*, const JT* ) + { + ::com::sun::star::uno::Sequence< T > xOut; + if(_Array) diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild index 890d19c8e41e..2096aabfdfb9 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.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.7.ebuild,v 1.1 2005/01/12 23:05:13 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild,v 1.2 2005/01/14 15:34:24 suka Exp $ # Notes: # @@ -248,6 +248,9 @@ src_unpack() { epatch ${FILESDIR}/${OO_VER}/STLport-vector.patch fi + #Another java problem + epatch ${FILESDIR}/${OO_VER}/javafix.patch + #Add our own splash screen epatch ${FILESDIR}/${OO_VER}/gentoo-splash.diff