[arch-commits] Commit in openoffice-base-beta/repos (5 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Fri Aug 8 06:58:51 UTC 2008 

    Date: Friday, August 8, 2008 @ 02:58:51
  Author: andyrtr
Revision: 8157

Merged revisions 6566-8156 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/openoffice-base-beta/trunk

........
  r7503 | andyrtr | 2008-08-02 17:57:05 +0000 (Sa, 02 Aug 2008) | 1 line
  
  upgpkg: openoffice-base-beta 3.0_beb300_m3-2
........
  r8148 | andyrtr | 2008-08-07 15:33:34 +0000 (Do, 07 Aug 2008) | 2 lines
  
  upgpkg: openoffice-base-beta 3.0_ooo300_m1-1
      new snapshot; rebuild for icu
........
  r8156 | andyrtr | 2008-08-08 06:58:13 +0000 (Fr, 08 Aug 2008) | 1 line
  
  upgpkg: openoffice-base-beta 3.0_ooo300_m1-1
........

Modified:
  openoffice-base-beta/repos/extra-x86_64/	(properties)
  openoffice-base-beta/repos/extra-x86_64/ChangeLog
  openoffice-base-beta/repos/extra-x86_64/PKGBUILD
  openoffice-base-beta/repos/extra-x86_64/openoffice.install
  openoffice-base-beta/repos/extra-x86_64/template.desktop

--------------------+
 ChangeLog          |    6 +++
 PKGBUILD           |   93 ++++++++++++++++++++++++---------------------------
 openoffice.install |   13 +++----
 template.desktop   |    2 -
 4 files changed, 57 insertions(+), 57 deletions(-)


Property changes on: openoffice-base-beta/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /openoffice-base-beta/trunk:1-6565
   + /openoffice-base-beta/trunk:1-8156

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2008-08-08 06:58:13 UTC (rev 8156)
+++ extra-x86_64/ChangeLog	2008-08-08 06:58:51 UTC (rev 8157)
@@ -1,3 +1,9 @@
+openoffice-base-beta 3.0-ooo300_m1-1
+- next snapshot
+- fix beta renaming #11134
+- --disable-qadevooo due to
+  http://www.openoffice.org/issues/show_bug.cgi?id=91452
+
 openoffice-base-beta 3.0-beb300_m3-1
 - beta3
 - drop kde support

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-08-08 06:58:13 UTC (rev 8156)
+++ extra-x86_64/PKGBUILD	2008-08-08 06:58:51 UTC (rev 8157)
@@ -2,55 +2,40 @@
 # Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
 
 pkgname=openoffice-base-beta
-pkgver=3.0_beb300_m3
-pkgrel=2
+pkgver=3.0_ooo300_m1
+pkgrel=1
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
-#_OO_milestone=beb300-m3
-_OO_milestone=BEB300_m3
+#_OO_milestone=ooo300-m1
+_OO_milestone=OOO300_m1
 license=('LGPL3')
 url="http://www.openoffice.org"
 install=openoffice.install
 depends=('curl>=7.18.0' 'hunspell>=1.2.2-2' 'python>=2.5.1' 'libwpd' 
-         'libxaw' 'libcups' 'neon>=0.28.2' 'dbus-glib' 'pstoedit')
-makedepends=('bison' 'cvs' 'curl' 'findutils'
-             'flex' 'gawk' 'gcc-libs' 'libart-lgpl' 'pam' 'sane' 'zip'
-             'perl-archive-zip' 'pkgconfig'  'unzip' 'xulrunner>=1.9.0.1' 'boost'
-             'apache-ant' 'cairo' 'gperf' 'xmlsec' 'gconf' 'openjdk6>=1.2-3')
+         'libxaw' 'libcups' 'neon>=0.28.2' 'dbus-glib' 'pstoedit' 'icu>=4.0')
+makedepends=('bison' 'cvs' 'curl' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl'
+             'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.9.0.1'
+             'boost' 'apache-ant' 'cairo' 'gperf' 'gconf' 'openjdk6>=1.2-1')
 provides=('openoffice-base')
 optdepends=("java-runtime: adds java support")
-#MIRROR=ftp://ftp5.gwdg.de/pub/openoffice/extended/developer/
-MIRROR=ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Sources
+
+MIRROR=ftp://ftp5.gwdg.de/pub/openoffice/extended/developer
+#MIRROR=ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Sources
 #MIRROR=http://download.go-oo.org/DEV300
 
-source=(#$MIRROR/${_OO_milestone}/OOo-Dev_${_OO_milestone}_src_{core,system}.tar.bz2
-	$MIRROR/OOo_${_OO_milestone}_source.tar.gz
+source=($MIRROR/${_OO_milestone}/OOo-Dev_${_OO_milestone}_src_{core,system}.tar.bz2
+	#$MIRROR/OOo_${_OO_milestone}_source.tar.gz
 	template.desktop
 	default-no-startup-wizard.diff
 	default-system-fpicker.diff
 	libxmlsec-findcerts.diff
 	soffice-detect-mozilla-certificates.diff
 	buildfix-gcc43.diff
-	buildfix-connectivity-evoab2.diff
-	scp2-without-myspell-dicts.diff
 	shell.patch
-	parallel_build.diff
 	#http://oooconv.free.fr/fontooo/FontOOo.sxw
 	# from http://www.openoffice.org/issues/show_bug.cgi?id=81102
 	FontOOo_1.7.1.sxw)
 options=('!distcc' '!ccache' '!makeflags')
-md5sums=('d4ad9b382d2e73f2e41b4489d305222e'
-         '4be6d58cc9d7261c05527613954aa4b3'
-         '71f136a31e296a04ab68932a31dd533e'
-         '6c596129fb48316226ce3adfd3a4c86d'
-         'a8b96e9d0ce92a8f6690f277b1cfacc9'
-         '1dc7480a04f572ad136d35923a2af66d'
-         '094f7b2a86086fc76382bd98e3291d6b'
-         '70605c6b6dda69003033973271a8469e'
-         '96102565e77e2b4dc1fdfe922a4b6230'
-         'a51200f770c635355c430cc5052db8cf'
-         '38f5893fcca46d762da8425297f0a860'
-         '1fc1ca5205730655eab2d2e119aa06fe')
 
 # see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
 
@@ -61,15 +46,15 @@
 	JAVAHOME=${JAVA_HOME}
 	[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
 
-	#cd ${srcdir}/${_OO_milestone}/
-	cd ${srcdir}/ooo_${_OO_milestone}_src/
+	cd ${srcdir}/${_OO_milestone}/
+#	cd ${srcdir}/ooo_${_OO_milestone}_src/
 
-#	export _MILESTONE=DEV300_m12
-#	export 'CVSROOT=:pserver:anoncvs at anoncvs.services.openoffice.org:/cvs'
-#	cvs -z9 co -r $_MILESTONE hyphen || return 1
+	export _MILESTONE=OOO300_m1
+	export 'CVSROOT=:pserver:anoncvs at anoncvs.services.openoffice.org:/cvs'
+	cvs -z9 co -r $_MILESTONE swext apache-commons tomcat || return 1
 
 	# some speedups
-	export SMP="5"
+	export SMP="6"
 	MAXMODULESFLAG="-P${SMP}"
 	MAXPROCESSESFLAG="-P${SMP}"
 	export nodep=true
@@ -77,9 +62,6 @@
 
 	# build fixes
 	patch -Np0 -i ../buildfix-gcc43.diff || return 1
-	patch -Np0 -i ../buildfix-connectivity-evoab2.diff || return 1
-	patch -Np0 -i ../scp2-without-myspell-dicts.diff || return 1
-	patch -Np0 -i ../parallel_build.diff || return 1
 
 	# allows xmlsec to be able to read the format of the digital certificates.
 	patch -Np0 -i ../libxmlsec-findcerts.diff || return 1
@@ -100,12 +82,12 @@
 	if [ "$CARCH" = "x86_64" ]; then
           # 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" ${srcdir}/${_OO_milestone}/solenv/inc/libs.mk
-	  sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g" ${srcdir}/ooo_${_OO_milestone}_src/solenv/inc/libs.mk
+	  sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g" ${srcdir}/${_OO_milestone}/solenv/inc/libs.mk
+#	  sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g" ${srcdir}/ooo_${_OO_milestone}_src/solenv/inc/libs.mk
 	fi
 
-	#cd ${srcdir}/${_OO_milestone}/config_office
-	cd ${srcdir}/ooo_${_OO_milestone}_src/config_office
+	cd ${srcdir}/${_OO_milestone}/config_office
+#	cd ${srcdir}/ooo_${_OO_milestone}_src/config_office
 
 	# Set OOO_VENDOR in build environment
 	export OOO_VENDOR="ArchLinux"
@@ -122,7 +104,6 @@
 	--disable-gnome-vfs\
 	--disable-binfilter\
 	--disable-odk\
-	--disable-qadevooo\
 	--disable-systray\
 	--disable-mathmldtd\
 	--enable-gio\
@@ -143,6 +124,7 @@
 	--with-system-expat\
 	--with-system-freetype\
 	--with-system-hunspell\
+	--with-system-icu\
 	--with-system-jpeg\
 	--with-system-libwpd\
 	--with-system-libxml\
@@ -176,7 +158,7 @@
 	--with-use-shell=bash\
 	 $EXTRAOPTS || return 1
 
-#	--with-system-icu\
+#	--disable-qadevooo\
 
 	cd ..
 
@@ -245,9 +227,9 @@
 	install -D -m644 ${srcdir}/template.desktop ${pkgdir}/usr/share/applications/template.desktop
 
 	# install icons
-#	cd ${srcdir}/${_OO_milestone}/sysui/desktop/icons
-	cd ${srcdir}/ooo_${_OO_milestone}_src/sysui/desktop/icons
-	cp -a -v HighContrast/*x* ${pkgdir}/usr/share/icons/HighContrast
+	cd ${srcdir}/${_OO_milestone}/sysui/desktop/icons
+#	cd ${srcdir}/ooo_${_OO_milestone}_src/sysui/desktop/icons
+	#cp -a -v HighContrast/*x* ${pkgdir}/usr/share/icons/HighContrast
 	cp -a -v hicolor/*x* ${pkgdir}/usr/share/icons/hicolor
 	cp -a -v locolor/*x* ${pkgdir}/usr/share/icons/locolor
 
@@ -274,8 +256,8 @@
 	install -D -m644 ${srcdir}/FontOOo_1.7.1.sxw ${pkgdir}/opt/openoffice/share/dict/ooo/FontOOo.sxw
 
 	# add missing spell wizard
-	#install -D -m644 ${srcdir}/${_OO_milestone}/dictionaries/diclst/DicOOo.sxw ${pkgdir}/opt/openoffice/share/dict/ooo/DicOOo.sxw
-	install -D -m644 ${srcdir}/ooo_${_OO_milestone}_src/dictionaries/diclst/DicOOo.sxw ${pkgdir}/opt/openoffice/share/dict/ooo/DicOOo.sxw
+	install -D -m644 ${srcdir}/${_OO_milestone}/dictionaries/diclst/DicOOo.sxw ${pkgdir}/opt/openoffice/share/dict/ooo/DicOOo.sxw
+#	install -D -m644 ${srcdir}/ooo_${_OO_milestone}_src/dictionaries/diclst/DicOOo.sxw ${pkgdir}/opt/openoffice/share/dict/ooo/DicOOo.sxw
 
 	# link the mozilla-plugin
 	mkdir -p ${pkgdir}/usr/lib/mozilla/plugins/
@@ -304,6 +286,19 @@
 	sed -i -e 's|OpenOffice\.org\ 3\.0|OpenOffice\.org\ beta|g' ${pkgdir}/usr/share/applications/*.desktop
 	sed -i -e 's|\/opt\/openoffice\-beta\/program\/soffice|\/usr\/bin\/soffice\-beta|g' ${pkgdir}/usr/share/applications/*.desktop
 
-	mv ${pkgdir}/opt/openoffice-beta/program/soffice.bin ${pkgdir}/opt/openoffice-beta/program/soffice-beta.bin
+#	mv ${pkgdir}/opt/openoffice-beta/program/soffice.bin ${pkgdir}/opt/openoffice-beta/program/soffice-beta.bin
 	mv ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin.so ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin-beta.so
+	cd ${pkgdir}/opt/openiffice-beta/program/
+	ln -sf /opt/openoffice-beta/program/soffice.bin soffice-beta.bin
+	
 }
+md5sums=('c71c0a5837031dc4a1cbab61e67c2862'
+         '22742e78439c3ba9e776676652449cb8'
+         'a247ba577007d8169201bd8f41cf41b5'
+         '71f136a31e296a04ab68932a31dd533e'
+         '6c596129fb48316226ce3adfd3a4c86d'
+         'a8b96e9d0ce92a8f6690f277b1cfacc9'
+         '1dc7480a04f572ad136d35923a2af66d'
+         '094f7b2a86086fc76382bd98e3291d6b'
+         'a51200f770c635355c430cc5052db8cf'
+         '1fc1ca5205730655eab2d2e119aa06fe')

Modified: extra-x86_64/openoffice.install
===================================================================
--- extra-x86_64/openoffice.install	2008-08-08 06:58:13 UTC (rev 8156)
+++ extra-x86_64/openoffice.install	2008-08-08 06:58:51 UTC (rev 8157)
@@ -6,18 +6,17 @@
 echo " NOTE:"
 echo " This package has been built with java support."
 echo " If you want java features for runtime, you can either use: "
-echo " 1. GPL OpenJDK6 (recommended)."
+echo " 1. OpenJDK6"
 echo " 2. Sun's JRE."
 echo " you will need it for \"help\" section and some java based wizards"
 echo " for further reading: http://wiki.services.openoffice.org/wiki/Java_and_OpenOffice.org"
-echo
-echo " The en_US spellchecker is no longer included. A separate pkg is now"
-echo " available. Use \"pacman -S openoffice-spell-en\" to install it."
 echo " "
-echo " use \"export OOO_FORCE_DESKTOP=kde (currently not supported)\" or"
-echo " use \"export OOO_FORCE_DESKTOP=gnome\" to preset your desired look,"
+echo " >>KDE integration is no more supported!<<"
+echo " "
+echo " Please preset Gnome appearance always with"
+echo " \"export OOO_FORCE_DESKTOP=gnome\" even when"
+echo " you are runnning a different desktop!"
 echo " or put it in /etc/profile, rc.local, or ~/.bashrc."
-
 }
 
 post_upgrade() {

Modified: extra-x86_64/template.desktop
===================================================================
--- extra-x86_64/template.desktop	2008-08-08 06:58:13 UTC (rev 8156)
+++ extra-x86_64/template.desktop	2008-08-08 06:58:51 UTC (rev 8157)
@@ -4,7 +4,7 @@
 MultipleArgs=false
 Terminal=0
 Icon=extension.png
-Exec=/opt/openoffice/program/soffice-beta slot:5500
+Exec=/opt/openoffice/program/soffice slot:5500
 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
 Type=Application
 Name=OpenOffice.org beta From Template

More information about the arch-commits mailing list