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

andyrtr at archlinux.org andyrtr at archlinux.org
Thu Jul 2 18:41:04 UTC 2009 

    Date: Thursday, July 2, 2009 @ 14:41:04
  Author: andyrtr
Revision: 44574

Merged revisions 44573 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/openoffice-base/trunk

........
  r44573 | andyrtr | 2009-07-02 18:40:27 +0000 (Do, 02 Jul 2009) | 2 lines
  
  upgpkg: openoffice-base 3.1.0-4
      rebuild for xulrunner; plugin enabled again; libsm dep removed(covered by xulrunner)
........

Added:
  openoffice-base/repos/testing-x86_64/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
    (from rev 44573, openoffice-base/trunk/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch)
Modified:
  openoffice-base/repos/testing-x86_64/	(properties)
  openoffice-base/repos/testing-x86_64/ChangeLog
  openoffice-base/repos/testing-x86_64/PKGBUILD

------------------------------------------------------+
 ChangeLog                                            |    6 +++
 PKGBUILD                                             |   29 +++++++++--------
 openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch |   16 +++++++++
 3 files changed, 39 insertions(+), 12 deletions(-)


Property changes on: openoffice-base/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /openoffice-base/trunk:1-44507
   + /openoffice-base/trunk:1-44573

Modified: testing-x86_64/ChangeLog
===================================================================
--- testing-x86_64/ChangeLog	2009-07-02 18:40:27 UTC (rev 44573)
+++ testing-x86_64/ChangeLog	2009-07-02 18:41:04 UTC (rev 44574)
@@ -1,5 +1,11 @@
 2009-07-02 Andreas Radke <andyrtr at archlinux.org>
 
+	* 3.1.0-4 :
+	buildfix for new xulrunner
+	enable the plugin again
+
+2009-07-02 Andreas Radke <andyrtr at archlinux.org>
+
 	* 3.1.0-3 :
 	- rebuild for libjpeg 7 
 	- temporarely disable plugin, cannot be built

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-07-02 18:40:27 UTC (rev 44573)
+++ testing-x86_64/PKGBUILD	2009-07-02 18:41:04 UTC (rev 44574)
@@ -3,14 +3,14 @@
 
 pkgname=openoffice-base
 pkgver=3.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
 _OO_milestone=OOO310_m11  # =RC2 = final
 license=('LGPL3')
 url="http://www.openoffice.org"
 install=openoffice.install
-depends=('curl>=7.19.4' 'hunspell>=1.2.8' 'python>=2.6.1' 'libwpd' 'redland' 'libsm'
+depends=('curl>=7.19.4' 'hunspell>=1.2.8' 'python>=2.6.1' 'libwpd' 'redland'
          'libxaw' 'neon>=0.28.3-2' 'dbus-glib' 'icu>=4.2' 'hsqldb-java' 'libxslt' 'desktop-file-utils')
 optdepends=('java-runtime:	adds java support'
             'libcups:		adds printing support'
@@ -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'
-             'apache-ant>=1.7.1-2' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.5-4') #'boost' #'xulrunner>=1.9.1-2'
+             'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.9.1-2'
+             'apache-ant>=1.7.1-2' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.5-4') #'boost'
 source=(ftp://ftp.archlinux.org/other/openoffice/${pkgname}-${_OO_milestone}.tar.bz2
 	template.desktop
 	default-no-startup-wizard.diff
@@ -29,7 +29,8 @@
 	shell.patch
 	openoffice.profile
 	soltools-mkdepend-getline.diff
-	buildfix-sw-printf.diff)
+	buildfix-sw-printf.diff
+	openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch)
 options=('!distcc' '!ccache' '!makeflags')
 md5sums=('650d8f2b648b291688bed9821f9dda91'
          '5e22f876c3c5d4754af394399e9bf375'
@@ -40,8 +41,10 @@
          'a51200f770c635355c430cc5052db8cf'
          '8d68d44c941a687813ddd968383cdf27'
          '7f9012680d0e329227445925710bafe6'
-         '2461119a2b7f1580f997f504a76a1c98')
+         '2461119a2b7f1580f997f504a76a1c98'
+         '75c7e5dd7cf4c266f48565fb6425f8c4')
 
+
 # see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
 
 build() {
@@ -73,7 +76,9 @@
 	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. 
 	patch -Np0 -i ${srcdir}/soffice-detect-mozilla-certificates.diff || return 1
@@ -141,7 +146,6 @@
 	--with-system-libwpd\
 	--with-system-libxml\
 	--with-system-libxslt\
-	--disable-mozilla\
 	--with-system-neon\
 	--with-system-python\
 	--with-system-redland\
@@ -151,6 +155,7 @@
 	--with-system-xrender-headers\
 	--with-system-zlib\
 	--with-system-openssl\
+	--with-system-mozilla=libxul\
 	--without-fonts\
 	--without-afms\
 	--without-gpc\
@@ -169,8 +174,8 @@
 	--with-use-shell=bash\
 	 $EXTRAOPTS || return 1
 
-#	--with-system-mozilla=libxul\
-	 
+#
+#	--disable-mozilla\	 
 #	--with-system-boost\
 
 	# Setup environment for build
@@ -258,9 +263,9 @@
 	chmod +rX -R ${pkgdir}/usr
 
 	# link the mozilla-plugin
-#	mkdir -p ${pkgdir}/usr/lib/mozilla/plugins/
-#	cd ${pkgdir}/usr/lib/mozilla/plugins/
-#	ln -v -s /opt/openoffice/program/libnpsoplugin.so .
+	mkdir -p ${pkgdir}/usr/lib/mozilla/plugins/
+	cd ${pkgdir}/usr/lib/mozilla/plugins/
+	ln -v -s /opt/openoffice/program/libnpsoplugin.so .
 
 	# set desktop variable to force gtk/gnome vcl usage
 	install -m755 -d ${pkgdir}/etc/profile.d

Copied: openoffice-base/repos/testing-x86_64/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch (from rev 44573, openoffice-base/trunk/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch)
===================================================================
--- testing-x86_64/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch	                        (rev 0)
+++ testing-x86_64/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch	2009-07-02 18:41:04 UTC (rev 44574)
@@ -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

More information about the arch-commits mailing list