git » libreoffice-still.git » commit d0733fe

prepare build against updated internal liborcus; add liblibreofficekitgtk.so symlink - FS#51887

author Andreas Radke
2017-02-07 21:50:03 UTC
committer Andreas Radke
2017-02-07 21:50:03 UTC
parent fdfde0a81b56bf3f377f7fcfb32f4b258e5bfddd

prepare build against updated internal liborcus; add liblibreofficekitgtk.so symlink - FS#51887

PKGBUILD +12 -4

diff --git a/PKGBUILD b/PKGBUILD
index ab56c1c..56aa403 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ pkgbase=libreoffice-still
 pkgname=('libreoffice-still-sdk' 'libreoffice-still')
 _LOver=5.2.5.1
 pkgver=5.2.5
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -27,7 +27,7 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'lib
 	'junit' 'libmythes' 'libwpg'  'java-environment' 'postgresql-libs' 'libgl'
 	'bluez-libs' 'gdb' 'doxygen'  'libatomic_ops' 'mdds' 'glew'
 	'apr' 'serf' 'ttf-liberation' 'glm' 'libxinerama' 'libpagemaker'
-	'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liborcus' 'liblangtag'
+	'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag'
 	'libexttextcat' 'libfbclient' 'libcmis' 'gobject-introspection')
 
 _mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}"
@@ -60,6 +60,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 	${_additional_source_url}/libfreehand-0.1.1.tar.bz2
 	${_additional_source_url}/976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
+	${_additional_source_url}/liborcus-0.11.2.tar.gz
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	make-pyuno-work-with-system-wide-module-install.diff
 	libreoffice-still.sh libreoffice-still.csh)
@@ -88,6 +89,7 @@ noextract=(boost_1_60_0.tar.bz2
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 	libfreehand-0.1.1.tar.bz2
 	976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
+	liborcus-0.11.2.tar.gz
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll)
 validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
 sha256sums=('9756a322a497aa83d096fa0ac5541622d9a8f5038ce9c0ded48199566ab0d300'
@@ -121,6 +123,7 @@ sha256sums=('9756a322a497aa83d096fa0ac5541622d9a8f5038ce9c0ded48199566ab0d300'
             '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
             '45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877'
             'ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581'
+            '10afc617fd7600fa02bd4467d2e3c7bd058f84e4d672d558e1db90e82dafd256'
             'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
             'ad028513c29691b3ec3a35de21af2f224b48015afe0fbcc6fb834fdf7f613165'
             '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4'
@@ -202,7 +205,7 @@ build() {
 		--with-system-libcmis \
 		--with-system-libmspub \
 		--with-system-libexttextcat \
-		--with-system-orcus \
+		--without-system-orcus \
 		--with-system-liblangtag \
 		--without-system-jfreereport \
 		--without-system-apache-commons \
@@ -294,7 +297,7 @@ package_libreoffice-still() {
 		'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
 		'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker'
 		'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
-		'liborcus' 'liblangtag' 'libexttextcat' 'libfbclient' 'libcmis')
+		'liblangtag' 'libexttextcat' 'libfbclient' 'libcmis')
 	optdepends=('java-runtime:     adds java support'
 		'java-environment: required by extension-wiki-publisher and extension-nlpsolver'
 		'pstoedit:         translates PostScript and PDF graphics into other vector formats'
@@ -345,6 +348,11 @@ package_libreoffice-still() {
 	ln -svf /usr/lib/libreoffice/program/unohelper.py \
 		${pkgdir}/usr/lib/python3.6/site-packages/unohelper.py
 
+	# add a symlink required for gnome-documents; FS#51887
+	# https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html
+	ln -svf /usr/lib/libreoffice/program/liblibreofficekitgtk.so \
+		${pkgdir}/usr/lib/liblibreofficekitgtk.so
+
 	# cleanup
 	rm -rf ${pkgdir}/usr/share/libreoffice/sdk