[arch-commits] CVS update of extra/office/openoffice-base (4 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Sat Nov 17 08:32:37 UTC 2007


    Date: Saturday, November 17, 2007 @ 03:32:37
  Author: andyrtr
    Path: /home/cvs-extra/extra/office/openoffice-base

   Added: internal-db-no-java_oog680_m9.diff (1.1)
          jvmfwk-gij-paths_oog680_m9.diff (1.1)
Modified: ChangeLog (1.1 -> 1.2) PKGBUILD (1.59 -> 1.60)

preprared 2.3.1 RC1 for testing


------------------------------------+
 ChangeLog                          |    5 
 PKGBUILD                           |   87 ++------
 internal-db-no-java_oog680_m9.diff |  367 +++++++++++++++++++++++++++++++++++
 jvmfwk-gij-paths_oog680_m9.diff    |   21 ++
 4 files changed, 421 insertions(+), 59 deletions(-)


Index: extra/office/openoffice-base/ChangeLog
diff -u extra/office/openoffice-base/ChangeLog:1.1 extra/office/openoffice-base/ChangeLog:1.2
--- extra/office/openoffice-base/ChangeLog:1.1	Fri Oct 19 17:36:40 2007
+++ extra/office/openoffice-base/ChangeLog	Sat Nov 17 03:32:37 2007
@@ -1,3 +1,8 @@
+openoffice-base 2.3.1-0.1
+- make use of !emptydir
+- adopt patch changes from devel pkg src680_m236
+- prepare 2.3.1 release - this is rc1
+
 openoffice-base 2.3.0-4
 - fixed weird gtk behavior - http://bugs.archlinux.org/task/8209
 - added missing spell wizard
Index: extra/office/openoffice-base/PKGBUILD
diff -u extra/office/openoffice-base/PKGBUILD:1.59 extra/office/openoffice-base/PKGBUILD:1.60
--- extra/office/openoffice-base/PKGBUILD:1.59	Fri Oct 19 17:38:32 2007
+++ extra/office/openoffice-base/PKGBUILD	Sat Nov 17 03:32:37 2007
@@ -2,38 +2,40 @@
 # Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
 
 pkgname=openoffice-base
-pkgver=2.3.0
-pkgrel=4
+pkgver=2.3.1
+pkgrel=0.1
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
-#_OO_milestone=oog680-m5
-_OO_milestone=OOG680_m5
+_OO_milestone=oog680-m9
+#_OO_milestone=OOG680_m9
 license=('LGPL')
 url="http://www.openoffice.org"
 install=openoffice.install
 depends=('ttf-dejavu' 'curl' 'desktop-file-utils' 'fontconfig>=2.4' 'gtk2>=2.10.11'
-         'hunspell>=1.1.5' "icu>=3.8" 'perl' 'python>=2.5' 'libwpd' 'libsndfile'
+         'hunspell>=1.1.5' 'perl' 'python>=2.5' 'libwpd' 'libsndfile'
          'startup-notification>=0.9' 'xalan-java' 'libxaw' 'libcups' 'hsqldb-java'
-         'gstreamer0.10-base' 'neon>=0.27.0' 'dbus-glib' 'nss') # 'xmlsec' - broken
+         'gstreamer0.10-base' 'neon>=0.27.0' 'dbus-glib' 'nss' 'pstoedit')
+	# 'xmlsec' - broken 
+	# "icu>=3.8" broken
 # for gnu java/ecj
-makedepends=('bison' 'ccache' 'cvs' 'curl' 'findutils'
-             'flex' 'gawk' 'gcc-libs' 'kdelibs' 'libart-lgpl' 'pam' 'sane' 'zip'
-             'perl-archive-zip' 'pkgconfig'  'unzip' 'xulrunner>=1.8.1.3'
-             'java-gcj-compat' 'apache-ant' 'cairo')	# 'boost' - we use internal one. jfreereport is broken
+makedepends=('bison' 'cvs' 'curl' 'findutils' 'flex' 'gawk' 'gcc-libs' 'kdelibs' 
+             'libart-lgpl' 'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig'  'unzip'
+              'xulrunner>=1.8.1.3' 'java-gcj-compat' 'apache-ant' 'cairo' 'ccache')
+	# 'boost' - we use internal one. jfreereport is broken with system-boost/has no effect on size
 # for SUN Java
 #makedepends=('boost' 'bison' 'ccache' 'cvs' 'curl' 'findutils'
 #             'flex' 'gawk' 'gcc-libs' 'kdelibs' 'libart-lgpl' 'pam' 'sane' 'zip'
 #             'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.8.1.3'
 #             'jdk' 'apache-ant' 'cairo')
 
-MIRROR="ftp://ftp.gwdg.de/pub/openoffice/" # has all late but is fast
+#MIRROR="ftp://ftp.gwdg.de/pub/openoffice/" # has all late but is fast
 #MIRROR=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/
 #MIRROR=ftp://ftp-1.gwdg.de/pub/openoffice/developer
 #MIRROR=ftp://ftp.linux.cz/pub/localization/OpenOffice.org/
 #MIRROR=http://go-oo.org/packages/SRC680/
-#MIRROR=http://go-oo.org/packages/OOG680/
+MIRROR=http://download.go-oo.org/OOG680/
 
-source=($MIRROR/stable/${pkgver}/OOo_${pkgver}_src_{core,binfilter,system}.tar.bz2
+source=(#$MIRROR/stable/${pkgver}/OOo_${pkgver}_src_{core,binfilter,system}.tar.bz2
 	#$MIRROR/contrib/rc/${pkgver}/OOo_${pkgver}_${_OO_milestone}_src_{core,binfilter}.tar.bz2
 	#$MIRROR/contrib/rc/${pkgver}/OOo_${_OO_milestone}_src_{core,binfilter}.tar.bz2
 	#$MIRROR/contrib/rc/2.2.0rc3/OOo_${pkgver}rc3_src_{core,binfilter}.tar.bz2
@@ -41,15 +43,15 @@
 	#$MIRROR/stable/${pkgver}/OOo_${pkgver}_src_{core,binfilter}.tar.bz2
 	#$MIRROR/devel/build/Sources/OOo_${pkgver}_src_{core,binfilter}.tar.bz2
 	#$MIRROR/SRC680_m223/OOo-Dev_SRC680_m224_src_{core,binfilter}.tar.bz2
-	#$MIRROR/${_OO_milestone}-{core,binfilter,system}.tar.bz2
+	$MIRROR/${_OO_milestone}-{core,binfilter,system}.tar.bz2
 	intro.bmp
 	template.desktop
 	default-no-startup-wizard_oog680_m1.diff
 	default-system-fpicker_oog680_m1.diff
-	jvmfwk-gij-paths_oog680_m1.diff
+	jvmfwk-gij-paths_oog680_m9.diff
 	buildfix-sc-vba_oog680_m1.diff
 	fix-dba-connectivity-i80338_oog680_m1.diff
-	internal-db-no-java_oog680_m1.diff
+	internal-db-no-java_oog680_m9.diff
 	gstreamer-support_oog680_m1.diff
 	fix-font-hinting_oog680_m2.diff
 	fix-invisible-text.diff
@@ -60,34 +62,11 @@
 	libxmlsec-findcerts_oog_m5.diff
 	soffice-detect-mozilla-certificates_oog_m5.diff
 	ooo82608.vcl.gtkbadfree_oog_m5.diff
+	detect_db46_src233.diff
 	#http://oooconv.free.fr/fontooo/FontOOo.sxw
 	FontOOo_1.7.1.sxw # from http://www.openoffice.org/issues/show_bug.cgi?id=81102
 	awt_x86_64.diff)
-options=('!distcc' 'ccache' '!strip')
-md5sums=('d447057b2af58020234cb9db6c782bfa'
-         '27a1406a825ed465c71c39f3abfd622a'
-         '60c56b99855143fc0c8f7e581f214b5b'
-         '72dba5b4cd94d4439e06f75769402c6f'
-         'd9475c3aaf879c294bd9bc692071bd41'
-         '0faab33566196ddc9c405d68cf614663'
-         '39e4c1b1e864b22ee4650b2bff44c695'
-         '16fd0652748039de238dd3374b364d0f'
-         '006bd83b71d1d85ad0c75478b17fabf6'
-         '777754df8f9a1d5d98a4dac2142f02d8'
-         '2b218f0c8672329eeaea8c1be1297a6d'
-         '7c3e7b9a3793298bee1cb774b63b93a5'
-         'cfaf776e3254123f764c31cc93621e8b'
-         '509697a7da6508ac9377b7750a57bfc4'
-         '4c76c07e867d51c416ea258220a90a6a'
-         '5fe090550df3ce4a3a6f203ab50d07b5'
-         '4f0da68601120267be643c9cdaca2772'
-         'a11248bfee6486e5b9b5997c2bee7dd9'
-         '3353d801d4f3560ed1f5707ab5f02e49'
-         'a8b96e9d0ce92a8f6690f277b1cfacc9'
-         '4271702d6e9e912b663d3e2d9b8a17e8'
-         '1cc4e58f28093f179378dc3bd69986af'
-         '1fc1ca5205730655eab2d2e119aa06fe'
-         '83bb5e235c4e4062eed404829d760c14')
+options=('!distcc' 'ccache' '!strip' '!emptydirs')
 
 # see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
 
@@ -105,19 +84,17 @@
 
 	# build fixes
 	# gcj build fix to find our gcj libs paths
-	patch -Np0 -i ../jvmfwk-gij-paths_oog680_m1.diff || return 1
+	patch -Np0 -i ../jvmfwk-gij-paths_oog680_m9.diff || return 1
 	# fix build with internal xmlsec
 	patch -Np0 -i ../libxmlsec-system-nss_oog_m5.diff || return 1
 	# fixes a build failure in scalc when vba support is enabled
 	patch -Np0 -i ../buildfix-sc-vba_oog680_m1.diff || return 1
+	# detect new db4.6
+	patch -Np0 -i ../detect_db46_src233.diff || return 1
 	# allows internal Berkely db to build without java bindings.
-	patch -Np0 -i ../internal-db-no-java_oog680_m1.diff || return 1
+	patch -Np0 -i ../internal-db-no-java_oog680_m9.diff || return 1
 	# allows to build against neoin 0.27
 	patch -Np1 -i ../neon27-oog680_m3.diff || return 1
-	# allows to build against neoin 0.27
-	patch -Np0 -i ../buildfix-agg_2_5_oog680_m3.diff || return 1
-	# allows to build against new system curl
-	patch -Np0 -i ../ucb-no-CURL_NO_OLDIES_oog_m5.diff || return 1
 
 	# allows xmlsec to be able to read the format of the digital certificates.
 	patch -Np0 -i ../libxmlsec-findcerts_oog_m5.diff || return 1
@@ -129,8 +106,6 @@
 	# important bugfixes
 	# fix for invisible text with gcc 4.2 http://www.openoffice.org/issues/show_bug.cgi?id=78417
 	patch -Np0 -i ../fix-invisible-text.diff || return 1
-	# fix a crash related to new gtk - fixes http://bugs.archlinux.org/task/8209
-	patch -Np0 -i ../ooo82608.vcl.gtkbadfree_oog_m5.diff || return 1
 
 	# fix font hinting
 	patch -Np0 -i ../fix-font-hinting_oog680_m2.diff || return 1
@@ -147,11 +122,11 @@
 
 	# arch related fixes & configure options
 	if [ "$CARCH" = "i686" ]; then
-	  EXTRAOPTS="--with-arch=x86 "
+	  EXTRAOPTS="--with-arch=x86 --without-stlport4 "
 	fi
 
 	if [ "$CARCH" = "x86_64" ]; then
-	  EXTRAOPTS="--with-arch=x86_64"
+	  EXTRAOPTS="--with-arch=x86_64 "
           # fixes to build with SUN jdk/jre
           # http://qa.openoffice.org/issues/show_bug.cgi?id=74749
         #  sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g" $startdir/src/${_OO_milestone}/solenv/inc/libs.mk
@@ -209,7 +184,6 @@
 	--with-system-stdlibs\
 	--with-system-xrender-headers\
 	--with-system-zlib\
-	--with-system-icu\
 	--without-fonts\
 	--without-myspell-dicts\
 	--without-nas\
@@ -228,11 +202,10 @@
 	--with-xml-apis-jar=/usr/share/java/xml-apis.jar \
 	--with-serializer-jar=/usr/share/java/serializer.jar \
 	--with-use-shell=bash\
-	--with-gcc-speedup=ccache \
 	 $EXTRAOPTS || return 1
 
-#	--with-xulrunner\
 #	--with-system-xmlsec\ - digital signatures are broken with system xmlsec, so we use internal one
+#	--with-system-icu\ - they expect a patched icu we don't have
 
 	cd ..
 
@@ -311,11 +284,7 @@
 	touch $startdir/pkg/opt/openoffice/share/dict/ooo/.directory
 	touch $startdir/pkg/opt/openoffice/presets/template/.directory
 	touch $startdir/pkg/opt/openoffice/share/extension/install/.directory
-	rmdir $startdir/pkg/opt/openoffice/program/{addin,plugin}
-	rmdir $startdir/pkg/opt/openoffice/presets/psprint/{driver,fontmetric}
-	rmdir $startdir/pkg/opt/openoffice/presets/uno_packages/cache
-	rmdir $startdir/pkg/opt/openoffice/presets/{autocorr,store,Scripts,wordbook,backup,temp,psprint,uno_packages}
-	rm -rf $startdir/pkg/opt/openoffice/share/uno_packages
+
 	# remove unecessary temp files if they exist 
 	rm -f  $startdir/pkg/opt/openoffice/program/root*.dat
 	rm -f  $startdir/pkg/opt/openoffice/program/root*.dat.*
Index: extra/office/openoffice-base/internal-db-no-java_oog680_m9.diff
diff -u /dev/null extra/office/openoffice-base/internal-db-no-java_oog680_m9.diff:1.1
--- /dev/null	Sat Nov 17 03:32:37 2007
+++ extra/office/openoffice-base/internal-db-no-java_oog680_m9.diff	Sat Nov 17 03:32:37 2007
@@ -0,0 +1,367 @@
+--- berkeleydb/db-4.2.52.patch	2007-10-25 16:04:02.000000000 +0000
++++ berkeleydb/db-4.2.52.patch.new	2007-10-31 07:24:45.000000000 +0000
+@@ -1639,233 +1639,7 @@
+ ! SLOFILES= $(SLO)$/hsearch.obj
+ ! 
+ ! .INCLUDE :  target.mk
+-*** misc/db-4.2.52.NC/libdb_java/makefile.mk	Fri Sep 28 11:14:47 2007
+---- misc/build/db-4.2.52.NC/libdb_java/makefile.mk	Fri Sep 28 11:12:11 2007
+-***************
+-*** 1 ****
+-! dummy
+---- 1,29 ----
+-! PRJ=..$/..$/..$/..$/..
+-! 
+-! PRJNAME=berkeleydb
+-! TARGET=libdb_java42
+-! 
+-! EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
+-! 
+-! .INCLUDE :  settings.mk
+-! 
+-! CDEFS+=-DDB_USE_DLL
+-! 
+-! INCPRE=..$/build_win32 ..$/
+-! 
+-! .IF "$(SOLAR_JAVA)"!=""
+-! SLOFILES= \
+-!             $(SLO)$/db_java_wrap.obj
+-! .ELSE
+-! dummy:
+-! 	@echo "Nothing to build for OS $(OS)"
+-! 
+-! .ENDIF
+-! 
+-! $(CLASSDIR)$/db.jar : ALLTAR
+-!     echo compiling Berkeley DB classes
+-!     $(JAVAC) -g -d ..$/..$/..$/..$/class -classpath ..$/..$/..$/..$/class ..$/java$/src$/com$/sleepycat$/db$/*.java ..$/java$/src$/com$/sleepycat$/db$/release$/*.java ..$/java$/src$/com$/sleepycat$/bdb$/bind$/*.java ..$/java$/src$/com$/sleepycat$/bdb$/bind$/serial$/*.java ..$/java$/src$/com$/sleepycat$/bdb$/bind$/tuple$/*.java ..$/java$/src$/com$/sleepycat$/bdb$/*.java ..$/java$/src$/com$/sleepycat$/bdb$/collection$/*.java ..$/java$/src$/com$/sleepycat$/bdb$/factory$/*.java ..$/java$/src$/com$/sleepycat$/bdb$/util$/*.java
+-!     $(JAVAC) -g -d ..$/..$/..$/..$/class -classpath ..$/..$/..$/..$/class ..$/examples_java$/src$/com$/sleepycat$/examples$/db$/*.java ..$/examples_java$/src$/com$/sleepycat$/examples$/bdb$/access$/*.java ..$/examples_java$/src$/com$/sleepycat$/examples$/bdb$/helloworld$/*.java ..$/examples_java$/src$/com$/sleepycat$/examples$/bdb$/shipment$/basic$/*.java ..$/examples_java$/src$/com$/sleepycat$/examples$/bdb$/shipment$/entity$/*.java ..$/examples_java$/src$/com$/sleepycat$/examples$/bdb$/shipment$/tuple$/*.java ..$/examples_java$/src$/com$/sleepycat$/examples$/bdb$/shipment$/sentity$/*.java ..$/examples_java$/src$/com$/sleepycat$/examples$/bdb$/shipment$/marshal$/*.java ..$/examples_java$/src$/com$/sleepycat$/examples$/bdb$/shipment$/factory$/*.java
+-!     cd ..$/..$/..$/..$/class && jar cvf db.jar com$/sleepycat$/db com$/sleepycat$/bdb
+-! 
+-! .INCLUDE :  target.mk
+-*** misc/db-4.2.52.NC/libdb_java42.dxp	Fri Sep 28 11:14:47 2007
+---- misc/build/db-4.2.52.NC/libdb_java42.dxp	Fri Sep 28 11:12:11 2007
+-***************
+-*** 1 ****
+-! dummy
+---- 1,186 ----
+-! _Java_com_sleepycat_db_DbUtil_is_1big_1endian at 8
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1close0 at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1dbremove at 36
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1dbrename at 40
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1err at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1errx at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1cachesize at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1cachesize_1ncache at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1data_1dirs at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1encrypt_1flags at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1flags at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1home at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lg_1bsize at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lg_1dir at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lg_1max at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lg_1regionmax at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lk_1conflicts at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lk_1detect at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lk_1max_1lockers at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lk_1max_1locks at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lk_1max_1objects at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1mp_1mmapsize at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1open_1flags at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1rep_1limit at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1shm_1key at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1tas_1spins at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1timeout at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1tmp_1dir at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1tx_1max at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1tx_1timestamp at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1verbose at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1version_1major at 8
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1version_1minor at 8
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1version_1patch at 8
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1version_1string at 8
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1detect at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1get at 32
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1id at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1id_1free at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1put at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1stat at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1vec at 36
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1archive at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1compare at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1cursor at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1file at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1flush at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1put at 32
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1stat at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1memp_1fstat at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1memp_1stat at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1memp_1trickle at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1open0 at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1remove0 at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1rep_1elect at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1rep_1process_1message at 36
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1rep_1start at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1rep_1stat at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1setErrorHandler at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1setFeedbackHandler at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1setPanicHandler at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1app_1dispatch at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1cachesize at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1data_1dir at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1encrypt at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1flags at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lg_1bsize at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lg_1dir at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lg_1max at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lg_1regionmax at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lk_1conflicts at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lk_1detect at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lk_1max_1lockers at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lk_1max_1locks at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lk_1max_1objects at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1mp_1mmapsize at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1rep_1limit at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1rep_1transport at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1rpc_1server at 44
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1shm_1key at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1tas_1spins at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1timeout at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1tmp_1dir at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1tx_1max at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1tx_1timestamp0 at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1verbose at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1strerror at 12
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1txn_1begin at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1txn_1checkpoint at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1txn_1recover at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1txn_1stat at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbLogc_1close0 at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbLogc_1get at 32
+-! _Java_com_sleepycat_db_db_1javaJNI_DbLsn_1get_1file at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbLsn_1get_1offset at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1get_1flags at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1get_1maxsize at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1get_1priority at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1set_1flags at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1set_1maxsize at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1set_1priority at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbTxn_1abort0 at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbTxn_1commit0 at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbTxn_1discard0 at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbTxn_1id at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbTxn_1prepare at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbTxn_1set_1timeout at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1associate at 40
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1close0 at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1cursor at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1del at 32
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1err at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1errx at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1_1SWIG_10 at 36
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1_1SWIG_11 at 40
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1bt_1minkey at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1byteswapped at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1cachesize at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1cachesize_1ncache at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1dbname at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1encrypt_1flags at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1filename at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1flags at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1flags_1raw at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1h_1ffactor at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1h_1nelem at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1lorder at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1mpf at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1open_1flags at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1pagesize at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1q_1extentsize at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1re_1delim at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1re_1len at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1re_1pad at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1re_1source at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1transactional at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1type at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1join at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1key_1range at 36
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1open0 at 44
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1put at 36
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1remove0 at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1rename0 at 32
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1setFeedbackHandler at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1append_1recno at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1bt_1compare at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1bt_1maxkey at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1bt_1minkey at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1bt_1prefix at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1cachesize at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1dup_1compare at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1encrypt at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1flags at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1h_1ffactor at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1h_1hash at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1h_1nelem at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1lorder at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1pagesize at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1q_1extentsize at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1re_1delim at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1re_1len at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1re_1pad at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1re_1source at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1stat at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1sync at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1truncate at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1upgrade at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1verify0 at 32
+-! _Java_com_sleepycat_db_db_1javaJNI_Dbc_1close0 at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Dbc_1count at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Dbc_1del at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Dbc_1dup at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Dbc_1get_1_1SWIG_10 at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_Dbc_1get_1_1SWIG_11 at 32
+-! _Java_com_sleepycat_db_db_1javaJNI_Dbc_1put at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_deleteRef0 at 12
+-! _Java_com_sleepycat_db_db_1javaJNI_delete_1DbLock at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_delete_1DbLsn at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_getDbEnv0 at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_getDbRef0 at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0 at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_initDbRef0 at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_initialize at 8
+-! _Java_com_sleepycat_db_db_1javaJNI_new_1Db at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_new_1DbEnv at 12
+-! _Java_com_sleepycat_db_db_1javaJNI_new_1DbLsn at 16
++
+ *** misc/db-4.2.52.NC/lock/makefile.mk	Fri Sep 28 11:14:47 2007
+ --- misc/build/db-4.2.52.NC/lock/makefile.mk	Fri Sep 28 11:12:11 2007
+ ***************
+ *** misc/db-4.2.52.NC/lock/makefile.mk	2007-02-19 16:12:18.000000000 +0100
+ --- misc/build/db-4.2.52.NC/lock/makefile.mk	2007-02-19 16:12:12.000000000 +0100
+ ***************
+--- berkeleydb/makefile.mk
++++ berkeleydb/makefile.mk
+@@ -57,10 +57,10 @@
+ 	makefile.mk btree$/makefile.mk clib$/makefile.mk common$/makefile.mk  \
+ 	cxx$/makefile.mk db$/makefile.mk dbm$/makefile.mk dbreg$/makefile.mk  \
+ 	db_printlog$/makefile.mk env$/makefile.mk fileops$/makefile.mk hash$/makefile.mk  \
+-	hmac$/makefile.mk hsearch$/makefile.mk libdb_java$/makefile.mk lock$/makefile.mk  \
++	hmac$/makefile.mk hsearch$/makefile.mk lock$/makefile.mk  \
+ 	log$/makefile.mk mp$/makefile.mk mutex$/makefile.mk os$/makefile.mk  \
+ 	os_win32$/makefile.mk qam$/makefile.mk rep$/makefile.mk txn$/makefile.mk  \
+-	xa$/makefile.mk libdb42.dxp libdb_java42.dxp db_4_2_gcc3.map
++	xa$/makefile.mk libdb42.dxp db_4_2_gcc3.map
+ 
+ 
+ 
+@@ -100,10 +100,7 @@
+ CONFIGURE_ACTION= \
+ 	..$/dist$/configure
+ CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
+-.IF "$(SOLAR_JAVA)"!=""
+-CONFIGURE_FLAGS+=--enable-java
+-ARCH_FLAGS+=-I$(JAVA_HOME)/include
+-.ENDIF
++
+ # just pass ARCH_FLAGS to native build
+ CFLAGS+:=$(ARCH_FLAGS)
+ CXXFLAGS+:=$(ARCH_FLAGS)
+@@ -119,15 +116,6 @@
+ .ENDIF
+ 
+ OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
+-.IF "$(OS)"=="MACOSX"
+-OUT2LIB+=$(BUILD_DIR)$/.libs$/libdb_java*jnilib
+-.ENDIF	# "$(OS)"=="MACOSX"
+-
+-.IF "$(SOLAR_JAVA)"!=""
+-OUT2BIN=$(BUILD_DIR)$/db.jar
+-OUT2CLASS=$(BUILD_DIR)$/db.jar
+-.ENDIF
+-
+ OUT2INC= \
+ 	$(BUILD_DIR)$/db.h
+ 
+@@ -146,9 +134,6 @@
+ .ELSE
+ CONFIGURE_FLAGS+=LDFLAGS="-no-undefined -L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin -L$(COMPATH)/lib"
+ .ENDIF
+-.IF "$(SOLAR_JAVA)"!=""
+-CONFIGURE_FLAGS+=--enable-java
+-.ENDIF
+ 
+ BUILD_DIR=$(CONFIGURE_DIR)
+ BUILD_DIR_OUT=$(CONFIGURE_DIR)
+@@ -178,12 +163,8 @@
+ 
+ BUILD_DIR_OUT=build_win32
+ #OUT2LIB= \
+-#	$(BUILD_DIR_OUT)$/Release$/libdb_java42.lib \
+ #	$(BUILD_DIR_OUT)$/Release$/libdb42.lib
+-#OUT2BIN=$(BUILD_DIR_OUT)$/Release$/db.jar \
+-#	$(BUILD_DIR_OUT)$/Release$/libdb_java42.dll \
+-#	$(BUILD_DIR_OUT)$/Release$/libdb42.dll
+-#OUT2CLASS=$(BUILD_DIR_OUT)$/Release$/db.jar
++#OUT2BIN=$(BUILD_DIR_OUT)$/Release$/libdb42.dll
+ OUT2INC= \
+ 	$(BUILD_DIR_OUT)$/db.h
+ .ENDIF
+--- berkeleydb/prj/d.lst
++++ berkeleydb/prj/d.lst
+@@ -5,17 +5,11 @@
+ ..\%__SRC%\inc\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h
+ 
+ ..\%__SRC%\lib\libdb42.lib %_DEST%\lib%_EXT%\libdb42.lib
+-..\%__SRC%\lib\libdb_java42.lib %_DEST%\lib%_EXT%\libdb_java42.lib
+ 
+ ..\%__SRC%\lib\libdb-4.2.so %_DEST%\lib%_EXT%\libdb-4.2.so
+-..\%__SRC%\lib\libdb_java-4.2.so %_DEST%\lib%_EXT%\libdb_java-4.2.so
+ 
+ ..\%__SRC%\lib\libdb-4.2.dylib %_DEST%\lib%_EXT%\libdb-4.2.dylib
+-..\%__SRC%\lib\libdb_java-4.2.jnilib %_DEST%\lib%_EXT%\libdb_java-4.2.jnilib
+ 
+ ..\%__SRC%\bin\libdb42.dll %_DEST%\bin%_EXT%\libdb42.dll
+-..\%__SRC%\bin\libdb_java42.dll %_DEST%\bin%_EXT%\libdb_java42.dll
+ ..\%__SRC%\bin\libdb_cxx42.dll %_DEST%\bin%_EXT%\libdb_cxx42.dll
+ 
+-..\%__SRC%\bin\db.jar %_DEST%\bin%_EXT%\db.jar
+-..\%__SRC%\class\db.jar %_DEST%\bin%_EXT%\db.jar
+--- config_office/set_soenv.in
++++ config_office/set_soenv.in
+@@ -1814,7 +1814,6 @@
+ ToFile( "SYSTEM_DB",         "@SYSTEM_DB@",        "e" );
+ ToFile( "DB_VERSION",        "@DB_VERSION@",       "e" );
+ ToFile( "DB_INCLUDES",       "@DB_INCLUDES@",      "e" );
+-ToFile( "DB_JAR",            "@DB_JAR@",           "e" );
+ ToFile( "SYSTEM_HSQLDB",     "@SYSTEM_HSQLDB@",    "e" );
+ ToFile( "HSQLDB_JAR",        "@HSQLDB_JAR@",       "e" );
+ ToFile( "SYSTEM_BSH",        "@SYSTEM_BSH@",       "e" );
+--- scp2/source/ooo/file_library_ooo.scp
++++ scp2/source/ooo/file_library_ooo.scp
+@@ -596,27 +596,6 @@
+ 
+ STD_LIB_FILE_PATCH( gid_File_Lib_Dbfile , file)
+ 
+-#ifdef SOLAR_JAVA
+-#ifndef SYSTEM_DB
+-
+-File gid_File_Lib_Dbjava
+-    TXT_FILE_BODY;
+-    Styles = (PACKED);
+-    Dir = gid_Dir_Program;
+-  #ifdef UNX
+-    #ifdef MACOSX
+-        Name = "libdb_java-4.2.jnilib";
+-    #else
+-    	Name = STRING(CONCAT2(libdb_java-4.2,UNXSUFFIX));
+-    #endif
+- #else
+-    Name = "libdb_java42.dll";
+-  #endif
+-End
+-
+-#endif
+-#endif
+-
+ File gid_File_Lib_Dbodbcbase
+     TXT_FILE_BODY;
+   #ifdef UNX
Index: extra/office/openoffice-base/jvmfwk-gij-paths_oog680_m9.diff
diff -u /dev/null extra/office/openoffice-base/jvmfwk-gij-paths_oog680_m9.diff:1.1
--- /dev/null	Sat Nov 17 03:32:37 2007
+++ extra/office/openoffice-base/jvmfwk-gij-paths_oog680_m9.diff	Sat Nov 17 03:32:37 2007
@@ -0,0 +1,21 @@
+--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
++++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+@@ -68,6 +68,18 @@
+     static char const* ar[]= {
+           "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
+           "/gcj-4.1.1/libjvm.so",
++	  "/gcj-4.2/libjvm.so",
++	  "/gcj-4.1/libjvm.so",
++	  "/gcj-4.2.0/libjvm.so",
++	  "/gcj-4.2.1/libjvm.so",
++	  "/gcj-4.2.2/libjvm.so",
++	  "/gcj-4.2.2-81/libjvm.so",
++         "/gcj-4.1.2/libjvm.so",
++	  "/libgcj.so.80",
++	  "/libgcj.so.81",
++	  "/libgcj.so.8",
++	  "/libgcj.so.71",
++	  "/libgcj.so.70",
+           "/libgcj.so.7",
+           "/libgcj.so.6"
+     };




More information about the arch-commits mailing list