diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-01-14 15:49:06 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-01-14 15:49:06 +0000 |
| commit | 57d57308a60a946e47f8f32352f376df568931f1 (patch) | |
| tree | 470d7b1b6b0b36937d9a0923804534bc870cad29 /app-office/openoffice | |
| parent | added ~amd64 to KEYWORDS. fixes bug #77950. (diff) | |
| download | historical-57d57308a60a946e47f8f32352f376df568931f1.tar.gz historical-57d57308a60a946e47f8f32352f376df568931f1.tar.bz2 historical-57d57308a60a946e47f8f32352f376df568931f1.zip | |
java build fix, closing bug #77866
Package-Manager: portage-2.0.51-r12
Diffstat (limited to 'app-office/openoffice')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/Manifest | 5 | ||||
| -rw-r--r-- | app-office/openoffice/files/1.1.4/javafix.patch | 27 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-1.1.4.ebuild | 5 |
4 files changed, 39 insertions, 4 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 6e41f7ed6cad..d723291aedc5 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.98 2005/01/12 13:50:33 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.99 2005/01/14 15:49:06 suka Exp $ + + 14 Jan 2005; Andreas Proschofsky <suka@gentoo.org> + +files/1.1.4/javafix.patch, openoffice-1.1.4.ebuild: + Another fix for a java related build problem, closes bug #77866 12 Jan 2005; Andreas Proschofsky <suka@gentoo.org> : Mark 1.1.4 stable on x86 diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 46e7049b7383..ac6f7d461e92 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,6 +1,6 @@ -MD5 a028d6832e9a3bc9fe8b4e7e6c3daf78 openoffice-1.1.4.ebuild 16021 +MD5 6037ced41d7263b24e50b41dd966167b openoffice-1.1.4.ebuild 16085 MD5 db4fc1842f4f355e5c4c875ef6b61fdc openoffice-1.1.3.ebuild 15689 -MD5 b8d5339498cb405eaf69ae1ecb276723 ChangeLog 21627 +MD5 d04a1c7cf9b05f06f7664f8b06966c7d ChangeLog 21802 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 MD5 fd065af92828cda546d797e6c86d102b files/digest-openoffice-1.1.3 73 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4 325 @@ -12,6 +12,7 @@ MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.4/gcc34.patch.bz2 34342 MD5 5b5b02ecb719c0a553b740edd3544bc7 files/1.1.4/ooffice-wrapper-1.3 9471 MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393 MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.4/openoffice-java.patch 2092 +MD5 6144a4583b7cfd7116e10baba31054a0 files/1.1.4/javafix.patch 1590 MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.4/gcc34-nojava-fix.patch 329 MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.4/gcc34-nptl-fix.patch 618 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766 diff --git a/app-office/openoffice/files/1.1.4/javafix.patch b/app-office/openoffice/files/1.1.4/javafix.patch new file mode 100644 index 000000000000..f5c242ef34e2 --- /dev/null +++ b/app-office/openoffice/files/1.1.4/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<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const T& _rD1,const JT& _rD2)
++ template<class T,class JT> ::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/openoffice-1.1.4.ebuild b/app-office/openoffice/openoffice-1.1.4.ebuild index 8404aabb6d3e..3df27fb4b19f 100644 --- a/app-office/openoffice/openoffice-1.1.4.ebuild +++ b/app-office/openoffice/openoffice-1.1.4.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/openoffice-1.1.4.ebuild,v 1.5 2005/01/12 13:46:30 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.6 2005/01/14 15:49:06 suka Exp $ # Notes: # @@ -239,6 +239,9 @@ src_unpack() { #Fix for newer Freetype epatch ${FILESDIR}/${PV}/freetype-217.patch + #Another java problem + epatch ${FILESDIR}/${PV}/javafix.patch + # GCC 3.4.x fixes if [ "$(gcc-version)" = "3.4" ] then |