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

[andyrtr at archlinux.org]

    Date: Friday, July 3, 2009 @ 07:06:11
  Author: andyrtr
Revision: 44646

upgpkg: openoffice-base-devel 3.2_dev300_m51-1
    new snapshot dev300_m51; rebuild for xulrunner+libjpeg, added a buildfix for new xulrunner and one for pfdimport extensions changes

Added:
  openoffice-base-devel/trunk/buildfix_system_zlib_pdfimport.diff
  openoffice-base-devel/trunk/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
Modified:
  openoffice-base-devel/trunk/ChangeLog
  openoffice-base-devel/trunk/PKGBUILD

------------------------------------------------------+
 ChangeLog                                            |    5 ++
 PKGBUILD                                             |    8 +++-
 buildfix_system_zlib_pdfimport.diff                  |   29 +++++++++++++++++
 openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch |   16 +++++++++
 4 files changed, 55 insertions(+), 3 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-07-03 08:41:28 UTC (rev 44645)
+++ ChangeLog	2009-07-03 11:06:11 UTC (rev 44646)
@@ -1,8 +1,11 @@
-2009-06-30 Andreas Radke <andyrtr at archlinux.org>
+2009-07-03 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.2_dev300_m51:
 	- new snapshot
 	- build with system-poppler
+	- rebuild for libjpeg+xulrunner
+	- added a buildfix for
+	http://www.openoffice.org/issues/show_bug.cgi?id=103212
 
 2009-06-13 Andreas Radke <andyrtr at archlinux.org>
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-03 08:41:28 UTC (rev 44645)
+++ PKGBUILD	2009-07-03 11:06:11 UTC (rev 44646)
@@ -18,8 +18,8 @@
             'pstoedit:		translates PostScript and PDF graphics into other vector formats'
             'poppler:		for shipped pdfimport extension')
 makedepends=('bison' 'subversion' 'curl' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl'
-             'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.0.11"
-             'apache-ant' 'cairo' 'gperf' 'libcups' 'poppler' 'pstoedit' 'gconf' "openjdk6>=1.5") # 'boost'
+             'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.1-2"
+             'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'poppler' 'pstoedit' 'gconf' "openjdk6>=1.5-4") # 'boost'
 provides=('openoffice-base')
 source=(${pkgname}-${_OO_milestone}.tar.gz
 	template.desktop
@@ -30,6 +30,8 @@
 	shell.patch
 	system_hsqldb.diff
 	buildfix_FormulaMissingHeader.diff
+	openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
+	buildfix_system_zlib_pdfimport.diff
 	openoffice.profile)
 options=('!distcc' '!ccache' '!makeflags')
 
@@ -61,6 +63,8 @@
 	# build fixes
 	patch -Np0 -i ${srcdir}/buildfix-gcc43.diff || return 1
 	patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
+	patch -Np1 -i ${srcdir}/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch || return 1
+	patch -Np0 -i ${srcdir}/buildfix_system_zlib_pdfimport.diff || return 1
 	
 	# allows soffice to find the user's firefox profile so that it can read
 	# his digital certificates. Nss stores digital certificates in your mozilla firefox profile. 

Added: buildfix_system_zlib_pdfimport.diff
===================================================================
--- buildfix_system_zlib_pdfimport.diff	                        (rev 0)
+++ buildfix_system_zlib_pdfimport.diff	2009-07-03 11:06:11 UTC (rev 44646)
@@ -0,0 +1,29 @@
+--- sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx.orig	2009-06-11 18:24:02.000000000 +0100
++++ sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx	2009-06-11 18:24:13.000000000 +0100
+@@ -30,7 +30,11 @@
+ 
+ #include "pnghelper.hxx"
+ 
+-#include "zlib/zlib.h"
++#ifdef SYSTEM_ZLIB
++#include "zlib.h"
++#else
++#include <zlib/zlib.h>
++#endif
+ 
+ using namespace pdfi;
+ 
+--- sdext/source/pdfimport/xpdfwrapper/makefile.mk.orig	2009-06-11 18:24:29.000000000 +0100
++++ sdext/source/pdfimport/xpdfwrapper/makefile.mk	2009-06-11 18:24:46.000000000 +0100
+@@ -41,6 +41,10 @@
+ 
+ .INCLUDE: settings.mk
+ 
++.IF "$(SYSTEM_ZLIB)" == "YES"
++CFLAGS+=-DSYSTEM_ZLIB
++.ENDIF
++
+ .IF "$(ENABLE_PDFIMPORT)" == "NO"
+ @all:
+ 	@echo "PDF Import extension disabled."
+

Added: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
===================================================================
--- openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch	                        (rev 0)
+++ openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch	2009-07-03 11:06:11 UTC (rev 44646)
@@ -0,0 +1,16 @@
+Index: source/plugin/inc/plugin/unx/plugcon.hxx
+===================================================================
+RCS file: /cvs/util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx,v
+retrieving revision 1.13.64.2
+diff -u -r1.13.64.2 plugcon.hxx
+--- openoffice.org.orig/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	15 Dec 2008 10:29:47 -0000	1.13.64.2
++++ openoffice.org/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	23 Dec 2008 09:24:57 -0000
+@@ -102,7 +102,7 @@
+ extern "C" {
+ #include <npsdk/npupp.h>
+ }
+-#include <npapi.h>
++#include <npsdk/npapi.h>
+ 
+ #if NP_VERSION_MINOR < 17
+ // compatibility hack: compile with older NPN api header, but define