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

andyrtr at archlinux.org andyrtr at archlinux.org
Tue Jan 27 11:39:34 UTC 2009


    Date: Tuesday, January 27, 2009 @ 06:39:34
  Author: andyrtr
Revision: 25674

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

........
  r25673 | andyrtr | 2009-01-27 11:39:00 +0000 (Di, 27 Jan 2009) | 2 lines
  
  upgpkg: openoffice-base-devel 3.1_dev300_m40-1
      new snapshot DEV300_m40
........

Modified:
  openoffice-base-devel/repos/extra-x86_64/	(properties)
  openoffice-base-devel/repos/extra-x86_64/ChangeLog
  openoffice-base-devel/repos/extra-x86_64/PKGBUILD
Deleted:
  openoffice-base-devel/repos/extra-x86_64/buildfix-openjdk-6-no-rhino.diff
  openoffice-base-devel/repos/extra-x86_64/libxmlsec-findcerts.diff

----------------------------------+
 ChangeLog                        |    4 +++
 PKGBUILD                         |   24 ++++++++-------------
 buildfix-openjdk-6-no-rhino.diff |   42 -------------------------------------
 libxmlsec-findcerts.diff         |   28 ------------------------
 4 files changed, 14 insertions(+), 84 deletions(-)


Property changes on: openoffice-base-devel/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /openoffice-base-devel/trunk:1-24557
   + /openoffice-base-devel/trunk:1-25673

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-01-27 11:39:00 UTC (rev 25673)
+++ extra-x86_64/ChangeLog	2009-01-27 11:39:34 UTC (rev 25674)
@@ -1,3 +1,7 @@
+openoffice-base-devel - 3.1_dev300_m40-1
+- next snapshot
+- use internal boost, #12983
+
 openoffice-base-devel - 3.1_dev300_m39-1
 - next snapshot
 

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-01-27 11:39:00 UTC (rev 25673)
+++ extra-x86_64/PKGBUILD	2009-01-27 11:39:34 UTC (rev 25674)
@@ -2,36 +2,34 @@
 # Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
 
 pkgname=openoffice-base-devel
-pkgver=3.1_dev300_m39
+pkgver=3.1_dev300_m40
 pkgrel=1
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=('i686' 'x86_64')
-_OO_milestone=DEV300_m39
+_OO_milestone=DEV300_m40
 license=('LGPL3')
 url="http://www.openoffice.org"
 install=openoffice.install
-depends=('curl>=7.19.2' 'hunspell>=1.2.8' 'python>=2.6.1' 'libwpd' 'redland' 
-         'libxaw' 'neon>=0.28.3-2' 'dbus-glib' 'icu>=4.0-2' 'hsqldb-java' 'libxslt' 'sqlite3')
+depends=("curl>=7.19.2" "hunspell>=1.2.8" "python>=2.6.1" 'libwpd' 'redland' 
+         'libxaw' "neon>=0.28.3-2" 'dbus-glib' "icu>=4.0-2" 'hsqldb-java' 'libxslt' 'sqlite3')
 optdepends=('java-runtime:	adds java support'
             'libcups:		adds printing support'
             'gconf:		adds additional gnome support'
             'nss:		adds support for signed files/macros'
             'pstoedit:		translates PostScript and PDF graphics into other vector formats')
 makedepends=('bison' 'cvs' 'curl' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl'
-             'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.9.0.5'
-             'boost' 'apache-ant' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.3.1-2')
+             'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.0.5"
+             'apache-ant' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' "openjdk6>=1.3.1-2") # 'boost'
 provides=('openoffice-base')
 
 source=(${pkgname}-${_OO_milestone}.tar.gz
 	template.desktop
 	default-no-startup-wizard.diff
 	default-system-fpicker.diff
-	libxmlsec-findcerts.diff
 	soffice-detect-mozilla-certificates.diff
 	buildfix-gcc43.diff
 	shell.patch
 	system_hsqldb.diff
-	buildfix-openjdk-6-no-rhino.diff
 	buildfix_FormulaMissingHeader.diff
 	openoffice.profile)
 options=('!distcc' '!ccache' '!makeflags')
@@ -64,10 +62,7 @@
 	# build fixes
 	patch -Np0 -i ${srcdir}/buildfix-gcc43.diff || return 1
 	patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
-	patch -Np0 -i ${srcdir}/buildfix-openjdk-6-no-rhino.diff || return 1
 
-	# allows xmlsec to be able to read the format of the digital certificates.
-	patch -Np0 -i ${srcdir}/libxmlsec-findcerts.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. 
 	patch -Np0 -i ${srcdir}/soffice-detect-mozilla-certificates.diff || return 1
@@ -90,7 +85,7 @@
 	 else EXTRAOPTS="--with-stlport"
 	fi
 
-	cd ${srcdir}/${_OO_milestone}/config_office
+	cd ${srcdir}/${_OO_milestone}
 
 	# export C(XX)FLAGS
 	export ARCH_FLAGS="$CFLAGS"
@@ -125,7 +120,6 @@
 	--enable-vba\
 	--enable-verbose\
 	--with-package-format=native\
-	--with-system-boost\
 	--with-system-db\
 	--with-system-cairo\
 	--with-system-curl\
@@ -164,11 +158,13 @@
 	--with-use-shell=bash\
 	 $EXTRAOPTS || return 1
 
+#	--with-system-boost\
+
 #	--disable-qadevooo\ http://www.openoffice.org/issues/show_bug.cgi?id=91452
 #	--enable-evolution2\
 #	--with-system-dicts\
-	cd ..
 
+
 	# Setup environment for build
 	if [ "$CARCH" = "x86_64" ]; then
 	  source LinuxX86-64Env.Set.sh

Deleted: extra-x86_64/buildfix-openjdk-6-no-rhino.diff
===================================================================
--- extra-x86_64/buildfix-openjdk-6-no-rhino.diff	2009-01-27 11:39:00 UTC (rev 25673)
+++ extra-x86_64/buildfix-openjdk-6-no-rhino.diff	2009-01-27 11:39:34 UTC (rev 25674)
@@ -1,42 +0,0 @@
-? unxlngx6.pro
-Index: rhino1_5R5.patch
-===================================================================
-RCS file: /cvs/external/rhino/rhino1_5R5.patch,v
-retrieving revision 1.3
-diff -u -r1.3 rhino1_5R5.patch
---- rhino/rhino1_5R5.patch	11 Apr 2008 07:03:06 -0000	1.3
-+++ rhino/rhino1_5R5.patch	12 Aug 2008 20:08:16 -0000
-@@ -1174,3 +1174,14 @@
-          PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
-          return new ProtectionDomain(cs, pc);
-      }
-+--- misc/rhino1_5R5/toolsrc/build.xml	2004-03-25 17:54:34.000000000 -0300
-++++ misc/build/rhino1_5R5/toolsrc/build.xml	2008-08-12 16:58:52.000000000 -0
-+va	Fri Mar 28 17:24:23 2008
-+@@ -68,6 +32,7 @@
-+            includes="org/**/*.java"
-+            deprecation="on"
-+            debug="${debug}">
-++      <compilerarg value="-Xbootclasspath:${java.home}/jre/lib/rt.jar"/>
-+     </javac>
-+     <copy todir="${nest}/${classes}">
-+       <fileset dir="." includes="org/**/*.properties" />
-? unxlngx6.pro
-Index: java/build.xml
-===================================================================
-RCS file: /cvs/framework/scripting/java/build.xml,v
-retrieving revision 1.36
-diff -u -r1.36 build.xml
---- scripting/java/build.xml	11 Apr 2008 09:46:13 -0000	1.36
-+++ scripting/java/build.xml	12 Aug 2008 23:20:31 -0000
-@@ -85,7 +85,9 @@
-   <target name="compile" depends="prepare">
-     <javac srcdir="com" destdir="${jardir}"
-          includes="**/*.java" classpathref="idlclasspath"
--         debug="${debug}" optimize="${optimize}" deprecation="off"/>
-+         debug="${debug}" optimize="${optimize}" deprecation="off">
-+	 <compilerarg value="-Xbootclasspath:${java.home}/jre/lib/rt.jar"/>
-+    </javac>
-     <javac srcdir="Framework/" destdir="${jardir}"
-          includes="**/*.java" classpathref="idlclasspath" debug="${debug}" 
-          optimize="${optimize}" deprecation="off">

Deleted: extra-x86_64/libxmlsec-findcerts.diff
===================================================================
--- extra-x86_64/libxmlsec-findcerts.diff	2009-01-27 11:39:00 UTC (rev 25673)
+++ extra-x86_64/libxmlsec-findcerts.diff	2009-01-27 11:39:34 UTC (rev 25674)
@@ -1,28 +0,0 @@
---- libxmlsec/xmlsec1-1.2.6.patch
-+++ libxmlsec/xmlsec1-1.2.6.patch
-@@ -17395,3 +17395,25 @@
-   XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
-   
-   XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
-+*** misc/xmlsec1-1.2.6/src/nss/x509.c	2007-03-16 12:51:38.000000000 -0400
-+--- misc/build/xmlsec1-1.2.6/src/nss/x509.c	2007-03-19 11:23:22.000000000 -0400
-+*************** xmlSecNssKeyDataX509VerifyAndExtractKey(
-+*** 1365,1373 ****
-+  		/*-
-+  		 * I'll search key according to KeyReq.
-+  		 */
-+-         slot = cert->slot ;
-+          if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePrivate ) == xmlSecKeyDataTypePrivate ) {
-+!             if( ( priKey = PK11_FindPrivateKeyFromCert( slot , cert , NULL ) ) == NULL ) {
-+                  xmlSecError( XMLSEC_ERRORS_HERE ,
-+                      xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) ,
-+                      "PK11_FindPrivateKeyFromCert" ,
-+--- 1365,1372 ----
-+  		/*-
-+  		 * I'll search key according to KeyReq.
-+  		 */
-+          if( ( keyInfoCtx->keyReq.keyType & xmlSecKeyDataTypePrivate ) == xmlSecKeyDataTypePrivate ) {
-+!             if( ( priKey = PK11_FindKeyByAnyCert( cert , NULL ) ) == NULL ) {
-+                  xmlSecError( XMLSEC_ERRORS_HERE ,
-+                      xmlSecErrorsSafeString( xmlSecKeyDataGetName( data ) ) ,
-+                      "PK11_FindPrivateKeyFromCert" ,




More information about the arch-commits mailing list