[arch-commits] Commit in libreoffice/trunk (PKGBUILD.42 build_fix.diff)
Andreas Radke
andyrtr at nymeria.archlinux.org
Wed Nov 13 20:29:25 UTC 2013
Date: Wednesday, November 13, 2013 @ 21:29:25
Author: andyrtr
Revision: 199511
prepare next release
Added:
libreoffice/trunk/build_fix.diff
Modified:
libreoffice/trunk/PKGBUILD.42
----------------+
PKGBUILD.42 | 31 ++++++++++++++++---------------
build_fix.diff | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+), 15 deletions(-)
Modified: PKGBUILD.42
===================================================================
--- PKGBUILD.42 2013-11-13 20:11:14 UTC (rev 199510)
+++ PKGBUILD.42 2013-11-13 20:29:25 UTC (rev 199511)
@@ -16,7 +16,6 @@
'libreoffice-writer'
'libreoffice-en-US'
'libreoffice-postgresql-connector'
- 'libreoffice-extension-presentation-minimizer'
'libreoffice-extension-wiki-publisher'
'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
_LOver=4.2.0.0.alpha1
@@ -89,6 +88,7 @@
${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
${_additional_source_url}/libatomic_ops-7_2d.zip
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
@@ -168,6 +168,7 @@
'21154d2004e025c8a3666625b0357bb5'
'c0b86562d5aa40761a87134f83e6adcf'
'07d2bf5ad839a394cca008b3ec6e7bb1'
+ '4f5aac74dcfc496ec9688a0815df236f'
'4195735a80876ae812fca5736b50192a'
'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
@@ -185,6 +186,14 @@
ln -s ${srcdir}/$source .
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
@@ -275,7 +284,8 @@
--with-system-headers\
--without-system-hsqldb \
--with-alloc=system\
- --with-system-clucene
+ --with-system-clucene \
+ --disable-dependency-tracking
# --enable-mergelibs \ # https://bugs.archlinux.org/task/34414
@@ -327,7 +337,7 @@
conflicts=('go-openoffice')
replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python'
- 'libreoffice-extension-report-builder')
+ 'libreoffice-extension-report-builder' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-presentation-minimizer')
# create directories from *list.txt file
for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do
@@ -639,16 +649,6 @@
done
}
-package_libreoffice-extension-presentation-minimizer() {
-
- pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice-common' 'gcc-libs')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
package_libreoffice-extension-wiki-publisher() {
pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
@@ -657,7 +657,8 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
+ #unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
+ unzip -q ${srcdir}/libreoffice-$_LOver/workdir/unxlng*/Extension/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
}
package_libreoffice-extension-nlpsolver() {
@@ -668,5 +669,5 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
+ unzip -q ${srcdir}/libreoffice-$_LOver/workdir/unxlng*/Extension/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
}
Added: build_fix.diff
===================================================================
--- build_fix.diff (rev 0)
+++ build_fix.diff 2013-11-13 20:29:25 UTC (rev 199511)
@@ -0,0 +1,38 @@
+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
+
More information about the arch-commits
mailing list