[arch-commits] Commit in openoffice-base-beta/trunk (3 files)

[andyrtr at archlinux.org]

    Date: Friday, July 3, 2009 @ 04:40:58
  Author: andyrtr
Revision: 44643

upgpkg: openoffice-base-beta 3.1.1_ooo310_m14-2
    rebuild for xulrunner+libjpeg, added a buildfix for new xulrunner

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

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

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-07-03 06:48:05 UTC (rev 44642)
+++ ChangeLog	2009-07-03 08:40:58 UTC (rev 44643)
@@ -1,3 +1,8 @@
+2009-07-03 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.1.1-ooo310_m14-2 :
+        rebuild for new xulrunner, added buildfix                
+
 2009-06-29 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.1.1-ooo310_m14-1 :

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-03 06:48:05 UTC (rev 44642)
+++ PKGBUILD	2009-07-03 08:40:58 UTC (rev 44643)
@@ -3,7 +3,7 @@
 
 pkgname=openoffice-base-beta
 pkgver=3.1.1_ooo310_m14 # m9=RC1
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
 _OO_milestone=OOO310_m14
@@ -18,8 +18,8 @@
             'nss:		adds support for signed files/macros'
             'pstoedit:		translates PostScript and PDF graphics into other vector formats')
 makedepends=('bison' 'svn' 'automake' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl' 'libxtst'
-             'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.9.0.10'
-             'apache-ant' 'cairo' 'gperf' 'libcups' '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' 'pstoedit' 'gconf' 'openjdk6>=1.5') #'boost' 
 provides=('openoffice-base')
 source=(${pkgname}-${_OO_milestone}.tar.gz
 	template.desktop
@@ -30,6 +30,7 @@
 	shell.patch
 	soltools-mkdepend-getline.diff
 	buildfix-sw-printf.diff
+	openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
 	openoffice-beta.profile)
 options=('!distcc' '!ccache' '!makeflags')
 
@@ -62,6 +63,7 @@
 	patch -Np0 -i ${srcdir}/buildfix-gcc43.diff || return 1
 	patch -Np0 -i ${srcdir}/buildfix-sw-printf.diff || return 1
 	patch -Np0 -i ${srcdir}/soltools-mkdepend-getline.diff || return 1
+	patch -Np1 -i ${srcdir}/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch || return 1
 	
 	# allows soffice to find the user's firefox profile so that it can read
 	# its digital certificates. Nss stores digital certificates in your mozilla firefox profile. 

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 08:40:58 UTC (rev 44643)
@@ -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