[gentoo-commits] repo/gentoo:master commit in: x11-misc/nitrogen/, x11-misc/nitrogen/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/nitrogen/, x11-misc/nitrogen/files/

[Jeroen Roovers]

commit:     bc683f28f98b6ce65e2db5e8fa7c86cf02cf3dbd
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 07:29:10 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 07:29:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc683f28

x11-misc/nitrogen: Fix USE=-xinerama compile failure.

Package-Manager: portage-2.3.2

 x11-misc/nitrogen/files/nitrogen-1.6.0-xinerama.patch | 18 ++++++++++++++++++
 x11-misc/nitrogen/nitrogen-1.6.0.ebuild               |  4 ++++
 2 files changed, 22 insertions(+)

diff --git a/x11-misc/nitrogen/files/nitrogen-1.6.0-xinerama.patch b/x11-misc/nitrogen/files/nitrogen-1.6.0-xinerama.patch
new file mode 100644
index 00000000..eaf06b6
--- /dev/null
+++ b/x11-misc/nitrogen/files/nitrogen-1.6.0-xinerama.patch
@@ -0,0 +1,18 @@
+--- a/src/main.cc
++++ b/src/main.cc
+@@ -146,6 +146,7 @@
+ 
+         if (setter_str == "xwindows")
+             setter = new SetBGXWindows();
++#ifdef USE_XINERAMA
+         else if (setter_str == "xinerama") {
+             setter = new SetBGXinerama();
+ 
+@@ -156,6 +157,7 @@
+             xinerama_info = XineramaQueryScreens(GDK_DISPLAY_XDISPLAY(dpy->gobj()), &xinerama_num_screens);
+             ((SetBGXinerama*)setter)->set_xinerama_info(xinerama_info, xinerama_num_screens);
+         }
++#endif /* USE_XINERAMA */
+         else if (setter_str == "gnome")
+             setter = new SetBGGnome();
+         else if (setter_str == "pcmanfm")

diff --git a/x11-misc/nitrogen/nitrogen-1.6.0.ebuild b/x11-misc/nitrogen/nitrogen-1.6.0.ebuild
index c01c0bc..9f9b60a 100644
--- a/x11-misc/nitrogen/nitrogen-1.6.0.ebuild
+++ b/x11-misc/nitrogen/nitrogen-1.6.0.ebuild
@@ -27,6 +27,10 @@ DEPEND="
 	xinerama? ( x11-proto/xineramaproto )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-xinerama.patch
+)
+
 src_prepare() {
 	default