[arch-commits] Commit in openoffice-base-devel/trunk (PKGBUILD libx11.diff)
andyrtr at archlinux.org
andyrtr at archlinux.org
Fri Dec 10 21:52:21 UTC 2010
Date: Friday, December 10, 2010 @ 16:52:21
Author: andyrtr
Revision: 102747
prepare next build
Added:
openoffice-base-devel/trunk/libx11.diff
Modified:
openoffice-base-devel/trunk/PKGBUILD
-------------+
PKGBUILD | 61 +++++++++++++++++++++++++++++++++++-----------------------
libx11.diff | 12 +++++++++++
2 files changed, 49 insertions(+), 24 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-12-10 21:41:47 UTC (rev 102746)
+++ PKGBUILD 2010-12-10 21:52:21 UTC (rev 102747)
@@ -4,7 +4,7 @@
pkgbase="openoffice-base-devel"
pkgname=('openoffice-base-devel' 'openoffice-sdk-devel')
-_OO_milestone=DEV300_m94
+_OO_milestone=DEV300_m95
pkgver=3.4_${_OO_milestone/DEV/dev}
pkgrel=1
arch=('i686' 'x86_64')
@@ -16,9 +16,10 @@
'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit'
# from main OOo the deps
"curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd' 'libxaw' "neon>=0.28.6"
- 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.2.1" 'libxslt'
+ 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt'
'redland>=1.0.11.99' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'
'hicolor-icon-theme' 'desktop-file-utils' 'gtk2') # keep gtk2 for install script
+ #'libwpd' - currently broken since libwpd 0.9 bump
# 'saxon'
_additional_source_url=http://hg.services.openoffice.org/binaries
source=(${_OO_milestone}.tar.xz
@@ -31,6 +32,7 @@
buildfix_FormulaMissingHeader.diff
http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/sal-cpprt-gcc-4.5-workaround.diff
cppunit_gcc45.diff
+ libx11.diff
openoffice.profile
${_additional_source_url}/63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
${_additional_source_url}/09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz
@@ -60,18 +62,18 @@
${_additional_source_url}/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
${_additional_source_url}/4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz
${_additional_source_url}/599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
- ${_additional_source_url}/5aba06ede2daa9f2c11892fbd7bc3057-libserializer.zip
+ ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
${_additional_source_url}/b92261a5679276c400555004937af965-nss-3.12.6-with-nspr-4.8.4.tar.gz
- ${_additional_source_url}/67b42915c8432abf0a922438f00860a2-libxml.zip
+ ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
${_additional_source_url}/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
${_additional_source_url}/7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
- ${_additional_source_url}/79600e696a98ff95c2eba976f7a8dfbb-liblayout.zip
+ ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
${_additional_source_url}/ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz
${_additional_source_url}/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
- ${_additional_source_url}/8ea307d71d11140574bfb9fcc2487e33-libbase.zip
+ ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
${_additional_source_url}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz
- ${_additional_source_url}/a06a496d7a43cbdc35e69dbe678efadb-libloader.zip
+ ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
${_additional_source_url}/a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
${_additional_source_url}/a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@@ -84,11 +86,11 @@
${_additional_source_url}/ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
${_additional_source_url}/cd5997284f4ba1e8dde5d1e5869fc342-libwpd-0.8.8.tar.gz
${_additional_source_url}/d0b5af6e408b8d2958f3d83b5244f5e8-hyphen-2.4.tar.gz
- ${_additional_source_url}/d1a3205871c3c52e8a50c9f18510ae12-libformula.zip
+ ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
${_additional_source_url}/d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
${_additional_source_url}/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip
${_additional_source_url}/d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
- ${_additional_source_url}/dbb3757275dc5cc80820c0b4dd24ed95-librepository.zip
+ ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
${_additional_source_url}/dbd5f3b47ed13132f04c685d608a7547-jpeg-6b.tar.gz
${_additional_source_url}/e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
${_additional_source_url}/e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
@@ -96,8 +98,8 @@
${_additional_source_url}/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
${_additional_source_url}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
${_additional_source_url}/ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz
- ${_additional_source_url}/f3e2febd267c8e4b13df00dac211dd6d-flute.zip
- ${_additional_source_url}/f7925ba8491fe570e5164d2c72791358-libfonts.zip
+ ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
${_additional_source_url}/fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
${_additional_source_url}/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
${_additional_source_url}/fcc6df1160753d0b8c835d17fdeeb0a7-boost_1_39_0.tar.gz
@@ -105,9 +107,10 @@
${_additional_source_url}/37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip
${_additional_source_url}/831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
${_additional_source_url}/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
- ${_additional_source_url}/cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2)
+ ${_additional_source_url}/cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
+ ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
options=('!distcc' '!ccache' '!makeflags')
-md5sums=('f4eead8755755faef69fb59d0f689a1b'
+md5sums=('886500d83ddbb7774c1b3117bbf18b34'
'e3a0b76dcd876f3d721ee7183729153d'
'09094988c7bfaa90e5d014523d558ebb'
'71f136a31e296a04ab68932a31dd533e'
@@ -117,6 +120,7 @@
'863a3ab2c17a3d11b8fa3ec321986366'
'cf01fa2669f828864146842e040e3cf8'
'bb5ada95f7b11a5cac5d669f7ae8baaa'
+ 'ad01b65e677334e0764ad31f24aee428'
'9fbee64a4a39e33a646c750d4978f48f'
'63ddc5116488985e820075e65fbe6aa4'
'09357cc74975b01714e00c5899ea1881'
@@ -146,18 +150,18 @@
'4a660ce8466c9df01f19036435425c3a'
'4ea70ea87b47e92d318d4e7f5b940f47'
'599dc4cc65a07ee868cf92a667a913d2'
- '5aba06ede2daa9f2c11892fbd7bc3057'
+ 'f94d9870737518e3b597f9265f4e9803'
'b92261a5679276c400555004937af965'
- '67b42915c8432abf0a922438f00860a2'
+ 'ace6ab49184e329db254e454a010f56d'
'7740a8ec23878a2f50120e1faa2730f2'
'7376930b0d3f3d77a685d94c4a3acda8'
- '79600e696a98ff95c2eba976f7a8dfbb'
+ 'db60e4fde8dd6d6807523deb71ee34dc'
'798b2ffdc8bcfe7bca2cf92b62caf685'
'ecb2e37e45c9933e2a963cabe03670ab'
'8294d6c42e3553229af9934c5c0ed997'
- '8ea307d71d11140574bfb9fcc2487e33'
+ 'eeb2c7ddf0d302fba4bfc6e97eac9624'
'bd30e9cf5523cdfc019b94f5e1d7fd19'
- 'a06a496d7a43cbdc35e69dbe678efadb'
+ '97b2d4dba862397f446b217e2b623e71'
'a169ab152209200a7bad29a275cb0333'
'a4d9b30810a434a3ed39fc0003bbd637'
'a7983f859eafb2677d7ff386a023bc40'
@@ -170,11 +174,11 @@
'ca66e26082cab8bb817185a116db809b'
'cd5997284f4ba1e8dde5d1e5869fc342'
'd0b5af6e408b8d2958f3d83b5244f5e8'
- 'd1a3205871c3c52e8a50c9f18510ae12'
+ '3404ab6b1792ae5f16bbd603bd1e1d03'
'd35724900f6a4105550293686688bbb3'
'd4c4d91ab3a8e52a2e69d48d34ef4df4'
'd70951c80dabecc2892c919ff5d07172'
- 'dbb3757275dc5cc80820c0b4dd24ed95'
+ '8ce2fcd72becf06c41f7201d15373ed9'
'dbd5f3b47ed13132f04c685d608a7547'
'e0707ff896045731ff99e99799606441'
'e81c2f0953aa60f8062c05a4673f2be0'
@@ -182,8 +186,8 @@
'ea570af93c284aa9e5621cd563f54f4d'
'ea91f2fb4212a21d708aced277e6e85a'
'ee8b492592568805593f81f8cdf2a04c'
- 'f3e2febd267c8e4b13df00dac211dd6d'
- 'f7925ba8491fe570e5164d2c72791358'
+ 'd8bd5eed178db6e2b18eeed243f85aa8'
+ '3bdf40c0d199af31923e900d082ca2dd'
'fb7ba5c2182be4e73748859967455455'
'fca8706f2c4619e2fa3f8f42f8fc1e9d'
'fcc6df1160753d0b8c835d17fdeeb0a7'
@@ -191,8 +195,10 @@
'37282537d0ed1a087b1c8f050dc812d9'
'831126a1ee5af269923cfab6050769fe'
'067201ea8b126597670b5eff72e1f66c'
- 'cf8a6967f7de535ae257fa411c98eb88')
+ 'cf8a6967f7de535ae257fa411c98eb88'
+ 'ba2930200c9f019c2d93a8c88c651a0f')
+
# see http://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build
# source PKGBUILD && mksource
@@ -225,6 +231,10 @@
# build fixes
patch -Np0 -i ${srcdir}/buildfix-gcc44.diff
patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff
+ # libwpd 0.9.0 fix
+ sed -i "s:libwpd-0.8:libwpd-0.9:g" configure.in
+ # fix new libx11 headers - see http://www.openoffice.org/issues/show_bug.cgi?id=115871 | https://bugs.gentoo.org/show_bug.cgi?id=344993
+ patch -Np0 -i ${srcdir}/libx11.diff
# gcc4.5 fix
patch -Np0 -i ${srcdir}/sal-cpprt-gcc-4.5-workaround.diff
@@ -300,6 +310,7 @@
--without-ppds\
--without-system-agg\
--without-system-mdds\
+ --with-system-libpwd\
--with-system-cppunit\
--with-system-redland\
--without-system-saxon\
@@ -316,6 +327,7 @@
--with-external-tar=${SRCDEST}\
$EXTRAOPTS
+# --without-system-libwpd\
# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
@@ -347,9 +359,10 @@
pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite - developement branch"
install=openoffice.install
depends=("curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd' 'libxaw' "neon>=0.28.6"
- 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.2.1" 'libxslt'
+ 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt'
'redland>=1.0.11.99' 'libgraphite' 'hyphen' 'lpsolve'
'hicolor-icon-theme' 'desktop-file-utils' 'gtk2') # keep gtk2 for install script
+ # 'libwpd'
# 'saxon'
optdepends=('java-runtime: adds java support'
'libcups: adds printing support'
Added: libx11.diff
===================================================================
--- libx11.diff (rev 0)
+++ libx11.diff 2010-12-10 21:52:21 UTC (rev 102747)
@@ -0,0 +1,12 @@
+--- vcl/unx/inc/dtint.hxx 2010-11-12 10:55:51.076691980 +0000
++++ vcl/unx/inc/dtint.hxx 2010-11-12 10:56:09.867692000 +0000
+@@ -36,7 +36,7 @@
+ class SalDisplay;
+ class AllSettings;
+
+-#ifndef _XLIB_H_
++#if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_)
+ // forwards from X
+ struct Display;
+ struct XEvent;
+
More information about the arch-commits
mailing list