summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-12-21 13:22:55 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2017-12-21 14:27:43 +0100
commit7226ed963a079dbffc4cb3d19fa0f1670ea2eb89 (patch)
tree17b54e1bb3c30cf9264725bb988d3b9f8fa01d0d /app-office
parentapp-portage/gemato: keyworded 9.2 for hppa, bug #638776 (diff)
downloadgentoo-7226ed963a079dbffc4cb3d19fa0f1670ea2eb89.tar.gz
gentoo-7226ed963a079dbffc4cb3d19fa0f1670ea2eb89.tar.bz2
gentoo-7226ed963a079dbffc4cb3d19fa0f1670ea2eb89.zip
app-office/libreoffice: Fix build with USE="gtk3 -gtk"
Thanks-to: Ostashevskyi Viktor <ostash@ostash.kiev.ua> Closes: https://bugs.gentoo.org/641812 Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch13
-rw-r--r--app-office/libreoffice/libreoffice-5.4.4.2.ebuild1
2 files changed, 14 insertions, 0 deletions
diff --git a/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch b/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch
new file mode 100644
index 000000000000..f0e2c55c9369
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch
@@ -0,0 +1,13 @@
+Fix build with USE="gtk3 -gtk"
+https://bugs.gentoo.org/641812
+
+--- a/vcl/unx/gtk3/gtk3gtkframe.cxx 2017-12-12 18:45:07.000000000 +0100
++++ b/vcl/unx/gtk3/gtk3gtkframe.cxx 2017-12-21 13:20:31.935843032 +0100
+@@ -21,6 +21,7 @@
+ #include <unx/gtk/gtkdata.hxx>
+ #include <unx/gtk/gtkinst.hxx>
+ #include <unx/gtk/gtkgdi.hxx>
++#include <unx/gtk/gtksalmenu.hxx>
+ #include <vcl/help.hxx>
+ #include <vcl/keycodes.hxx>
+ #include <vcl/layout.hxx>
diff --git a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
index f9f51d5951b9..666dc122a413 100644
--- a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
@@ -245,6 +245,7 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+ "${FILESDIR}/${P}-gtk3-no-gtk-build.patch" # bug 641812
)
pkg_pretend() {