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

andyrtr at archlinux.org andyrtr at archlinux.org
Thu Nov 1 04:26:07 UTC 2007 

    Date: Thursday, November 1, 2007 @ 00:26:07
  Author: andyrtr
    Path: /home/cvs-unstable/unstable/office/openoffice-base-devel

Modified: PKGBUILD (1.3 -> 1.4)
          internal-db-no-java_oog680_m1.diff (1.1 -> 1.2)
          libxmlsec-system-nss_oog_m5.diff (1.1 -> 1.2)
          ucb-no-CURL_NO_OLDIES_oog_m5.diff (1.1 -> 1.2)

upgpkg: openoffice-base-devel 2.4_src680_m235-1


------------------------------------+
 PKGBUILD                           |   86 ++++++++++++++++++-----------------
 internal-db-no-java_oog680_m1.diff |    4 -
 libxmlsec-system-nss_oog_m5.diff   |    1 
 ucb-no-CURL_NO_OLDIES_oog_m5.diff  |    1 
 4 files changed, 48 insertions(+), 44 deletions(-)


Index: unstable/office/openoffice-base-devel/PKGBUILD
diff -u unstable/office/openoffice-base-devel/PKGBUILD:1.3 unstable/office/openoffice-base-devel/PKGBUILD:1.4
--- unstable/office/openoffice-base-devel/PKGBUILD:1.3	Mon Oct 15 22:52:10 2007
+++ unstable/office/openoffice-base-devel/PKGBUILD	Thu Nov  1 00:26:06 2007
@@ -2,36 +2,58 @@
 # Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
 
 pkgname=openoffice-base-devel
-pkgver=2.4_src680_m233
+pkgver=2.4_src680_m235
 pkgrel=1
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
-_OO_milestone=src680-m233
-#_OO_milestone=SRC680_m233
+_OO_milestone=src680-m235
+#_OO_milestone=SRC680_m235
 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' 'agg' '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'
+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')	# 'boost' - we use internal one. jfreereport is broken
 # for SUN Java
-#makedepends=('boost' 'bison' 'ccache' 'cvs' 'curl' 'findutils'
+#makedepends=('boost' 'bison' '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')
 provides=('openoffice-base')
+md5sums=('20cd5520c2dc7eaee3a3e39c2d3c2b43'
+         '2484ed5f462d12b309e23739611959fe'
+         '8984eb3ed21e3bbd0f7fc1d17022751d'
+         '72dba5b4cd94d4439e06f75769402c6f'
+         'd9475c3aaf879c294bd9bc692071bd41'
+         '0faab33566196ddc9c405d68cf614663'
+         '39e4c1b1e864b22ee4650b2bff44c695'
+         'd00bba7046fe64b20f9d1884203a34bf'
+         'a411c3dd9751a7b9cc6a327992d44026'
+         '753a6f760eed98764ac6432878c4935d'
+         'e68ae258f3adb37022d649a99ce00e01'
+         '509697a7da6508ac9377b7750a57bfc4'
+         '4c76c07e867d51c416ea258220a90a6a'
+         '135f1b3c837435de504c84e4db9dc4f7'
+         '7fadadecaf511bb118bc1b657192520a'
+         'a8b96e9d0ce92a8f6690f277b1cfacc9'
+         '4271702d6e9e912b663d3e2d9b8a17e8'
+         '1cc4e58f28093f179378dc3bd69986af'
+         'cd8ff2b60ee86f576a1e04bac8dcb51b'
+         '1f61ea85e5870b4c6e9e39f86744ec38'
+         '1fc1ca5205730655eab2d2e119aa06fe'
+         '83bb5e235c4e4062eed404829d760c14')
 
 #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://download.go-oo.org/SRC680
 
 source=(#$MIRROR/stable/${pkgver}/OOo_${pkgver}_src_{core,binfilter,system}.tar.bz2
 	#$MIRROR/contrib/rc/${pkgver}/OOo_${pkgver}_${_OO_milestone}_src_{core,binfilter,system}.tar.bz2
@@ -47,42 +69,23 @@
 	default-no-startup-wizard_oog680_m1.diff
 	default-system-fpicker_oog680_m1.diff
 	jvmfwk-gij-paths_src233.diff
-	internal-db-no-java_oog680_m1.diff
+	internal-db-no-java_src235.diff
 	gstreamer-support_oog680_m1.diff
 	fix-font-hinting_src231.diff
 	fix-invisible-text.diff
 	gui-insensitive_oog680_m2.diff
-	buildfix-agg_2_5_oog680_m3.diff
 	ucb-no-CURL_NO_OLDIES_oog_m5.diff
 	libxmlsec-system-nss_oog_m5.diff
 	libxmlsec-findcerts_oog_m5.diff
 	soffice-detect-mozilla-certificates_oog_m5.diff
+	ooo82608.vcl.gtkbadfree_oog_m5.diff
 	detect_db46_src233.diff
+	buildfix-configure-system-icu.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=('f29e7bc965352db1ed9ebe53406bc15c'
-         'd13f4ce6af7a02041ab91677325400ff'
-         '3491664d56d87932e4654c382a859583'
-         '72dba5b4cd94d4439e06f75769402c6f'
-         'd9475c3aaf879c294bd9bc692071bd41'
-         '0faab33566196ddc9c405d68cf614663'
-         '39e4c1b1e864b22ee4650b2bff44c695'
-         'd00bba7046fe64b20f9d1884203a34bf'
-         '2b218f0c8672329eeaea8c1be1297a6d'
-         '753a6f760eed98764ac6432878c4935d'
-         'e68ae258f3adb37022d649a99ce00e01'
-         '509697a7da6508ac9377b7750a57bfc4'
-         '4c76c07e867d51c416ea258220a90a6a'
-         '4f0da68601120267be643c9cdaca2772'
-         'a11248bfee6486e5b9b5997c2bee7dd9'
-         '3353d801d4f3560ed1f5707ab5f02e49'
-         'a8b96e9d0ce92a8f6690f277b1cfacc9'
-         '4271702d6e9e912b663d3e2d9b8a17e8'
-         'cd8ff2b60ee86f576a1e04bac8dcb51b'
-         '1fc1ca5205730655eab2d2e119aa06fe'
-         '83bb5e235c4e4062eed404829d760c14')
+
 
 # see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
 
@@ -106,11 +109,9 @@
 	# 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
-	# 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
+	patch -Np0 -i ../internal-db-no-java_src235.diff || return 1
+	# allows to build against new icu
+#	patch -Np0 -i ../buildfix-configure-system-icu.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
@@ -121,6 +122,8 @@
 	# 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_src231.diff || return 1
@@ -180,7 +183,6 @@
 	--enable-libsn\
 	--enable-vba\
 	--with-package-format=native\
-	--with-system-agg\
 	--with-system-db\
 	--with-system-cairo\
 	--with-system-curl\
@@ -200,7 +202,6 @@
 	--with-system-stdlibs\
 	--with-system-xrender-headers\
 	--with-system-zlib\
-	--with-system-icu\
 	--without-fonts\
 	--without-myspell-dicts\
 	--without-nas\
@@ -221,7 +222,7 @@
 	--with-use-shell=bash\
 	 $EXTRAOPTS || return 1
 
-#	--with-gcc-speedup=ccache \
+#	--with-system-icu\
 
 	cd ..
 
@@ -315,6 +316,11 @@
 	# add missing spell wizard
 	install -D -m644 $startdir/src/${_OO_milestone}/dictionaries/diclst/DicOOo.sxw $startdir/pkg/opt/openoffice/share/dict/ooo/DicOOo.sxw
 
+	# link the mozilla-plugin
+	mkdir -p $startdir/pkg/opt/mozilla/lib/plugins/
+	cd $startdir/pkg/opt/mozilla/lib/plugins/
+	ln -v -s ../../../openoffice/program/libnpsoplugin.so .
+
 	## Develize it!
 	cd $startdir/pkg/opt/
 	mv openoffice openoffice-dev
@@ -334,9 +340,9 @@
 	
 	cd $startdir/pkg/usr/share/applications/
 	sed -i -e 's|Icon=|Icon=dev-|g' $startdir/pkg/usr/share/applications/*.desktop
-#	sed -i -e 's|Name\=OpenOffice\.org\ 2\.3|Name\=OpenOffice\.org\ devel|g' $startdir/pkg/usr/share/applications/*.desktop
 	sed -i -e 's|OpenOffice\.org\ 2\.3|OpenOffice\.org\ devel|g' $startdir/pkg/usr/share/applications/*.desktop
 	sed -i -e 's|\/opt\/openoffice\-dev\/program\/soffice|\/usr\/bin\/soffice\-dev|g' $startdir/pkg/usr/share/applications/*.desktop
 
 	mv $startdir/pkg/opt/openoffice-dev/program/soffice.bin $startdir/pkg/opt/openoffice-dev/program/soffice-dev.bin
+	mv $startdir/pkg/opt/mozilla/lib/plugins/libnpsoplugin.so $startdir/pkg/opt/mozilla/lib/plugins/libnpsoplugin-dev.so
 }
Index: unstable/office/openoffice-base-devel/internal-db-no-java_oog680_m1.diff
diff -u unstable/office/openoffice-base-devel/internal-db-no-java_oog680_m1.diff:1.1 unstable/office/openoffice-base-devel/internal-db-no-java_oog680_m1.diff:1.2
--- unstable/office/openoffice-base-devel/internal-db-no-java_oog680_m1.diff:1.1	Sun Oct 14 20:53:39 2007
+++ unstable/office/openoffice-base-devel/internal-db-no-java_oog680_m1.diff	Thu Nov  1 00:26:07 2007
@@ -244,8 +244,8 @@
 +	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
-+	xa$/makefile.mk libdb42.dxp
+-	xa$/makefile.mk libdb42.dxp libdb_java42.dxp db_4_2_gcc3.map
++	xa$/makefile.mk libdb42.dxp db_4_2_gcc3.map
  
  
  
Index: unstable/office/openoffice-base-devel/libxmlsec-system-nss_oog_m5.diff
diff -u unstable/office/openoffice-base-devel/libxmlsec-system-nss_oog_m5.diff:1.1 unstable/office/openoffice-base-devel/libxmlsec-system-nss_oog_m5.diff:1.2
--- unstable/office/openoffice-base-devel/libxmlsec-system-nss_oog_m5.diff:1.1	Sun Oct 14 20:53:40 2007
+++ unstable/office/openoffice-base-devel/libxmlsec-system-nss_oog_m5.diff	Thu Nov  1 00:26:07 2007
@@ -2656,4 +2656,4 @@
 +--- 698,723 ----
    		fi
        		NSS_LIBS_FOUND="yes"
-       		break
\ No newline at end of file
+       		break
Index: unstable/office/openoffice-base-devel/ucb-no-CURL_NO_OLDIES_oog_m5.diff
diff -u unstable/office/openoffice-base-devel/ucb-no-CURL_NO_OLDIES_oog_m5.diff:1.1 unstable/office/openoffice-base-devel/ucb-no-CURL_NO_OLDIES_oog_m5.diff:1.2
--- unstable/office/openoffice-base-devel/ucb-no-CURL_NO_OLDIES_oog_m5.diff:1.1	Sun Oct 14 20:53:40 2007
+++ unstable/office/openoffice-base-devel/ucb-no-CURL_NO_OLDIES_oog_m5.diff	Thu Nov  1 00:26:07 2007
@@ -15,4 +15,4 @@
 -.ENDIF
 +#CFLAGS +=-fno-inline
  
- # --- General -----------------------------------------------------
\ No newline at end of file
+ # --- General -----------------------------------------------------

More information about the arch-commits mailing list