[arch-commits] Commit in go-openoffice/trunk (4 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Mon Sep 28 20:02:38 UTC 2009


    Date: Monday, September 28, 2009 @ 16:02:38
  Author: andyrtr
Revision: 53317

upgpkg: go-openoffice 3.1.1.2-2
    rebuild for db48; supress kde4 installation noise

Added:
  go-openoffice/trunk/buildfix_system_db48.diff
Modified:
  go-openoffice/trunk/ChangeLog
  go-openoffice/trunk/PKGBUILD
  go-openoffice/trunk/go-openoffice.install

---------------------------+
 ChangeLog                 |    6 ++++++
 PKGBUILD                  |   11 +++++++----
 buildfix_system_db48.diff |   11 +++++++++++
 go-openoffice.install     |    2 +-
 4 files changed, 25 insertions(+), 5 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-09-28 17:18:05 UTC (rev 53316)
+++ ChangeLog	2009-09-28 20:02:38 UTC (rev 53317)
@@ -1,3 +1,9 @@
+2009-09-28 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.1.1.2-2 :
+	rebuild for new db4.8
+	make install script silent to suppress kde4 noise
+	
 2009-09-24 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.1.1.2-1 :

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-09-28 17:18:05 UTC (rev 53316)
+++ PKGBUILD	2009-09-28 20:02:38 UTC (rev 53317)
@@ -4,7 +4,7 @@
 pkgname=go-openoffice
 pkgver=3.1.1.2
 _GOver=3.1.1.2 # = OOo 3.1.1 final + fixes
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenOffice.org - go-oo.org enhanced version of SUN's office suite"
 arch=('i686' 'x86_64')
 _go_tree="OOO310"
@@ -12,8 +12,8 @@
 license=('LGPL3')
 url="http://go-oo.org/"
 install=${pkgname}.install
-depends=("curl>=7.19.6" "hunspell>=1.2.8" "python>=2.6.2" 'libwpd' 'redland>=1.0.9-2' 
-         'libxaw' "neon>=0.28.4" "icu>=4.2.1" 'hsqldb-java' 'libxslt' 'libxtst' 'lpsolve'
+depends=("curl>=7.19.6" "hunspell>=1.2.8" "python>=2.6.2-6" 'libwpd' 'redland>=1.0.9-4' 
+         'libxaw' "neon>=0.28.6" "icu>=4.2.1" 'hsqldb-java' 'libxslt' 'libxtst' 'lpsolve'
 	 'hicolor-icon-theme' 'shared-mime-info' 'desktop-file-utils')
 optdepends=('java-runtime:	adds java support'
             'libcups:		adds printing support'
@@ -26,7 +26,7 @@
 	    'gstreamer0.10-base:	+ some gstr-plugins to support multimedia content, e.g. in impress'
             'kdelibs:		for kde integration')
 makedepends=('automake' 'autoconf' 'wget' 'bison' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl'
-	'pam' 'sane' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.1.2" 'apache-ant' 'cairo' 
+	'pam' 'sane' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.1.3" 'apache-ant' 'cairo' 
 	'gperf' 'libcups' 'pstoedit' 'gconf' "openjdk6>=1.5.2" 'unixodbc' 'mesa>=7.5' 'poppler>=0.10.7'
 	'gstreamer0.10-base>=0.10.24'  'mono>=2.4.2.3' 'kdelibs>=4.3.1' 'libjpeg') # 'boost'
 backup=(usr/lib/go-openoffice/program/sofficerc)
@@ -48,6 +48,7 @@
 	http://download.go-oo.org//SRC680/libwpg-0.1.3.tar.gz
 	http://download.go-oo.org//DEV300/ooo_oxygen_images-2009-06-17.tar.gz
 	buildfix_64bit_system_libjpeg.diff
+	buildfix_system_db48.diff
 	openoffice.org-3.0.1.oooXXXXX.extensions.npapi.diff)
 #options=('!distcc' '!ccache' '!makeflags')
 noextract=(ooo-cli-prebuilt-3.1.1.tar.bz2 cairo-1.4.10.tar.gz mdbtools-0.6pre1.tar.gz
@@ -86,6 +87,7 @@
          'db556b750bf3eac8481a4cc5e29e5af1'
          '0b3ffc43231c525db1798495a6676902'
          'b005c4cf9f8e586539ca98c9cfe9bb77'
+         '0cd6f3525939d3ef6e5a30ad30c25d27'
          '6573ab0f3893806b366b06d575c4f547')
 
 build() {
@@ -101,6 +103,7 @@
 	# hotfixes not yet upstream
 #	cp ${srcdir}/*.diff ${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
 	cp ${srcdir}/buildfix_64bit_system_libjpeg.diff ${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
+	cp ${srcdir}/buildfix_system_db48.diff ${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
 	cp ${srcdir}/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.diff ${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
 
 	# export C(XX)FLAGS

Added: buildfix_system_db48.diff
===================================================================
--- buildfix_system_db48.diff	                        (rev 0)
+++ buildfix_system_db48.diff	2009-09-28 20:02:38 UTC (rev 53317)
@@ -0,0 +1,11 @@
+--- configure.in	2009-08-25 15:10:12.000000000 +0000
++++ configure.in.new	2009-09-27 17:43:11.207515081 +0000
+@@ -3626,7 +3626,7 @@
+         ], []
+     )
+     AC_MSG_CHECKING([whether db is at least 4.1])
+-    for v in `seq 1 7`; do
++    for v in `seq 1 8`; do
+        AC_TRY_RUN([
+ #include <db.h>
+ 

Modified: go-openoffice.install
===================================================================
--- go-openoffice.install	2009-09-28 17:18:05 UTC (rev 53316)
+++ go-openoffice.install	2009-09-28 20:02:38 UTC (rev 53317)
@@ -2,7 +2,7 @@
 
 gtk-update-icon-cache -f -q /usr/share/icons/hicolor
 update-desktop-database -q
-update-mime-database usr/share/mime
+update-mime-database usr/share/mime > /dev/null 2>&1
 
 echo " see http://wiki.archlinux.org/index.php/Openoffice"
 echo " how to use extensions, e.g. for spell checking"




More information about the arch-commits mailing list