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

[andyrtr at archlinux.org]

    Date: Saturday, December 19, 2009 @ 02:56:03
  Author: andyrtr
Revision: 61545

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

........
  r61544 | andyrtr | 2009-12-19 08:55:12 +0100 (Sa, 19 Dez 2009) | 2 lines
  
  upgpkg: openoffice-base-devel 3.2_dev300_m67-1
      new snapshot DEV300_m67
........

Modified:
  openoffice-base-devel/repos/extra-i686/	(properties)
  openoffice-base-devel/repos/extra-i686/ChangeLog
  openoffice-base-devel/repos/extra-i686/PKGBUILD

-----------+
 ChangeLog |    6 ++++++
 PKGBUILD  |   18 ++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)


Property changes on: openoffice-base-devel/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /openoffice-base-devel/trunk:1-60347
   + /openoffice-base-devel/trunk:1-61544

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-12-19 07:55:12 UTC (rev 61544)
+++ extra-i686/ChangeLog	2009-12-19 07:56:03 UTC (rev 61545)
@@ -1,3 +1,9 @@
+2009-12-18 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.2_dev300_m67-1:
+        - new snapshot
+	- build against system boost again
+
 2009-12-03 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.2_dev300_m66-1:

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-12-19 07:55:12 UTC (rev 61544)
+++ extra-i686/PKGBUILD	2009-12-19 07:56:03 UTC (rev 61545)
@@ -2,10 +2,9 @@
 # Maintainer: AndyRTR <andyrtr at archlinux.org>
 # Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
 
-
 pkgbase="openoffice-base-devel"
 pkgname=('openoffice-base-devel' 'openoffice-sdk-devel')
-_OO_milestone=DEV300_m66
+_OO_milestone=DEV300_m67
 pkgver=3.2_${_OO_milestone/DEV/dev}
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -13,13 +12,12 @@
 url="http://www.openoffice.org"
 makedepends=(# the real makedeps
              'bison' 'svn' 'automake' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl' 'libxtst'
-             'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.1.3" 
-             'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'poppler' 'pstoedit' 'gconf' "openjdk6>=1.6.1"
+             'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.1.6" 
+             'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'poppler' 'pstoedit' 'gconf' "openjdk6>=1.6.2"
 	     # from main OOo the deps
-	     "curl>=7.19.2" "hunspell>=1.2.8" "python>=2.6.2" 'libwpd' 'redland' 'libxaw' "neon>=0.28.4"
+	     "curl>=7.19.7" "hunspell>=1.2.8" "python>=2.6.4" 'libwpd' 'redland' 'libxaw' "neon>=0.28.6"
              'dbus-glib' "icu>=4.2.1" 'hsqldb-java' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils'
-	     'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap' 'lucene')
-	     # boost
+	     'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap' 'lucene' 'boost>=1.41.0')
 	     # libmythes
 source=(${pkgname}-${_OO_milestone}.tar.gz
 	http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
@@ -37,12 +35,12 @@
 
 build() {
 	# now mercurial http://wiki.services.openoffice.org/wiki/Mercurial_Pilot and http://wiki.services.openoffice.org/wiki/OOo_and_Mercurial
-#	mkdir -p ${srcdir}/${_OO_milestone}  # needed?
+#	mkdir -p ${srcdir}/${_OO_milestone}
 #	cd ${srcdir}
 #	hg -v clone -r ${_OO_milestone} http://hg.services.openoffice.org/hg/DEV300 ${srcdir}/${_OO_milestone}
 #	tar -cvzf ../${pkgname}-${_OO_milestone}.tar.gz ${_OO_milestone}/*
 #	return 1
-	
+
 	cd ${srcdir}/${_OO_milestone}
 	# just to make sure that it will detect the desired JDK/JVM - we want openjdk6
 	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
@@ -133,7 +131,6 @@
 	--without-nas\
 	--without-ppds\
 	--without-system-agg\
-	--without-system-boost\
 	--without-system-lucene\
 	--with-openldap\
 	--with-system-stdlibs\
@@ -155,6 +152,7 @@
 #	--with-system-jfreereport
 #	--with-system-mythes\
 # we will need myspell dicts for --with-system-dicts --without-myspell-dicts
+#	--without-system-boost\
 
 	# Setup environment for build
 	if [ "$CARCH" = "x86_64" ]; then