diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2016-07-03 22:10:29 +0200 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2016-07-03 22:10:29 +0200 |
| commit | dbc7c3c450ca1253f502aecfc117e37f0e22e0f1 (patch) | |
| tree | 4e2e35b8fb4cd45ba0df2b4fad50e61a81b929ce /app-office | |
| parent | package.mask, metadata: drop lotus-notes to maintainer-needed and mask for re... (diff) | |
| download | gentoo-dbc7c3c450ca1253f502aecfc117e37f0e22e0f1.tar.gz gentoo-dbc7c3c450ca1253f502aecfc117e37f0e22e0f1.tar.bz2 gentoo-dbc7c3c450ca1253f502aecfc117e37f0e22e0f1.zip | |
app-office/libreoffice: Fix build with gcc-6, bug 584892
Package-Manager: portage-2.3.0
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch | 40 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-5.1.4.2.ebuild | 3 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-5.1.9999.ebuild | 3 |
3 files changed, 46 insertions, 0 deletions
diff --git a/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch b/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch new file mode 100644 index 000000000000..9e7ee7376813 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch @@ -0,0 +1,40 @@ +From 91fcc0032c2d0d343b914dfe3bea0b0bf1589e91 Mon Sep 17 00:00:00 2001 +From: Rene Engelhard <rene@debian.org> +Date: Tue, 24 May 2016 16:35:57 +0200 +Subject: [PATCH] KDE4 cflags no /usr/include usage to fix build failure with + gcc6 + +Change-Id: I53106b9ebfa7cc5c7b6c6d6f3bb3a4e5f2261f4f +--- + configure.ac | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 091abb4..86cc7b6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11117,6 +11117,7 @@ the root of your Qt installation by exporting QT4DIR before running "configure". + 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 ++ if test "$kde_incdir" = "/usr/include"; then kde_incdir=; fi + + dnl Check for KDE4 libraries + AC_MSG_CHECKING([for KDE4 libraries]) +@@ -11134,7 +11135,12 @@ the root of your Qt installation by exporting QT4DIR before running "configure". + fi + + PKG_CHECK_MODULES([QT4],[QtNetwork QtGui]) +- KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" ++ if ! test -z "$kde_incdir"; then ++ KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" ++ else ++ KDE4_CFLAGS="$QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" ++ fi ++ + KDE4_LIBS="-L$kde_libdir -lkio -lkfile -lkdeui -lkdecore -L$qt_lib_dir $QT4_LIBS" + KDE4_CFLAGS=$(printf '%s' "$KDE4_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") + FilterLibs "$KDE4_LIBS" +-- +2.9.0 + diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild index 22da8a7a6c9e..ca9fc14bee41 100644 --- a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild +++ b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild @@ -242,6 +242,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} " PATCHES=( + # from 5.2 branch + "${FILESDIR}/${PN}-5.1.4.2-gcc6.patch" + # not upstreamable stuff "${FILESDIR}/${PN}-4.4-system-pyuno.patch" ) diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild index 164ac1e7ad29..52653526c38b 100644 --- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild +++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild @@ -242,6 +242,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} " PATCHES=( + # from 5.2 branch + "${FILESDIR}/${PN}-5.1.4.2-gcc6.patch" + # not upstreamable stuff "${FILESDIR}/${PN}-4.4-system-pyuno.patch" ) |