summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2016-11-18 08:29:10 +0100
committerJeroen Roovers <jer@gentoo.org>2016-11-18 08:29:10 +0100
commitbc683f28f98b6ce65e2db5e8fa7c86cf02cf3dbd (patch)
treea6fda78426d32b656d4c0995dff6e3ae12294b13
parentwww-client/opera-developer: Version bump. (diff)
downloadgentoo-bc683f28f98b6ce65e2db5e8fa7c86cf02cf3dbd.tar.gz
gentoo-bc683f28f98b6ce65e2db5e8fa7c86cf02cf3dbd.tar.bz2
gentoo-bc683f28f98b6ce65e2db5e8fa7c86cf02cf3dbd.zip
x11-misc/nitrogen: Fix USE=-xinerama compile failure.
Package-Manager: portage-2.3.2
-rw-r--r--x11-misc/nitrogen/files/nitrogen-1.6.0-xinerama.patch18
-rw-r--r--x11-misc/nitrogen/nitrogen-1.6.0.ebuild4
2 files changed, 22 insertions, 0 deletions
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 00000000000..eaf06b69c2c
--- /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 c01c0bc04cc..9f9b60aa668 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