[arch-commits] Commit in libreoffice/trunk (PKGBUILD.41 fix_install.diff)
Andreas Radke
andyrtr at nymeria.archlinux.org
Sat Jun 15 11:21:50 UTC 2013
Date: Saturday, June 15, 2013 @ 13:21:49
Author: andyrtr
Revision: 188560
prepare 4.1.x release
Added:
libreoffice/trunk/fix_install.diff
Modified:
libreoffice/trunk/PKGBUILD.41
------------------+
PKGBUILD.41 | 65 +++++++++++++++++++-----------------------
fix_install.diff | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 112 insertions(+), 35 deletions(-)
Modified: PKGBUILD.41
===================================================================
--- PKGBUILD.41 2013-06-15 11:20:59 UTC (rev 188559)
+++ PKGBUILD.41 2013-06-15 11:21:49 UTC (rev 188560)
@@ -16,12 +16,11 @@
'libreoffice-en-US'
'libreoffice-postgresql-connector'
'libreoffice-extension-presentation-minimizer'
- 'libreoffice-extension-report-builder'
'libreoffice-extension-wiki-publisher'
'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.1.0.0.beta1
+_LOver=4.1.0.0.beta2
pkgver=4.1.0
-pkgrel=0.1 #beta1
+pkgrel=0.2 #beta2
arch=('i686' 'x86_64')
license=('LGPL3')
url="http://www.libreoffice.org/"
@@ -29,7 +28,8 @@
'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost'
'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit'
'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
- 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez'
+ 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen'
+ 'clucene' 'bluez-libs' # 'harfbuzz'
# the runtime dependencies
"curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1"
@@ -74,13 +74,15 @@
${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
- ${_additional_source_url}/d77fa4a6e3e485553e30ced8d9bb3b50-libodfgen-0.0.1.tar.bz2
+ ${_additional_source_url}/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2
+ ${_additional_source_url}/c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2
${_additional_source_url}/libcdr-0.0.14.tar.bz2
${_additional_source_url}/libmspub-0.0.6.tar.bz2
${_additional_source_url}/libmwaw-0.1.9.tar.bz2
- ${_additional_source_url}/libvisio-0.0.27.tar.bz2
+ ${_additional_source_url}/libvisio-0.0.28.tar.bz2
make-pyuno-work-with-system-wide-module-install.diff
- libreoffice-common.sh libreoffice-common.csh)
+ libreoffice-common.sh libreoffice-common.csh
+ fix_install.diff)
noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
185d60944ea767075d27247c3162b3bc-unowinreg.dll
08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2
@@ -110,14 +112,15 @@
36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
- d77fa4a6e3e485553e30ced8d9bb3b50-libodfgen-0.0.1.tar.bz2
+ 8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2
+ c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2
libcdr-0.0.14.tar.bz2
libmspub-0.0.6.tar.bz2
libmwaw-0.1.9.tar.bz2
- libvisio-0.0.27.tar.bz2 )
-md5sums=('ccf58a56617b3184a547393d29844b3c'
- '94745bc3ce9585a72cb11f9f95c1f860'
- 'cfd16802227ae46b5cf04abbd95a49b8'
+ libvisio-0.0.28.tar.bz2 )
+md5sums=('a785e1ed4809246edc39d0b55a807cdd'
+ '96ea39853d9058cb9e98749539827187'
+ '6ecbe09a87d5c2c1a186671d24643111'
'f02578f5218f217a9f20e9c30e119c6a'
'1f24ab1d39f4a51faf22244c94a6203f'
'35c94d2df8893241173de1d16b6034c0'
@@ -147,17 +150,19 @@
'0168229624cfac409e766913506961a8'
'17410483b5b5f267aa18b7e00b65e6e0'
'185d60944ea767075d27247c3162b3bc'
- 'd77fa4a6e3e485553e30ced8d9bb3b50'
+ '8473296c671b6e3dd8197f4145e0854b'
+ 'c48827713e93539dc7285f9e86ffbdc5'
'd88f9b94df880d2c05be943b000ca112'
'1120705cd0f0d9bd5506360bf57b6c2e'
'2090daf6e8a27b52e8c5f26c915bd7c5'
- '4e9a029d8390a1707eb49a1a918797ff'
+ '05574c2ec54dd0c29d75cacdf9419f44'
'07d2bf5ad839a394cca008b3ec6e7bb1'
'4195735a80876ae812fca5736b50192a'
- 'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
+ 'e7e4b3e70e99e5cba8f8dfcacf3b0d87'
+ 'd1fa6b1b1820cc5a7154720a1dcb0a4a')
prepare() {
-#return 1
+
cd ${srcdir}/libreoffice-$_LOver
# fix exttextcat build error
@@ -174,6 +179,10 @@
# fix not upstreamable pyuno paths - patch taken from Debian
patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
+ # fix file-lists
+ # http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-1&id=8ce82f83fb8146b684bec5d903d76f034ba37d4a
+ patch -Np1 -i ${srcdir}/fix_install.diff
+
#use the CFLAGS but remove the LibO overridden ones
for i in $CFLAGS; do
case "$i" in
@@ -237,6 +246,7 @@
--without-system-apache-commons \
--without-system-libodfgen \
--without-system-libmwaw \
+ --without-system-harfbuzz \
--with-system-dicts \
--with-external-dict-dir=/usr/share/hunspell \
--with-external-hyph-dir=/usr/share/hyphen \
@@ -259,12 +269,6 @@
--with-system-clucene\
--without-system-servlet-api
-# --with-unix-wrapper="libreoffice" \
-# --disable-ext-mysql-connector \
-# --with-system-mysql \
-# --without-system-mozilla \
-
-
# --enable-mergelibs \ # https://bugs.archlinux.org/task/34414
# --without-ppds\ # breaks spadmin permission
@@ -309,10 +313,12 @@
etc/libreoffice/psprint.conf)
groups=('libreoffice')
provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
- 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python')
+ 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python'
+ 'libreoffice-extension-report-builder')
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-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python'
+ 'libreoffice-extension-report-builder')
# create directories from *list.txt file
for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do
@@ -631,17 +637,6 @@
unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
}
-package_libreoffice-extension-report-builder() {
-
- pkgdesc="This extension creates smart-looking database reports"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
-
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"
Added: fix_install.diff
===================================================================
--- fix_install.diff (rev 0)
+++ fix_install.diff 2013-06-15 11:21:49 UTC (rev 188560)
@@ -0,0 +1,82 @@
+From 8ce82f83fb8146b684bec5d903d76f034ba37d4a Mon Sep 17 00:00:00 2001
+From: Petr Mladek <pmladek at suse.cz>
+Date: Fri, 07 Jun 2013 12:13:24 +0000
+Subject: distro-install-file-lists: handle new filelists created for 4.1
+
+Change-Id: I2d7a52b396a46f1f6546b92eb5612958a2cb7397
+---
+diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
+index d83855b..bbd462b 100755
+--- a/bin/distro-install-file-lists
++++ b/bin/distro-install-file-lists
+@@ -80,6 +80,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
+ gid_Module_Root_Files_[0-9] \
+ gid_Module_Root_Hack \
+ gid_Module_Oo_Linguistic \
++ gid_Module_Root_Extension_Dictionary_* \
+ gid_Module_Root_Ure_Hidden ; do
+ merge_flists $module $FILELISTSDIR/common_list.txt
+ done
+@@ -100,6 +101,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
+ merge_flists gid_Module_Brand_Prg_Math $FILELISTSDIR/math_list.txt
+ merge_flists gid_Module_Brand_Prg_Impress $FILELISTSDIR/impress_list.txt
+ merge_flists gid_Module_Brand_Prg_Wrt $FILELISTSDIR/writer_list.txt
++ merge_flists gid_Module_Reportbuilder $FILELISTSDIR/base_list.txt
++ merge_flists gid_Module_Pdfimport $FILELISTSDIR/draw_list.txt
++
+ # FIXME: small; low dependencies; why optional module?
+ merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/impress_list.txt
+ else
+@@ -115,6 +119,8 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
+ merge_flists gid_Module_Brand_Prg_Math $FILELISTSDIR/common_list.txt
+ merge_flists gid_Module_Brand_Prg_Impress $FILELISTSDIR/common_list.txt
+ merge_flists gid_Module_Brand_Prg_Wrt $FILELISTSDIR/common_list.txt
++ merge_flists gid_Module_Reportbuilder $FILELISTSDIR/common_list.txt
++ merge_flists gid_Module_Pdfimport $FILELISTSDIR/common_list.txt
+ # FIXME: small; low dependencies; why optional module?
+ merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/common_list.txt
+ fi
+@@ -133,26 +139,26 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
+ merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/draw_list.txt
+ merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt
+ merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/pyuno_list.txt
+- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt
+- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt
++ merge_flists gid_Module_Pyuno $FILELISTSDIR/pyuno_list.txt
++ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt
+ merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt
+ merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt
+ else
+ merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt
+ merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt
+ merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/mailmerge_list.txt
+- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt
++ merge_flists gid_Module_Pyuno $FILELISTSDIR/pyuno_list.txt
+ merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt
+- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt
++ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt
+ merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/filters_list.txt
+ fi
+ else
+ merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt
+ merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt
+ merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/common_list.txt
+- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/common_list.txt
++ merge_flists gid_Module_Pyuno $FILELISTSDIR/common_list.txt
+ merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/common_list.txt
+- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/common_list.txt
++ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/common_list.txt
+ merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt
+ fi
+
+@@ -413,7 +419,7 @@ else
+ create_package_directory gid_Module_Brand_Prg_Wrt pkg/libreoffice-writer
+ create_package_directory gid_Module_Brand_Prg_Impress pkg/libreoffice-impress
+ create_package_directory gid_Module_Brand_Prg_Base pkg/libreoffice-base
+- create_package_directory gid_Module_Optional_Pyuno pkg/python-uno
++ create_package_directory gid_Module_Pyuno pkg/python-uno
+ create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome
+ create_package_directory gid_Module_Optional_Tde pkg/libreoffice-tde
+ create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde
+--
+cgit v0.9.0.2-2-gbebe
More information about the arch-commits
mailing list