[arch-commits] Commit in libreoffice/trunk (PKGBUILD buildfix.diff)

[andyrtr at archlinux.org]

    Date: Thursday, December 6, 2012 @ 12:07:49
  Author: andyrtr
Revision: 172904

upgpkg: libreoffice 3.6.4-1

upstream update 3.6.4

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

---------------+
 PKGBUILD      |   17 ++++++-----------
 buildfix.diff |   12 ------------
 2 files changed, 6 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-06 15:07:17 UTC (rev 172903)
+++ PKGBUILD	2012-12-06 17:07:49 UTC (rev 172904)
@@ -24,9 +24,9 @@
 	'libreoffice-extension-scripting-python'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=3.6.3.2
-pkgver=3.6.3
-pkgrel=3
+_LOver=3.6.4.3
+pkgver=3.6.4
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -81,7 +81,6 @@
 	${_additional_source_url}/3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	make-pyuno-work-with-system-wide-module-install.diff
-	buildfix.diff
 	libreoffice-common.sh libreoffice-common.csh)
 noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
 	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
@@ -113,9 +112,9 @@
 	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('17ccf623caa77dc135d5343a51fa1ddd'
-         '94a8d18009f8e0e4ae80dc34c43604d7'
-         'f76c4439c211f229d49e5fb10ca2ba73'
+md5sums=('6e88d3a83691cb8ee5081487c8345a6a'
+         '388acc72e3bb86afd036140a91d4e0d6'
+         'f656e24263ffdff1c7748d41e18eca9c'
          '18f577b374d60b3c760a3a3350407632'
          'f02578f5218f217a9f20e9c30e119c6a'
          '94e7f271e38c976462558b4278590178'
@@ -147,7 +146,6 @@
          '3c0037fb07dea2f0bbae8386fa7c6a9a'
          '185d60944ea767075d27247c3162b3bc'
          '97bf43dda273d79ff90c848ab53b0e3c'
-         '234e91ac65945ce1ab1e3839780e90f7'
          'abcb1b0a7deaffe13ab3d7ca70becb49'
          '72790a4103da259a55cadd66db931d00')
 
@@ -168,9 +166,6 @@
 	
 	ln -s ../libreoffice-help-$_LOver/helpcontent2 .
 	ln -s ../libreoffice-translations-$_LOver/translations .
-
-	# buildfixes & bugfixes
-    patch -Np1 -i ${srcdir}/buildfix.diff	# leaves out a broken pdfimport test
     
     # fix not upstreamable pyuno paths - patch taken from Debian
     patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff

Deleted: buildfix.diff
===================================================================
--- buildfix.diff	2012-12-06 15:07:17 UTC (rev 172903)
+++ buildfix.diff	2012-12-06 17:07:49 UTC (rev 172904)
@@ -1,12 +0,0 @@
---- libreoffice-core-3.5.99.1/sdext/Module_sdext.mk	2012-06-07 13:57:10.000000000 +0200
-+++ libreoffice-core-3.5.99.1/sdext/Module_sdext.mk.new	2012-06-09 18:21:03.376024873 +0200
-@@ -49,9 +49,6 @@
-     StaticLibrary_pdfimport_s \
- ))
- 
--$(eval $(call gb_Module_add_check_targets,sdext,\
--    CppunitTest_pdfimport \
--))
- endif
- 
- ifeq ($(ENABLE_PRESENTER_SCREEN),YES)