[arch-commits] Commit in openoffice-base-devel/repos (3 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Sun Oct 25 22:37:03 UTC 2009 

    Date: Sunday, October 25, 2009 @ 18:37:03
  Author: andyrtr
Revision: 56703

Merged revisions 54516,56702 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/openoffice-base-devel/trunk

........
  r54516 | andyrtr | 2009-10-11 07:12:16 +0000 (So, 11 Okt 2009) | 1 line
  
  readd lucene dep; modify pkgdesc for devel branch
........
  r56702 | andyrtr | 2009-10-25 22:36:08 +0000 (So, 25 Okt 2009) | 2 lines
  
  upgpkg: openoffice-base-devel 3.2_dev300_m62-1
      new snapshot DEV300_m62, install built extensions, use mercurial for checkout
........

Modified:
  openoffice-base-devel/repos/extra-x86_64/	(properties)
  openoffice-base-devel/repos/extra-x86_64/ChangeLog
  openoffice-base-devel/repos/extra-x86_64/PKGBUILD

-----------+
 ChangeLog |   12 ++++++++++++
 PKGBUILD  |   49 ++++++++++++++++++++++---------------------------
 2 files changed, 34 insertions(+), 27 deletions(-)


Property changes on: openoffice-base-devel/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /openoffice-base-devel/trunk:1-54309
   + /openoffice-base-devel/trunk:1-56702

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-10-25 22:36:08 UTC (rev 56702)
+++ extra-x86_64/ChangeLog	2009-10-25 22:37:03 UTC (rev 56703)
@@ -1,3 +1,15 @@
+2009-10-25 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.2_dev300_m62-1:
+	- new snapshot
+	- use mercurial for checkouts
+	- readd missing lucene dependency
+	- make it provide openoffice-en-US
+	- modify pkgdesc for devel branch
+	- install all built extensions
+	# sun-report-builder.oxt and
+	# wiki-publisher.oxt installation is still broken
+
 2009-10-08 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.2_dev300_m61-1:

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-25 22:36:08 UTC (rev 56702)
+++ extra-x86_64/PKGBUILD	2009-10-25 22:37:03 UTC (rev 56703)
@@ -5,7 +5,7 @@
 
 pkgbase="openoffice-base-devel"
 pkgname=('openoffice-base-devel' 'openoffice-sdk-devel')
-_OO_milestone=DEV300_m61
+_OO_milestone=DEV300_m62
 pkgver=3.2_${_OO_milestone/DEV/dev}
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -29,32 +29,20 @@
 	soffice-detect-mozilla-certificates.diff
 	buildfix-gcc44.diff
 	buildfix_FormulaMissingHeader.diff
-	http://www.openoffice.org/nonav/issues/showattachment.cgi/64767/openldap.patch
 	buildfix_system_db48.diff
 	openoffice.profile)
 options=('!distcc' '!ccache' '!makeflags')
-md5sums=('6244c09b0b4c67519191bef0f9ec393d'
-         'e3a0b76dcd876f3d721ee7183729153d'
-         '63209bbc64c901ef105455bda0282f45'
-         '71f136a31e296a04ab68932a31dd533e'
-         '6c596129fb48316226ce3adfd3a4c86d'
-         '1dc7480a04f572ad136d35923a2af66d'
-         'c8e82b4d2324fe62ad8c6e29213e80b5'
-         '863a3ab2c17a3d11b8fa3ec321986366'
-         'a130ad960f76b692e34f8566e5ca3f2b'
-         '0cd6f3525939d3ef6e5a30ad30c25d27'
-         '8d68d44c941a687813ddd968383cdf27')
                                                                        
 # see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
 
 build() {
+	# now mercurial http://wiki.services.openoffice.org/wiki/Mercurial_Pilot and http://wiki.services.openoffice.org/wiki/OOo_and_Mercurial
+#	mkdir -p ${srcdir}/${_OO_milestone}  # needed?
 	cd ${srcdir}
-	# now svn: http://wiki.services.openoffice.org/wiki/OOo_and_Subversion
-#	svn checkout svn://svn.services.openoffice.org/ooo/tags/${_OO_milestone}
-#	find ${srcdir} -type d -depth -name ".svn" -exec rm -rf {} \;
+#	hg -v clone -r ${_OO_milestone} http://hg.services.openoffice.org/hg/DEV300 ${srcdir}/${_OO_milestone}
 #	tar -cvzf ../${pkgname}-${_OO_milestone}.tar.gz ${_OO_milestone}/*
 #	return 1
-
+	
 	cd ${srcdir}/${_OO_milestone}
 	# just to make sure that it will detect the desired JDK/JVM - we want openjdk6
 	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
@@ -74,7 +62,6 @@
 	# build fixes
 	patch -Np0 -i ${srcdir}/buildfix-gcc44.diff || return 1
 	patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
-	patch -Np0 -i ${srcdir}/openldap.patch || return 1
 	patch -Np0 -i ${srcdir}/buildfix_system_db48.diff || return 1
 	
 	# allows soffice to find the user's firefox profile so that it can read
@@ -102,7 +89,7 @@
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
 	unset CFLAGS
 	unset CXXFLAGS
-#	export ARCH_FLAGS="$CFLAGS"
+#	export ARCH_FLAGS="$CFLAGS" # causes errors
 
 	# Need to recreate the configure script because of patches
 	autoreconf -v || return 1
@@ -166,11 +153,8 @@
 
 
 #	--enable-layout\ /bin/bash: tralay: command not found ???
-
-#--with-system-jfreereport
-
+#	--with-system-jfreereport
 #	--with-system-mythes\
-
 # we will need myspell dicts for --with-system-dicts --without-myspell-dicts
 
 	# Setup environment for build
@@ -189,11 +173,11 @@
 
 package_openoffice-base-devel() {
 
- pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
+ pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite - developement branch"
  install=openoffice.install
  depends=("curl>=7.19.2" "hunspell>=1.2.8" "python>=2.6.2" 'libwpd' 'redland' 'libxaw' "neon>=0.28.4"
           'dbus-glib' "icu>=4.2.1" 'hsqldb-java' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils' 
-	  'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap') # 'lucene' 'libmythes'
+	  'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap' 'lucene') # 'libmythes'
  optdepends=('java-runtime:	adds java support'
             'libcups:		adds printing support'
             'gconf:		adds additional gnome support'
@@ -202,7 +186,7 @@
             'poppler:		for shipped pdfimport extension'
 	    'kdelibs:		for kde integration')
  backup=(usr/lib/openoffice-dev/program/sofficerc )
- provides=('openoffice-base')
+ provides=('openoffice-base' 'openoffice-en-US')
 
 
 	cd ${srcdir}/${_OO_milestone}
@@ -238,7 +222,17 @@
          install -D -m644 $i ${pkgdir}/usr/lib/openoffice/share/extension/install/$i || return 1
        done
        popd
+       
+       # install extensions
+       pushd ${srcdir}/${_OO_milestone}/solver/300/unxlng?6.pro/bin
+         install -D -m644 sun-report-builder.oxt ${pkgdir}/usr/lib/openoffice/share/extension/install/sun-report-builder.oxt || return 1
+	 install -D -m644 swext/wiki-publisher.oxt ${pkgdir}/usr/lib/openoffice/share/extension/install/wiki-publisher.oxt || return 1
+	 install -D -m644 minimizer/sun-presentation-minimizer.oxt ${pkgdir}/usr/lib/openoffice/share/extension/install/sun-presentation-minimizer.oxt || return 1
+	 install -D -m644 presenter/presenter-screen.oxt ${pkgdir}/usr/lib/openoffice/share/extension/install/presenter-screen.oxt || return 1
+	 install -D -m644 pdfimport/pdfimport.oxt ${pkgdir}/usr/lib/openoffice/share/extension/install/pdfimport.oxt || return 1
+       popd
 
+
 	# prepare filesystem entries
 	mkdir -p ${pkgdir}/usr/{bin,share/applications}
 	mkdir -p ${pkgdir}/usr/share/icons/{hicolor,locolor}
@@ -287,6 +281,7 @@
 	rm -f soffice spadmin
 	ln -sf /usr/lib/openoffice-dev/program/soffice soffice-dev
 	ln -sf /usr/lib/openoffice-dev/program/spadmin spadmin-dev
+	ln -sf /usr/lib/openoffice-dev/program/unopkg unopkg-dev
 	
 	cd ${pkgdir}/usr/share/applications/
 	for desktopz in *.desktop
@@ -315,7 +310,7 @@
 
 package_openoffice-sdk-devel() {
 
- pkgdesc="OpenOffice.org SDK - development files"
+ pkgdesc="OpenOffice.org SDK - development files - for devel branch pkg"
  depends=('openoffice-base-devel')
 
 	cd ${srcdir}/${_OO_milestone}

More information about the arch-commits mailing list