[arch-commits] Commit in libreoffice/trunk (PKGBUILD.36 buildfix.diff)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sun Jun 10 10:49:31 UTC 2012
Date: Sunday, June 10, 2012 @ 06:49:30
Author: andyrtr
Revision: 161370
get LibO 3.6 prerelease built
Added:
libreoffice/trunk/buildfix.diff
Modified:
libreoffice/trunk/PKGBUILD.36
---------------+
PKGBUILD.36 | 51 ++++++++++++++++++++++++---------------------------
buildfix.diff | 12 ++++++++++++
2 files changed, 36 insertions(+), 27 deletions(-)
Modified: PKGBUILD.36
===================================================================
--- PKGBUILD.36 2012-06-10 10:47:54 UTC (rev 161369)
+++ PKGBUILD.36 2012-06-10 10:49:30 UTC (rev 161370)
@@ -22,8 +22,8 @@
'libreoffice-scripting-beanshell'
'libreoffice-scripting-javascript'
'libreoffice-extension-scripting-python') # svn up -r 142692 (last one with all extensions built
-_LOver=3.5.98.1
-pkgver=3.5.98.1
+_LOver=3.5.99.1
+pkgver=3.5.99.1
pkgrel=1
arch=('i686' 'x86_64')
license=('LGPL3')
@@ -51,7 +51,7 @@
source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
${_additional_source_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
- ${_additional_source_url}/2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
+ ${_additional_source_url}/90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -76,11 +76,12 @@
${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
${_additional_source_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
- ${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
+ ${_additional_source_url}/ce31ac7b92cb5e66459f67213bbb6168-libcmis-0.2.2.tar.gz
${_additional_source_url}/c216ded0275129ccfef44fbc236ac16a-libcdr-0.0.7.tar.bz2
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+ buildfix.diff
libreoffice-common.sh libreoffice-common.csh)
-noextract=(2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
+noextract=(90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
185d60944ea767075d27247c3162b3bc-unowinreg.dll
@@ -90,7 +91,7 @@
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
- 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
+ ce31ac7b92cb5e66459f67213bbb6168-libcmis-0.2.2.tar.gz
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@@ -110,12 +111,12 @@
db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
c216ded0275129ccfef44fbc236ac16a-libcdr-0.0.7.tar.bz2
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('2afec4f110b26b9d1fc6be99c9ce9daa'
- '4c4486daa290df9df59a1caaa6c8747d'
- 'f8723b1db19b0ef988512c204ed460ea'
+md5sums=('f38c33f67b21a2eaa5792467d9e069fb'
+ 'be5d355094fc11c4c7cbc19a29a8fd9f'
+ 'e0db53f6c45ab409e7bb2004ebfcfbf7'
'18f577b374d60b3c760a3a3350407632'
'48d647fbd8ef8889e5a7f422c1bfda94'
- '2fa6028324347860e684e75310818d43'
+ '90010e213dd25648e70f0cc12f8fed55'
'1f24ab1d39f4a51faf22244c94a6203f'
'35c94d2df8893241173de1d16b6034c0'
'798b2ffdc8bcfe7bca2cf92b62caf685'
@@ -140,9 +141,10 @@
'ba2930200c9f019c2d93a8c88c651a0f'
'0ff7d225d087793c8c2c680d77aac3e7'
'6097739c841f671cb21332b9cc593ae7'
- '7c2549f6b0a8bb604e6c4c729ffdcfe6'
+ 'ce31ac7b92cb5e66459f67213bbb6168'
'c216ded0275129ccfef44fbc236ac16a'
'185d60944ea767075d27247c3162b3bc'
+ '234e91ac65945ce1ab1e3839780e90f7'
'f0e72d0e1bc93a50a3aa9d31350b156c'
'867c682b45f477f916786e00c45d7ab7')
@@ -165,17 +167,8 @@
ln -s ../libreoffice-translations-$_LOver/translations .
# buildfixes & bugfixes
- # one late fix to solve make distro-pack-install issue
-# patch -Np1 -i ${srcdir}/gmake_install.diff
-# patch -Np1 -i ${srcdir}/smp_buildfix.diff
- # https://bugs.archlinux.org/task/29854 based on 3.6/master patch http://cgit.freedesktop.org/libreoffice/core/patch/?id=20c24114143d6d38774b56a142fd4ae05094308e
-# patch -Np1 -i ${srcdir}/fix_broken_hebrew_wordwrapping.diff
-
- # unset C(XX)FLAGS
- # http://www.openoffice.org/issues/show_bug.cgi?id=103205
-# unset CFLAGS
-# unset CXXFLAGS
-
+ patch -Np1 -i ${srcdir}/buildfix.diff
+
#use the CFLAGS but remove the LibO overridden ones
for i in $CFLAGS; do
case "$i" in
@@ -229,7 +222,6 @@
--without-myspell-dicts \
--without-system-libvisio \
--without-system-libcmis \
- --without-system-sampleicc \
--without-system-libexttextcat \
--without-system-jfreereport \
--without-system-apache-commons \
@@ -349,6 +341,11 @@
install -dm755 ${pkgdir}/usr/share/bash-completion/completions
mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
rm -rf ${pkgdir}/etc/bash_completion.d
+
+ # some files would conflict
+ rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar
+ rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
+ rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
}
package_libreoffice-base() {
@@ -389,7 +386,7 @@
install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry
install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry
-# # create directories from *list.txt file
+ # create directories from *list.txt file
# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
# install -dm755 ${pkgdir}/${directory/\%dir/}
# done
@@ -636,7 +633,7 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
+ unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
}
package_libreoffice-extension-presenter-screen() {
@@ -688,8 +685,8 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services}
- mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/
- mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
+ mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/
+ mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
}
package_libreoffice-extension-scripting-python() {
Added: buildfix.diff
===================================================================
--- buildfix.diff (rev 0)
+++ buildfix.diff 2012-06-10 10:49:30 UTC (rev 161370)
@@ -0,0 +1,12 @@
+--- 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)
More information about the arch-commits
mailing list