Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/
Date: Wed, 02 Nov 2022 00:47:48
Message-Id: 1667350053.012c205505f0ca5f5ba70149f71b3ab762b7f8b2.sam@gentoo
1 commit: 012c205505f0ca5f5ba70149f71b3ab762b7f8b2
2 Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
3 AuthorDate: Tue Nov 1 09:15:46 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 2 00:47:33 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=012c2055
7
8 x11-misc/xscreensaver: get install dirs from GTK3 instead of GTK2 in configure.ac
9
10 Closes: https://bugs.gentoo.org/878979
11 Bug: https://bugs.gentoo.org/878875
12 Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
13 Closes: https://github.com/gentoo/gentoo/pull/28068
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 .../xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch | 8 ++++----
17 1 file changed, 4 insertions(+), 4 deletions(-)
18
19 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
20 index c624c8046026..4147540e1189 100644
21 --- a/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
22 +++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
23 @@ -6,9 +6,9 @@ Bug: https://bugs.gentoo.org/878875
24
25 Signed-off-by: Pascal Jäger <pascal.jaeger@×××××××××.de>
26
27 ---- a/configure
28 -+++ b/configure
29 -@@ -16035,7 +16035,7 @@ printf "%s\n" "$ac_cv_gtk_config_libs" >&6; }
30 +--- a/configure.ac
31 ++++ b/configure.ac
32 +@@ -2822,7 +2822,7 @@ if test "$with_gtk" = yes; then
33
34 GTK_DATADIR=""
35 if test "$have_gtk" = yes; then
36 @@ -17,7 +17,7 @@ Signed-off-by: Pascal Jäger <pascal.jaeger@×××××××××.de>
37 GTK_DATADIR="$GTK_DATADIR/share"
38 fi
39
40 -@@ -21440,6 +21440,6 @@ printf %s "checking for locale directory... " >&6; }
41 +@@ -4282,6 +4282,6 @@ AC_MSG_CHECKING([for locale directory])
42 if test -n "$GTK_DATADIR" ; then
43 PO_DATADIR="$GTK_DATADIR"
44 elif test "$have_gtk" = yes; then