[arch-commits] Commit in openoffice-base-beta/trunk (PKGBUILD libx11.diff)

[andyrtr at archlinux.org]

    Date: Friday, December 10, 2010 @ 16:41:47
  Author: andyrtr
Revision: 102746

prepare next build

Added:
  openoffice-base-beta/trunk/libx11.diff
Modified:
  openoffice-base-beta/trunk/PKGBUILD

-------------+
 PKGBUILD    |   17 +++++++++++++----
 libx11.diff |   12 ++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-10 21:31:33 UTC (rev 102745)
+++ PKGBUILD	2010-12-10 21:41:47 UTC (rev 102746)
@@ -4,8 +4,8 @@
 
 pkgbase="openoffice-base-beta"
 pkgname=('openoffice-base-beta' 'openoffice-sdk-beta')
-_OO_milestone=OOO330_m16
-pkgver=3.3.0_${_OO_milestone/OOO/ooo} # m16 = RC6
+_OO_milestone=OOO330_m17
+pkgver=3.3.0_${_OO_milestone/OOO/ooo} # m17 = RC7
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
@@ -33,6 +33,7 @@
 	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/cppu-lbnames-enable-gcc-4.5.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-beta.profile
 	${_additional_source_url}/63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
 	${_additional_source_url}/09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz
@@ -109,7 +110,7 @@
 	${_additional_source_url}/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
 	${_additional_source_url}/cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2)
 options=('!distcc' '!ccache' '!makeflags')
-md5sums=('8b5e33a49cb705fce9546313d80d4c9c'
+md5sums=('fedf84ae4816e9aef93da9ab8eb7fbb3'
          'e3a0b76dcd876f3d721ee7183729153d'
          'aa65d79fe9023e982835c77227ead2b0'
          '71f136a31e296a04ab68932a31dd533e'
@@ -121,6 +122,7 @@
          'e666e8cea0ef557a8bce41c58dd16408'
          'cf01fa2669f828864146842e040e3cf8'
          'bb5ada95f7b11a5cac5d669f7ae8baaa'
+         'ad01b65e677334e0764ad31f24aee428'
          '2e8c89d4bfda9b5ccd3b118c87eff62a'
          '63ddc5116488985e820075e65fbe6aa4'
          '09357cc74975b01714e00c5899ea1881'
@@ -197,6 +199,7 @@
          '067201ea8b126597670b5eff72e1f66c'
          'cf8a6967f7de535ae257fa411c98eb88')
 
+
 # source PKGBUILD && mksource
 mksource() {
 	mkdir /tmp/$pkgname-source
@@ -217,7 +220,8 @@
 	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
 
 	# some speedups
-	export SMP="5"
+#	export SMP="5"
+	export SMP="1"
 	MAXMODULESFLAG="-P${SMP}"
 	MAXPROCESSESFLAG="-P${SMP}"
 	export nodep=true
@@ -228,6 +232,10 @@
 	patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff
 	# http://www.openoffice.org/issues/show_bug.cgi?id=114999
 	patch -Np1 -i ${srcdir}/configure.set-redland-cflags.patch
+	# 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}/cppu-lbnames-enable-gcc-4.5.diff
@@ -304,6 +312,7 @@
 	--without-ppds\
 	--without-system-agg\
 	--without-system-mdds\
+	--without-system-libwpd\
 	--with-system-cppunit\
 	--with-system-redland\
 	--without-system-saxon\

Added: libx11.diff
===================================================================
--- libx11.diff	                        (rev 0)
+++ libx11.diff	2010-12-10 21:41:47 UTC (rev 102746)
@@ -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;
+