diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2021-07-18 00:01:27 +0200 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2021-07-18 00:17:08 +0200 |
| commit | 4f17f639d8be68fb6b66b2bc14a6003aa9e8ef75 (patch) | |
| tree | 321be39163fa97ac7ffe9734bb9403aefb17b178 /x11-misc/xscreensaver/files | |
| parent | app-emulation/nemu: drop 2.2.1-r1 (diff) | |
| download | gentoo-4f17f639d8be68fb6b66b2bc14a6003aa9e8ef75.tar.gz gentoo-4f17f639d8be68fb6b66b2bc14a6003aa9e8ef75.tar.bz2 gentoo-4f17f639d8be68fb6b66b2bc14a6003aa9e8ef75.zip | |
x11-misc/xscreensaver: Fix USE="-gtk" and USE="-gdk-pixbuf"
Closes: https://bugs.gentoo.org/796992
Signed-off-by: Sebastian Pipping <sping@gentoo.org>
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Diffstat (limited to 'x11-misc/xscreensaver/files')
| -rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch | 25 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch | 56 |
2 files changed, 81 insertions, 0 deletions
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch new file mode 100644 index 000000000000..1f70ad29dbb1 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch @@ -0,0 +1,25 @@ +From 9ff9a74152ebd8c04df12d340ab6e7c726690a82 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Sat, 17 Jul 2021 23:50:16 +0200 +Subject: [PATCH 2/2] Fix detection of GTK+ for systems without gdk-pixbuf + +--- + configure.ac | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4cb3385..bef0d1e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2819,8 +2819,6 @@ if test "$with_gtk" = yes; then + pkg_check_version gtk+-2.0 2.22.0 ; ac_gtk_version_string="$vers" + pkg_check_version gmodule-2.0 2.0.0 + pkg_check_version libxml-2.0 2.4.6 +- pkg_check_version gdk-pixbuf-2.0 2.0.0 +- pkg_check_version gdk-pixbuf-xlib-2.0 2.0.0 + have_gtk="$ok" + + if test "$have_gtk" = no; then +-- +2.32.0 + diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch new file mode 100644 index 000000000000..cb8b6e45db2b --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch @@ -0,0 +1,56 @@ +From 25b22d16fabbdb3e7a6afcd6cd8d1a25afaaa252 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Sat, 17 Jul 2021 23:44:44 +0200 +Subject: [PATCH 1/2] Fix install for --without-motif --without-gtk + +Related to https://bugs.gentoo.org/796992 +--- + configure.ac | 4 ++++ + driver/Makefile.in | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 2eaea28..4cb3385 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4148,13 +4148,16 @@ fi + + PREFERRED_DEMO_PROGRAM='' + ALL_DEMO_PROGRAMS= ++SETTINGS_PROGRAM_OR_NOT= + if test "$have_motif" = yes; then + PREFERRED_DEMO_PROGRAM=xscreensaver-settings-Xm + ALL_DEMO_PROGRAMS="$PREFERRED_DEMO_PROGRAM $ALL_DEMO_PROGRAMS" ++ SETTINGS_PROGRAM_OR_NOT=xscreensaver-settings + fi + if test "$have_gtk" = yes; then + PREFERRED_DEMO_PROGRAM=xscreensaver-settings-Gtk + ALL_DEMO_PROGRAMS="$PREFERRED_DEMO_PROGRAM $ALL_DEMO_PROGRAMS" ++ SETTINGS_PROGRAM_OR_NOT=xscreensaver-settings + fi + + +@@ -4306,6 +4309,7 @@ AC_SUBST(INCLUDES) + + AC_SUBST(PREFERRED_DEMO_PROGRAM) + AC_SUBST(ALL_DEMO_PROGRAMS) ++AC_SUBST(SETTINGS_PROGRAM_OR_NOT) + AC_SUBST(SAVER_LIBS) + AC_SUBST(MOTIF_LIBS) + AC_SUBST(GTK_LIBS) +diff --git a/driver/Makefile.in b/driver/Makefile.in +index 0e986a9..1877d8a 100644 +--- a/driver/Makefile.in ++++ b/driver/Makefile.in +@@ -212,7 +212,7 @@ TEST_EXES = test-passwd test-uid test-xdpms test-grab \ + xdpyinfo test-screens test-yarandom test-xinput \ + test-xkb + +-EXES = xscreensaver xscreensaver-command xscreensaver-settings ++EXES = xscreensaver xscreensaver-command @SETTINGS_PROGRAM_OR_NOT@ + UTIL_EXES = xscreensaver-gfx @EXES_SYSTEMD@ + SETUID_EXES = xscreensaver-auth + DEMO_EXES = @ALL_DEMO_PROGRAMS@ +-- +2.32.0 + |