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

andyrtr at archlinux.org andyrtr at archlinux.org
Sat Jun 13 18:42:46 EDT 2009


    Date: Saturday, June 13, 2009 @ 18:42:46
  Author: andyrtr
Revision: 42420

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

........
  r42419 | andyrtr | 2009-06-13 22:42:06 +0000 (Sa, 13 Jun 2009) | 2 lines
  
  upgpkg: openoffice-base-devel 3.2_dev300_m50-1
      new version 3.2_dev300_m50
........

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-native-setup.diff

----------------------------+
 ChangeLog                  |    5 +++++
 PKGBUILD                   |   12 +++++-------
 buildfix-native-setup.diff |   12 ------------
 3 files changed, 10 insertions(+), 19 deletions(-)


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

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-06-13 22:42:06 UTC (rev 42419)
+++ extra-x86_64/ChangeLog	2009-06-13 22:42:46 UTC (rev 42420)
@@ -1,3 +1,8 @@
+2009-06-13 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.2_dev300_m50:
+	- new snapshot
+
 2009-06-02 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.2_dev300_m49:

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-06-13 22:42:06 UTC (rev 42419)
+++ extra-x86_64/PKGBUILD	2009-06-13 22:42:46 UTC (rev 42420)
@@ -2,23 +2,23 @@
 # Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
 
 pkgname=openoffice-base-devel
-pkgver=3.2_dev300_m49
+pkgver=3.2_dev300_m50
 pkgrel=1
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=('i686' 'x86_64')
-_OO_milestone=DEV300_m49
+_OO_milestone=DEV300_m50
 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.2" 'hsqldb-java' 'libxslt' 'desktop-file-utils')
+depends=("curl>=7.19.2" "hunspell>=1.2.8" "python>=2.6.2" 'libwpd' 'redland' 'libxaw' "neon>=0.28.4" 'dbus-glib' "icu>=4.2" 'hsqldb-java' 'libxslt' 'desktop-file-utils')
 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' 'subversion' 'curl' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl'
-             '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'
+             'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.0.11"
+             'apache-ant' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' "openjdk6>=1.5") # 'boost'
 provides=('openoffice-base')
 source=(${pkgname}-${_OO_milestone}.tar.gz
 	template.desktop
@@ -29,7 +29,6 @@
 	shell.patch
 	system_hsqldb.diff
 	buildfix_FormulaMissingHeader.diff
-	buildfix-native-setup.diff
 	openoffice.profile)
 options=('!distcc' '!ccache' '!makeflags')
 
@@ -61,7 +60,6 @@
 	# 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-native-setup.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. 

Deleted: extra-x86_64/buildfix-native-setup.diff
===================================================================
--- extra-x86_64/buildfix-native-setup.diff	2009-06-13 22:42:06 UTC (rev 42419)
+++ extra-x86_64/buildfix-native-setup.diff	2009-06-13 22:42:46 UTC (rev 42420)
@@ -1,12 +0,0 @@
---- solenv/bin/modules/installer/control.pm
-+++ solenv/bin/modules/installer/control.pm
-@@ -714,7 +714,8 @@
- 		
- 	if ( $installer::globals::patch ) {	$installer::globals::addsystemintegration = 0; }
- 	if ( $installer::globals::languagepack ) { $installer::globals::addsystemintegration = 0; }
--
-+if ( $installer::globals::packageformat eq "native" ) { 
-+	$installer::globals::addsystemintegration = 0; }
- 	my $infoline = "Value of \$installer::globals::addsystemintegration: $installer::globals::addsystemintegration\n";
- 	push( @installer::globals::globallogfileinfo, $infoline);
- }



More information about the arch-commits mailing list