[arch-commits] Commit in go-openoffice/trunk (4 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Fri Nov 5 05:25:04 UTC 2010
Date: Friday, November 5, 2010 @ 01:25:04
Author: andyrtr
Revision: 98230
upgpkg: go-openoffice 3.2.1.6-2
rebuild for db5.1and poppler; disable broken mono build; fix build for system db+redland
Added:
go-openoffice/trunk/buildfix_system_db51.diff
go-openoffice/trunk/configure.set-redland-cflags.diff
Modified:
go-openoffice/trunk/ChangeLog
go-openoffice/trunk/PKGBUILD
-----------------------------------+
ChangeLog | 7 +++++++
PKGBUILD | 24 ++++++++++++++++++------
buildfix_system_db51.diff | 31 +++++++++++++++++++++++++++++++
configure.set-redland-cflags.diff | 33 +++++++++++++++++++++++++++++++++
4 files changed, 89 insertions(+), 6 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-11-05 00:08:19 UTC (rev 98229)
+++ ChangeLog 2010-11-05 05:25:04 UTC (rev 98230)
@@ -1,3 +1,10 @@
+2010-11-02 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.2.1.6-2 :
+ - rebuild for db, python2, poppler
+ - add needed buildfixes
+ - disable broken mono build
+
2010-09-16 Andreas Radke <andyrtr at archlinux.org>
* 3.2.1.6-1 :
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-11-05 00:08:19 UTC (rev 98229)
+++ PKGBUILD 2010-11-05 05:25:04 UTC (rev 98230)
@@ -4,7 +4,7 @@
pkgname=go-openoffice
_GOver=3.2.1.6 # = final 3.2.1 != post OOo 3.2.1 final bugfix
pkgver=${_GOver}
-pkgrel=1
+pkgrel=2
pkgdesc="OpenOffice.org - go-oo.org enhanced version of SUN's office suite"
arch=('i686' 'x86_64')
_go_tree="OOO320"
@@ -16,7 +16,7 @@
'apache-ant' 'gperf' 'poppler' 'kdelibs' 'gconf' 'openjdk6' 'cppunit'
'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg'
# for additional ooo-build features
- 'mesa>=7.5' 'gstreamer0.10-base>=0.10.26' 'mono>=2.6.1')
+ 'mesa>=7.5' 'gstreamer0.10-base>=0.10.26') # 'mono>=2.6.1'
#'saxon'
depends=("curl>=7.20.0" "hunspell>=1.2.8" "python>=2.6.5" 'libwpd' 'libxaw' "neon>=0.28.6"
'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.2.1" 'libxslt'
@@ -41,8 +41,8 @@
'sane: for scanner access'
'unixodbc: adds ODBC database support'
'mesa: for the OGLTrans extension'
- 'mono: allows UNO automation with Mono'
'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
+ # 'mono: allows UNO automation with Mono'
backup=(usr/lib/go-openoffice/program/sofficerc)
provides=('openoffice-base')
conflicts=('openoffice-base')
@@ -64,7 +64,9 @@
http://download.go-oo.org/src/seamonkey-1.1.14.source.tar.gz
http://archive.apache.org/dist/ant/binaries/apache-ant-1.7.0-bin.tar.gz
http://multidimalgorithm.googlecode.com/files//mdds_0.3.0.tar.bz2
- buildfix_64bit_system_libjpeg.diff)
+ buildfix_64bit_system_libjpeg.diff
+ buildfix_system_db51.diff
+ configure.set-redland-cflags.diff)
options=('!makeflags')
noextract=(ooo-cli-prebuilt-3.2.tar.bz2 cairo-1.4.10.tar.gz mdbtools-0.6pre1.tar.gz extras-3.tar.bz2 biblio.tar.bz2 unowinreg.dll
scsolver.2008-10-30.tar.bz2 libwpd-0.8.14.tar.gz libwps-0.1.2.tar.gz libwpg-0.1.3.tar.gz ooo_oxygen_images-2009-06-17.tar.gz)
@@ -85,7 +87,9 @@
'a169ab152209200a7bad29a275cb0333'
'd721b0add40355d7049ec694b91eb332'
'cf8a6967f7de535ae257fa411c98eb88'
- 'b005c4cf9f8e586539ca98c9cfe9bb77')
+ 'b005c4cf9f8e586539ca98c9cfe9bb77'
+ 'ea43d5605160b571d6208f2380fc5c2d'
+ '992e28f227a78a532cba2d22152ab3b3')
# source PKGBUILD && mksource
mksource() {
@@ -117,13 +121,20 @@
# 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_64bit_system_libjpeg.diff,buildfix_system_db51.diff,configure.set-redland-cflags.diff} ${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
+
# export C(XX)FLAGS
# http://www.openoffice.org/issues/show_bug.cgi?id=103205
unset CFLAGS
unset CXXFLAGS
+ # python2 fix
+ export PYTHON=python2
+ sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+ $(find $srcdir -name '*.py')
+
if [ "$CARCH" = "x86_64" ]; then
EXTRAOPTS="--without-stlport"
else EXTRAOPTS="--with-stlport --with-additional-sections=SystemGraphiteWithSTLport"
@@ -147,6 +158,7 @@
--enable-graphite\
--disable-gio\
--disable-kde\
+ --disable-mono\
--enable-kde4\
--enable-ldap \
--enable-lockdown\
Added: buildfix_system_db51.diff
===================================================================
--- buildfix_system_db51.diff (rev 0)
+++ buildfix_system_db51.diff 2010-11-05 05:25:04 UTC (rev 98230)
@@ -0,0 +1,31 @@
+--- configure.in 2010-05-28 07:18:48.000000000 +0200
++++ configure.in.new 2010-10-30 16:11:58.213941014 +0200
+@@ -3864,25 +3864,14 @@
+ ], []
+ )
+ AC_MSG_CHECKING([whether db is at least 4.1])
+- for v in `seq 1 8`; do
+- AC_TRY_RUN([
++ AC_TRY_RUN([
+ #include <db.h>
+
+ int main(int argc, char **argv) {
+- if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) return 0;
++ if(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0;
+ else return 1;
+ }
+- ], [DB_VERSION_MINOR=$v], [])
+- done
+- if test "$DB_VERSION_MINOR" -gt "1"; then
+- AC_MSG_RESULT([OK])
+- DB_VERSION=4.$DB_VERSION_MINOR
+- else
+- AC_MSG_ERROR([no. you need at least db 4.1])
+- fi
+- # does not work :/
+- #AC_CHECK_LIB(db, db_create, [],
+- # [AC_MSG_ERROR([db library not installed or functional])], [])
++ ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
+ AC_HAVE_LIBRARY(db, [],
+ [AC_MSG_ERROR([db not installed or functional])], [])
+ SCPDEFS="$SCPDEFS -DSYSTEM_DB"
Added: configure.set-redland-cflags.diff
===================================================================
--- configure.set-redland-cflags.diff (rev 0)
+++ configure.set-redland-cflags.diff 2010-11-05 05:25:04 UTC (rev 98230)
@@ -0,0 +1,33 @@
+commit 78a150172b301238da4366d5f58f15af86ad35cb
+Author: David Tardon <dtardon at redhat.com>
+Date: Wed Oct 6 09:50:50 2010 +0200
+
+ set REDLAND_CFLAGS for system redland.
+
+ unoxml/source/rdf/makefile.mk used it for ages (since integration of CWS
+ odfmetadata), but it had never been set .-)
+
+diff --git a/configure.in b/configure.in
+index 4d27ac0..282a6b5 100644
+--- configure.in
++++ configure.in
+@@ -5308,6 +5308,7 @@ else
+ SYSTEM_REDLAND=NO
+ fi
+ AC_SUBST(SYSTEM_REDLAND)
++AC_SUBST(REDLAND_CFLAGS)
+ AC_SUBST(REDLAND_LIBS)
+
+ dnl ===================================================================
+diff --git a/set_soenv.in b/set_soenv.in
+index 969a928..2e42f66 100644
+--- set_soenv.in
++++ set_soenv.in
+@@ -1933,6 +1933,7 @@ ToFile( "BUILD_UNOWINREG", "@BUILD_UNOWINREG@", "e" );
+ ToFile( "USE_XINERAMA", "@USE_XINERAMA@", "e" );
+ ToFile( "XINERAMA_LINK", "@XINERAMA_LINK@", "e" );
+ ToFile( "SYSTEM_REDLAND", "@SYSTEM_REDLAND@", "e" );
++ToFile( "REDLAND_CFLAGS", "@REDLAND_CFLAGS@", "e" );
+ ToFile( "REDLAND_LIBS", "@REDLAND_LIBS@", "e" );
+ ToFile( "SYSTEM_HUNSPELL", "@SYSTEM_HUNSPELL@", "e" );
+ ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" );
More information about the arch-commits
mailing list