[arch-commits] Commit in libreoffice/trunk (2 files)

[andyrtr at archlinux.org]

    Date: Tuesday, July 19, 2011 @ 04:43:55
  Author: andyrtr
Revision: 132023

upgpkg: libreoffice 3.4.2rc1-1
upstream prerelease 3.4.2rc1; needs testing for new pkg split

Modified:
  libreoffice/trunk/PKGBUILD
Deleted:
  libreoffice/trunk/buildfix_64bit_system_libjpeg.diff

------------------------------------+
 PKGBUILD                           |    6 +-----
 buildfix_64bit_system_libjpeg.diff |   11 -----------
 2 files changed, 1 insertion(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-19 08:31:05 UTC (rev 132022)
+++ PKGBUILD	2011-07-19 08:43:55 UTC (rev 132023)
@@ -353,7 +353,6 @@
 		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
 		$EXTRAOPTS || return 1
 
-		#--with-lang="en-US" \ <- makes it fail with a stupid error msg, see remove it at all to get en-US integrated. maybe later switch to "ALL"
 #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
 
 #--with-system-graphite --enable-graohite ?
@@ -371,7 +370,6 @@
 	# fake installation to create split file lists
 	mkdir $srcdir/fakeinstall
 	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
-	#yes | make DESTDIR=${srcdir}/fakeinstall distro-pack-install
 }
 
 #check() {
@@ -415,9 +413,6 @@
  conflicts=('go-openoffice')
  replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
 
- # remove base.desktop file that belongs to the LibO-base pkg
-# sed -i '/\/usr\/share\/applications\/libreoffice\-base\.desktop/d' ${srcdir}/build/file-lists/common_list.txt
-
  # create directories from *list.txt file
  for directory in `grep ^%dir ${srcdir}/build/file-lists/common_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
@@ -681,6 +676,7 @@
 
 package_libreoffice-en-US() {
   pkgdesc="English (US) language pack for LibreOffice"
+  #arch=('any')
   provides=('openoffice-en-US' 'libreoffice-langpack')
   replaces=(openoffice-en-US)
   conflicts=(openoffice-en-US)

Deleted: buildfix_64bit_system_libjpeg.diff
===================================================================
--- buildfix_64bit_system_libjpeg.diff	2011-07-19 08:31:05 UTC (rev 132022)
+++ buildfix_64bit_system_libjpeg.diff	2011-07-19 08:43:55 UTC (rev 132023)
@@ -1,11 +0,0 @@
---- solenv/inc/libs.mk	2009-07-02 09:44:33.084467312 +0000
-+++ solenv/inc/libs.mk.new	2009-07-02 10:44:03.420819776 +0000
-@@ -211,7 +211,7 @@
- .IF "$(OS)" == "FREEBSD"
- JPEG3RDLIB=/usr/local/lib/libjpeg.so
- .ELIF "$(CPUNAME)" == "X86_64" || "$(CPUNAME)" == "S390X" || "$(CPUNAME)" == "POWERPC64"
--JPEG3RDLIB=/usr/lib64/libjpeg.so
-+JPEG3RDLIB=/usr/lib/libjpeg.so
- .ELSE
- JPEG3RDLIB=/usr/lib/libjpeg.so
- .ENDIF