commit: 611492b9f7ef001a3fc4e73b36ec6a3e01442103 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sun May 3 01:28:51 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun May 3 01:32:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=611492b9
x11-misc/xscreensaver: Drop libXxf86misc dependency Closes: https://bugs.gentoo.org/720158 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> .../xscreensaver-remove-libXxf86misc-dep.patch | 49 ++++++++++++++++++++++ ...ver-5.38.ebuild => xscreensaver-5.38-r1.ebuild} | 2 +- ...-5.43-r2.ebuild => xscreensaver-5.43-r3.ebuild} | 2 +- ...-5.44-r1.ebuild => xscreensaver-5.44-r2.ebuild} | 2 +- 4 files changed, 52 insertions(+), 3 deletions(-) diff --git a/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch b/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch new file mode 100644 index 00000000000..79ffcd7098c --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch @@ -0,0 +1,49 @@ +libXxf86misc is the client-side code of an X extension that has not been +supported by the Xserver in more than 10 years. Since xscreensaver's dependency +on it is automagic, we have to patch configure.in to safely remove it. + +https://bugs.gentoo.org/720158 + +diff -ruN xscreensaver.orig/configure.in xscreensaver/configure.in +--- xscreensaver.orig/configure.in 2020-05-02 18:09:23.169324761 -0700 ++++ xscreensaver/configure.in 2020-05-02 18:09:52.578233240 -0700 +@@ -104,12 +104,6 @@ + (It's available if the file /usr/include/X11/extensions/XInput.h + exists.)]) + +-AH_TEMPLATE([HAVE_XF86MISCSETGRABKEYSSTATE], +- [Define this if you have the XF86MiscSetGrabKeysState function +- (which allows the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key +- sequences to be temporarily disabled. Sadly, it doesn't affect +- Ctrl-Alt-BS or Ctrl-Alt-F1.)]) +- + AH_TEMPLATE([HAVE_RANDR], + [Define this if you have the Resize and Rotate extension. + This is standard on sufficiently-recent XFree86 systems, and +@@ -1888,25 +1882,6 @@ + fi + + +-############################################################################### +-# +-# Check for XF86MiscSetGrabKeysState (but only bother if we are already +-# using other XF86 stuff.) +-# +-############################################################################### +- +-have_xf86miscsetgrabkeysstate=no +-if test "$have_xf86gamma" = yes -o "$have_xf86vmode" = yes; then +- AC_CHECK_X_LIB(Xxf86misc, XF86MiscSetGrabKeysState, +- [have_xf86miscsetgrabkeysstate=yes], +- [true], -lXext -lX11) +- if test "$have_xf86miscsetgrabkeysstate" = yes ; then +- SAVER_LIBS="$SAVER_LIBS -lXxf86misc" +- AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE) +- fi +-fi +- +- + ############################################################################### + # + # Check for HP XHPDisableReset and XHPEnableReset. + diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild similarity index 98% rename from x11-misc/xscreensaver/xscreensaver-5.38.ebuild rename to x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild index 655aea06e05..9ffa8e21aea 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild @@ -30,7 +30,6 @@ COMMON_DEPEND=" x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt - x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( @@ -75,6 +74,7 @@ src_prepare() { fi eapply \ + "${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch \ "${FILESDIR}"/${PN}-5.05-interix.patch \ "${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \ "${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \ diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild similarity index 98% rename from x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild rename to x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild index 3f0ba54893e..5a18a227934 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild @@ -30,7 +30,6 @@ COMMON_DEPEND=" x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt - x11-libs/libXxf86misc x11-libs/libXxf86vm caps? ( sys-libs/libcap ) jpeg? ( virtual/jpeg:0 ) @@ -64,6 +63,7 @@ DEPEND=" x11-base/xorg-proto " PATCHES=( + "${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch "${FILESDIR}"/${PN}-5.05-interix.patch "${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch "${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild similarity index 98% rename from x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild rename to x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild index 94909200656..5a2b2cd498b 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild @@ -30,7 +30,6 @@ COMMON_DEPEND=" x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt - x11-libs/libXxf86misc x11-libs/libXxf86vm caps? ( sys-libs/libcap ) jpeg? ( virtual/jpeg:0 ) @@ -64,6 +63,7 @@ DEPEND=" x11-base/xorg-proto " PATCHES=( + "${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch "${FILESDIR}"/${PN}-5.05-interix.patch "${FILESDIR}"/${PN}-5.31-pragma.patch "${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
