gentoo auto-resync : 31:10:2022 - 21:05:59

3 files changed, 30 insertions, 1 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index aec875a0c2ff..503706a6555c 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -9,10 +9,11 @@ AUX xscreensaver-6.01-non-gtk-install.patch 1780 BLAKE2B 38d2a71fb9d35d1694fac4d
 AUX xscreensaver-6.01-without-gl-makefile.patch 862 BLAKE2B 9762e84d535b4e913c0e4da6818605d8ff6fc0c9d184ff2cdc60969fab977b603bc18b16dfab7b1124948e814d230a50cd384bfabe785ad1e38e735a5e063d0c SHA512 8b445ca766d24b23904423c8d3a561a0558eca6d4b70b242d05df4949c371e455251be5a473b07fa837505550e00ea13c3154e2efda239468bf7a2a73a063c1f
 AUX xscreensaver-6.03-without-gl-configure.patch 541 BLAKE2B 42818f7ad82513cde5317c1c41c6d54a60a4abe14c98bfa3350b9b5be38141ab7b6c569eb03527ebdab577c87cbe91e1c7197b4bf49613e2a0a94f31420a018c SHA512 bd1b57143eb0a923b41c0d513649735700edd884d39bcb3f00f886d62c2bf94c1349327797008f5698cb8b44952b7517f218d03a12a7e6128c2790005752fd88
 AUX xscreensaver-6.05-configure-exit-codes.patch 1179 BLAKE2B 7ed0bd31730bdf35278e5dc26ce9c96db6b56a094b246ce2ac0a5172a390033f00de2b8e6b25fcb0ea75131151ed19d26a7c8e2da275f1a337f15eda4ee402b3 SHA512 2db1841f485a4933837fc66d275b3516218a7c0757aad4f28cf38016aca2d4fd88138d3f94f86fb6fa42a487d10e7458760562a02fe8d2e5c534e2171cb9ca85
+AUX xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch 916 BLAKE2B 0e0d23001d25f889b9b968e95f9c660d4b1c1b871fc1e08accdb24082cfc5c44de306484dfb0c0ea07dbe5ab4c3c4e39ad2a0d193bdd9762e7bb6798168908a3 SHA512 c638d29646b02a44165000ebf4f2f02dedbc78275fc3671c1f1f3d5b77fa362d787c362a1fbce75fef30b1bbecca07015230c48cf57201ae74ab53d57f46f789
 AUX xscreensaver-6.05-remove-update-icon-cache.patch 368 BLAKE2B a595875f69e339a52f415e664be0524929c1b64ddfa8c80bb797379c08df0ef9860e6a5f3047d069084542eb81aff40470dfcf1db3dcb7e3515a0b986495a926 SHA512 7b797ae8b0cb8ec437f968e575bb3d9fdeab6bdf1f289302c1dabffad7276d4e73c8f03f10a4d8f8a0bedd223269e03c661187ea7c018f42cd11594454350d1d
 AUX xscreensaver-6.05-teach-handsy-some-manners.patch 1820 BLAKE2B c94dbe895479b301d4bc57cf4a830b604c6b51fdf512656536c04a234e7be8f77c78ff4f91bec603ce70036b294c18d736c3b0ad9d3a14b49a627e5d1ccd6dd5 SHA512 06cbe07674a6902ca1467a72bf06f677693da0a030ecca7b880949406cfbf946ee42f5bb9daeefe4869cdad850d28b749e798b66ea890daf8c6f35c90eab9688
 DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
 DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B 97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3 SHA512 c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3
 EBUILD xscreensaver-6.01-r4.ebuild 5884 BLAKE2B e6e2b8f44c38c9c22181262b227bccc4fe16339c283de394de919670010ed1b0690681da990792162760ff93ff5090f9ffb2a01547c9abe25686d5726586ace9 SHA512 ded2ad6cf75c380f343b33d64ac2f3540b55fb3a91f640dd49d6f2cabae4634b17c124637e38a6ebd6425f1aeaf54092eb75f3787fbdf7f690e211f4960f3900
-EBUILD xscreensaver-6.05.ebuild 6630 BLAKE2B e33355cb105a5e7f1f701500cf9243abe6b43d18be04208d5c81fc366ca539930d133d4d5f96418c504e9554c08f47b47fcd098938a0ffed2855cb53538ee553 SHA512 f1555305ec26c37e230d2aee6a2fa3adc819247928c53ac2c020abaa438417b23a886cbc0a43e61bca84c4db6a4b13ce2ac67213d8ec93302e667f3af0576500
+EBUILD xscreensaver-6.05-r1.ebuild 6696 BLAKE2B bf5275a832ddd481cefd94874c5740de146299b3207771ffb66c595fd599b51e3982bc9ac47af6d42c0dc3804200218b71014e61b8407e55eacedafd20880c44 SHA512 1cd79d99f4fe98ddb51ac2e7d833106e799caa0ca30dc28ed684095112482abda57c77f760c5c960b18cc4c2c1bf3781d97ea042148a2f2e5a2779b2ebff41e4
 MISC metadata.xml 1346 BLAKE2B 1f3f0467a85b78d87dd72ab29c606e466ea903cfeedb2ee94e091ab628ad223ca40c5bfd1ccfe2652a561ad95904214963932f368b190affbe3aeccb8ea4a501 SHA512 918888b3144ba3dcab6469985279dc017420d1d8ede1a9e8509d97fef38513b7a828b4c298016270870e940f649a181f25e036d80352e05521300a89dbd28c7d
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
new file mode 100644
index 000000000000..c624c8046026
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
@@ -0,0 +1,27 @@
+Even though xscreensaver now uses GTK+3 instead of GTK+2 since version 6.05
+it still gets its directories from GTK+2 which results in an empty prefix
+when GTK+2 is not installed.
+
+Bug: https://bugs.gentoo.org/878875
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/configure
++++ b/configure
+@@ -16035,7 +16035,7 @@ printf "%s\n" "$ac_cv_gtk_config_libs" >&6; }
+
+   GTK_DATADIR=""
+   if test "$have_gtk" = yes; then
+-    GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
++    GTK_DATADIR=`$pkg_config --variable=prefix gtk+-3.0`
+     GTK_DATADIR="$GTK_DATADIR/share"
+   fi
+
+@@ -21440,6 +21440,6 @@ printf %s "checking for locale directory... " >&6; }
+ if test -n "$GTK_DATADIR" ; then
+   PO_DATADIR="$GTK_DATADIR"
+ elif test "$have_gtk" = yes; then
+-  PO_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
++  PO_DATADIR=`$pkg_config --variable=prefix gtk+-3.0`
+   PO_DATADIR="$PO_DATADIR/share"
+ fi
diff --git a/x11-misc/xscreensaver/xscreensaver-6.05.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
index 9a1a99c055ec..b751510dba2d 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.05.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
@@ -88,6 +88,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
 	"${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch
 	"${FILESDIR}"/${PN}-6.05-configure-exit-codes.patch
+	"${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch
 )
 
 DOCS=( README{,.hacking} )