From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Thu, 21 Dec 2017 12:22:55 +0000 (+0100)
Subject: app-office/libreoffice: Fix build with USE="gtk3 -gtk"
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7226ed963a079dbffc4cb3d19fa0f1670ea2eb89;p=gentoo.git

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
---

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() {