diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-01-14 15:34:24 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-01-14 15:34:24 +0000 |
| commit | 4865ca9b9616742fe5a72b03f609d312343881a2 (patch) | |
| tree | acff5cdf2c43fa37020e93468de8068f8fdc6204 /app-office/openoffice-ximian | |
| parent | Fix for -gnome -kde (diff) | |
| download | gentoo-2-4865ca9b9616742fe5a72b03f609d312343881a2.tar.gz gentoo-2-4865ca9b9616742fe5a72b03f609d312343881a2.tar.bz2 gentoo-2-4865ca9b9616742fe5a72b03f609d312343881a2.zip | |
another fix for java build problems, closes bug #77866
(Portage version: 2.0.51-r12)
Diffstat (limited to 'app-office/openoffice-ximian')
| -rw-r--r-- | app-office/openoffice-ximian/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/files/1.1.3/javafix.patch | 27 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild | 5 |
3 files changed, 37 insertions, 3 deletions
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 <suka@gentoo.org> + +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 <suka@gentoo.org> 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/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<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-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 |