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

[Andreas Radke]

    Date: Friday, November 22, 2013 @ 16:28:24
  Author: andyrtr
Revision: 200216

prepare next release

Modified:
  libreoffice/trunk/PKGBUILD.42
Deleted:
  libreoffice/trunk/build_fix.diff

----------------+
 PKGBUILD.42    |   19 +++++++++----------
 build_fix.diff |   38 --------------------------------------
 2 files changed, 9 insertions(+), 48 deletions(-)

Modified: PKGBUILD.42
===================================================================
--- PKGBUILD.42	2013-11-22 13:41:50 UTC (rev 200215)
+++ PKGBUILD.42	2013-11-22 15:28:24 UTC (rev 200216)
@@ -18,7 +18,7 @@
 	'libreoffice-postgresql-connector'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.2.0.0.alpha1
+_LOver=4.2.0.0.beta1
 pkgver=4.2.0
 pkgrel=0.1
 arch=('i686' 'x86_64')
@@ -87,8 +87,8 @@
 	${_additional_source_url}/libodfgen-0.0.3.tar.bz2
 	${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
 	${_additional_source_url}/libatomic_ops-7_2d.zip
+	${_additional_source_url}/libe-book-0.0.2.tar.bz2
 	make-pyuno-work-with-system-wide-module-install.diff
-	build_fix.diff
 	libreoffice-common.sh libreoffice-common.csh)
 noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
@@ -126,10 +126,11 @@
 	libfreehand-0.0.0.tar.bz2
 	libodfgen-0.0.3.tar.bz2
 	Firebird-2.5.2.26540-0.tar.bz2
-	libatomic_ops-7_2d.zip)
-md5sums=('78918f93b7fbbd0e9ecd8d8f6345f1c2'
-         'a8c15ccdac1c4495df7ef066722c1550'
-         '2520565708de34d6abb744a3e7af78c8'
+	libatomic_ops-7_2d.zip
+	libe-book-0.0.2.tar.bz2)
+md5sums=('dbb8b7f5f64a407b6aef66f98b8163ff'
+         '48481fd38699c598b19d637ead29d34a'
+         'ec4982d81fac7c068095c7877273ca34'
          '15cb8c0803064faef0c4ddf5bc5ca279'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
@@ -167,8 +168,8 @@
          '9cafe7f50a3b2c5ebd2dc9c6c509d2b4'
          '21154d2004e025c8a3666625b0357bb5'
          'c0b86562d5aa40761a87134f83e6adcf'
+         '3a62e10c57270718cabfdfc4b7b4e095'
          '07d2bf5ad839a394cca008b3ec6e7bb1'
-         '4f5aac74dcfc496ec9688a0815df236f'
          '4195735a80876ae812fca5736b50192a'
          'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
 
@@ -187,13 +188,10 @@
 	done
 	popd
 	
-	# fix build broken linking unowinreg.dll
-	patch -Np1 -i ${srcdir}/build_fix.diff
     # unowinreg.dll must be a file not a symlink or the result will become a broken symlink
     # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
     rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
     cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources
-    #cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources
    
     # fix not upstreamable pyuno paths - patch taken from Debian
     patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
@@ -265,6 +263,7 @@
 		--without-system-libfreehand \
 		--without-system-firebird \
 		--without-system-libatomic-ops \
+		--without-system-libebook \
 		--with-system-dicts \
 		--with-external-dict-dir=/usr/share/hunspell \
 		--with-external-hyph-dir=/usr/share/hyphen \

Deleted: build_fix.diff
===================================================================
--- build_fix.diff	2013-11-22 13:41:50 UTC (rev 200215)
+++ build_fix.diff	2013-11-22 15:28:24 UTC (rev 200216)
@@ -1,38 +0,0 @@
-From 85d584416fd7d51a397807597b5f36e39820a317 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos at collabora.co.uk>
-Date: Wed, 13 Nov 2013 09:02:22 +0000
-Subject: installer: use 'mkdir -p' before 'ln -sf'
-
-Fixes the "ln: failed to create symbolic link
-'.../usr/lib/libreoffice/sdk/classes/win/unowinreg.dll': No such file or
-directory" problem, reported at
-http://lists.freedesktop.org/archives/libreoffice/2013-November/057443.html
-
-Change-Id: Ibe7dbbecc670921ca3c372cc9b8655cf2f50aefa
----
-diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
-index 917066f..aab676f 100644
---- a/solenv/bin/modules/installer/worker.pm
-+++ b/solenv/bin/modules/installer/worker.pm
-@@ -23,6 +23,7 @@ use File::Copy;
- use File::stat;
- use File::Temp qw(tmpnam);
- use File::Path;
-+use File::Basename;
- use installer::control;
- use installer::converter;
- use installer::exiter;
-@@ -369,7 +370,9 @@ sub install_simple ($$$$$$)
-         my $onelink = ${$unixlinksarray}[$i];
-         my $target = $onelink->{'Target'};
-         my $destination = $onelink->{'destination'};
--        my $cmd = "ln -sf '$target' '$destdir$destination'";
-+        my $cmd = "mkdir -p '" . dirname($destdir . $destination) . "'";
-+        system($cmd) && die "Failed to execute \"$cmd\"";
-+        $cmd = "ln -sf '$target' '$destdir$destination'";
- 
-         system($cmd) && die "Failed \"$cmd\"";
-         push @lines, "$destination\n";
---
-cgit v0.9.0.2-2-gbebe
-