[arch-commits] Commit in libreoffice-fresh/trunk (4 files)
Andreas Radke
andyrtr at archlinux.org
Fri May 13 16:01:41 UTC 2016
Date: Friday, May 13, 2016 @ 18:01:40
Author: andyrtr
Revision: 267924
upgpkg: libreoffice-fresh 5.1.3-1
upstream update 5.1.3; hooks! add a buildfix for gcc6
Added:
libreoffice-fresh/trunk/gcc6_buildfix.diff
Modified:
libreoffice-fresh/trunk/PKGBUILD
libreoffice-fresh/trunk/update_liborcus_to_0.11.0.diff
Deleted:
libreoffice-fresh/trunk/libreoffice-fresh.install
--------------------------------+
PKGBUILD | 28 +++++++++++++++++-----------
gcc6_buildfix.diff | 12 ++++++++++++
libreoffice-fresh.install | 17 -----------------
update_liborcus_to_0.11.0.diff | 4 ++--
4 files changed, 31 insertions(+), 30 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-05-13 13:10:49 UTC (rev 267923)
+++ PKGBUILD 2016-05-13 16:01:40 UTC (rev 267924)
@@ -11,8 +11,8 @@
pkgbase=libreoffice-fresh
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=5.1.2.2
-pkgver=5.1.2
+_LOver=5.1.3.2
+pkgver=5.1.3
pkgrel=1
arch=('i686' 'x86_64')
license=('LGPL3')
@@ -22,7 +22,7 @@
'libxslt' 'redland' 'icu' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite'
'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
- 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'xdg-utils' 'gst-plugins-base-libs'
+ 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs'
'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell2' 'vigra' 'clucene'
'junit' 'libmythes' 'libwpg' 'mesa' 'java-environment' 'postgresql-libs'
@@ -67,7 +67,8 @@
make-pyuno-work-with-system-wide-module-install.diff
libreoffice-fresh.sh libreoffice-fresh.csh
update_liborcus_to_0.11.0.diff
- remove_unnecessary_orcus_external_usage_from_makefiles.diff)
+ remove_unnecessary_orcus_external_usage_from_makefiles.diff
+ gcc6_buildfix.diff)
noextract=(boost_1_59_0.tar.bz2
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -97,11 +98,11 @@
libfreehand-0.1.1.tar.bz2
185d60944ea767075d27247c3162b3bc-unowinreg.dll)
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
-md5sums=('6145510261094a85a6cecaecefa10c94'
+md5sums=('cbe602264e58f7c93e72068c408e3551'
'SKIP'
- '0ff7ef91f9f84d5a9a21e3bee72bdae7'
+ 'f485479a135582f37335a92d773416fe'
'SKIP'
- '4075e99e6075fb7bd163a5f66e24c0f3'
+ 'a93714b74f1c04c534729a9511311886'
'SKIP'
'6aa9a5c6a4ca1016edd0ed1178e3cb87'
'1f24ab1d39f4a51faf22244c94a6203f'
@@ -134,8 +135,9 @@
'dcb5ad3e5f7139227677ea064b075422'
'4195735a80876ae812fca5736b50192a'
'e7e4b3e70e99e5cba8f8dfcacf3b0d87'
- '46585d8df3706ce004c494bfb9c23391'
- 'ac71e21ecc0976b2ea6e233854963d4b')
+ '3f526b966a672d1237cfcbadae0e3f95'
+ 'ac71e21ecc0976b2ea6e233854963d4b'
+ '6752d22fc5bcbdbef0640c6aca163e50')
prepare() {
@@ -168,6 +170,7 @@
# i686 build broken
[ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlimport/d' sw/Module_sw.mk
[ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlexport7/d' sw/Module_sw.mk
+ [ "$CARCH" = "i686" ] && sed -i '/CppunitTest_basic_scanner/d' basic/Module_basic.mk
# qt4 fix
sed -i "s:qmake:qmake-qt4:g" configure.ac
@@ -178,6 +181,10 @@
patch -Np1 -i ${srcdir}/remove_unnecessary_orcus_external_usage_from_makefiles.diff
sed -i "s:mdds >= 0.12.0:mdds-1.0 >= 0.12.0:g" configure.ac
+
+ # fix checking whether KDE is >= 4.2... configure: error: KDE version too old
+ # http://bugs.debian.org/823145
+ patch -Np1 -i ${srcdir}/gcc6_buildfix.diff
}
build() {
@@ -313,7 +320,7 @@
'libxslt' 'redland' 'icu' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite'
'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
- 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'glu' 'libpagemaker'
+ 'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker'
'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' 'gtk2'
'liborcus' 'liblangtag' 'libexttextcat' 'libfbclient' 'libcmis')
optdepends=('java-runtime: adds java support'
@@ -337,7 +344,6 @@
etc/libreoffice/psprint.conf
etc/profile.d/libreoffice-fresh.sh
etc/profile.d/libreoffice-fresh.csh)
- install=$pkgbase.install
provides=('libreoffice' 'libreoffice-en-US')
conflicts=('libreoffice-still')
Added: gcc6_buildfix.diff
===================================================================
--- gcc6_buildfix.diff (rev 0)
+++ gcc6_buildfix.diff 2016-05-13 16:01:40 UTC (rev 267924)
@@ -0,0 +1,12 @@
+--- libreoffice-5.1.3.2/configure.ac 2016-05-12 21:26:13.099948527 +0200
++++ libreoffice-5.1.3.2/configure.ac.new 2016-05-12 21:46:50.613664941 +0200
+@@ -11169,6 +11169,9 @@
+ if test "x$kde_incdir" = "xno"; then
+ AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
+ fi
++ # see http://bugs.debian.org/823145. -isystem /usr/include fails with
++ # gcc6
++ if test "$kde_incdir" = "/usr/include"; then kde_incdir=; fi
+
+ dnl Check for KDE4 libraries
+ AC_MSG_CHECKING([for KDE4 libraries])
Deleted: libreoffice-fresh.install
===================================================================
--- libreoffice-fresh.install 2016-05-13 13:10:49 UTC (rev 267923)
+++ libreoffice-fresh.install 2016-05-13 16:01:40 UTC (rev 267924)
@@ -1,17 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor
- update-desktop-database -q
- update-mime-database usr/share/mime > /dev/null 2>&1
-
-# echo "> LibreOffice now uses highly experimental gtk3 vcl by default"
-# echo "> on some desktops. To use stable gtk2 vcl uncomment"
-# echo "> it in /etc/profile.d/libreoffice-fresh.{sh,csh}"
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Modified: update_liborcus_to_0.11.0.diff
===================================================================
--- update_liborcus_to_0.11.0.diff 2016-05-13 13:10:49 UTC (rev 267923)
+++ update_liborcus_to_0.11.0.diff 2016-05-13 16:01:40 UTC (rev 267924)
@@ -73,8 +73,8 @@
+++ b/download.lst
@@ -117,8 +117,8 @@ export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
- export OPENSSL_MD5SUM := f3c710c045cdee5fd114feb69feba7aa
- export OPENSSL_TARBALL := openssl-1.0.2g.tar.gz
+ export OPENSSL_MD5SUM := 9392e65072ce4b614c1392eefc1f23d0
+ export OPENSSL_TARBALL := openssl-1.0.2h.tar.gz
-export ORCUS_MD5SUM := e6efcbe50a5fd4d50d513c9a7a4139b0
-export ORCUS_TARBALL := liborcus-0.9.2.tar.gz
+export ORCUS_MD5SUM := ca1e5d486b29cd519bb1d9845a6a768e
More information about the arch-commits
mailing list