[arch-commits] Commit in openoffice-base-beta/trunk (PKGBUILD redland.patch)

[andyrtr at archlinux.org]

    Date: Saturday, March 27, 2010 @ 05:04:54
  Author: andyrtr
Revision: 73716

upgpkg: openoffice-base-beta 3.2.1_ooo320_m14-1
new snapshot 3.2.1_ooo320_m14 - fix redland issues

Modified:
  openoffice-base-beta/trunk/PKGBUILD
  openoffice-base-beta/trunk/redland.patch

---------------+
 PKGBUILD      |    4 ++--
 redland.patch |   15 +++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-27 06:23:06 UTC (rev 73715)
+++ PKGBUILD	2010-03-27 09:04:54 UTC (rev 73716)
@@ -232,9 +232,9 @@
 	
 	# install extensions
        pushd ${srcdir}/${_OO_milestone}/solver/320/unxlng?6.pro/bin
-         install -D -m644 sun-report-builder.oxt ${pkgdir}/usr/lib/openoffice/share/extension/install/sun-report-builder.oxt || return 1
+         install -D -m644 oracle-report-builder.oxt ${pkgdir}/usr/lib/openoffice/share/extension/install/oracle-report-builder.oxt || return 1
 	 install -D -m644 swext/wiki-publisher.oxt ${pkgdir}/usr/lib/openoffice/share/extension/install/wiki-publisher.oxt || return 1
-	 install -D -m644 minimizer/sun-presentation-minimizer.oxt ${pkgdir}/usr/lib/openoffice/share/extension/install/sun-presentation-minimizer.oxt || return 1
+	 install -D -m644 minimizer/presentation-minimizer.oxt ${pkgdir}/usr/lib/openoffice/share/extension/install/presentation-minimizer.oxt || return 1
 	 install -D -m644 presenter/presenter-screen.oxt ${pkgdir}/usr/lib/openoffice/share/extension/install/presenter-screen.oxt || return 1
 	 install -D -m644 pdfimport/pdfimport.oxt ${pkgdir}/usr/lib/openoffice/share/extension/install/pdfimport.oxt || return 1
        popd

Modified: redland.patch
===================================================================
--- redland.patch	2010-03-27 06:23:06 UTC (rev 73715)
+++ redland.patch	2010-03-27 09:04:54 UTC (rev 73716)
@@ -25,21 +25,20 @@
  	test "$with_system_redland" != "no"; then
  	AC_MSG_RESULT([external])
  	SYSTEM_REDLAND=YES
-diff -r 5a3095bbb41b redland/redland/makefile.mk
---- a/redland/redland/makefile.mk	Fri Feb 12 10:25:14 2010 +0000
-+++ b/redland/redland/makefile.mk	Fri Feb 19 15:12:45 2010 +0000
-@@ -61,10 +61,7 @@
-     $(TARFILE_NAME).patch.ooo_build \
-     $(TARFILE_NAME).patch.win32
+--- a/redland/redland/makefile.mk	2010-03-26 21:18:26.000000000 +0000
++++ a/redland/redland/makefile.mk.new	2010-03-26 22:18:19.218945343 +0000
+@@ -57,10 +57,7 @@
+     $(TARFILE_NAME).patch.win32 \
  
+ 
 -PATCH_FILES=$(OOO_PATCH_FILES) \
 -    $(TARFILE_NAME).patch.free_null \
 -    $(TARFILE_NAME).patch.storage_hashes_context_serialize_get_statement \
--    $(TARFILE_NAME).patch.storage_hashes_list_duplicates
+-    $(TARFILE_NAME).patch.storage_hashes_list_duplicates \
 +PATCH_FILES=$(OOO_PATCH_FILES)
  
+ 
  .IF "$(OS)"=="OS2"
- BUILD_ACTION=dmake
 diff -r 5a3095bbb41b redland/redland/redland-1.0.8.patch.free_null
 --- a/redland/redland/redland-1.0.8.patch.free_null	Fri Feb 12 10:25:14 2010 +0000
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000