1 |
commit: c6e1e2eb1131efae1b32695a0726413acc219b20 |
2 |
Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za> |
3 |
AuthorDate: Tue Dec 7 22:19:00 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 7 23:55:37 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e1e2eb |
7 |
|
8 |
x11-misc/xbindkeys: fix guile 3 in configure |
9 |
|
10 |
Closes: https://bugs.gentoo.org/828532 |
11 |
|
12 |
Thanks ionen for tracking this. |
13 |
|
14 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
15 |
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za> |
16 |
Closes: https://github.com/gentoo/gentoo/pull/23214 |
17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
18 |
|
19 |
.../xbindkeys/files/xbindkeys-1.8.7-guile3.patch | 25 ++++++++++++++++++++++ |
20 |
x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild | 6 +++++- |
21 |
2 files changed, 30 insertions(+), 1 deletion(-) |
22 |
|
23 |
diff --git a/x11-misc/xbindkeys/files/xbindkeys-1.8.7-guile3.patch b/x11-misc/xbindkeys/files/xbindkeys-1.8.7-guile3.patch |
24 |
new file mode 100644 |
25 |
index 000000000000..caf0e222cd13 |
26 |
--- /dev/null |
27 |
+++ b/x11-misc/xbindkeys/files/xbindkeys-1.8.7-guile3.patch |
28 |
@@ -0,0 +1,25 @@ |
29 |
+From 75909d99b18ddc76c78bf7b9e184de46d3d24468 Mon Sep 17 00:00:00 2001 |
30 |
+From: Evgeny Ratnikov <ratnikov.ev@×××××.com> |
31 |
+Date: Sun, 14 Jun 2020 22:13:59 +0200 |
32 |
+Subject: add support for GNU Guile 3 to xbindkeys |
33 |
+ |
34 |
+--- |
35 |
+ aclocal.m4 | 2 +- |
36 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
37 |
+ |
38 |
+diff --git a/aclocal.m4 b/aclocal.m4 |
39 |
+index 6dfea6d..647b5fd 100644 |
40 |
+--- a/aclocal.m4 |
41 |
++++ b/aclocal.m4 |
42 |
+@@ -48,7 +48,7 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) |
43 |
+ # |
44 |
+ AC_DEFUN([GUILE_PKG], |
45 |
+ [PKG_PROG_PKG_CONFIG |
46 |
+- _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])" |
47 |
++ _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0 1.8])" |
48 |
+ if test -n "$GUILE_EFFECTIVE_VERSION"; then |
49 |
+ _guile_tmp="" |
50 |
+ for v in $_guile_versions_to_search; do |
51 |
+-- |
52 |
+cgit v1.2.1 |
53 |
+ |
54 |
|
55 |
diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild |
56 |
index 35d49280bb07..7b821afa63e4 100644 |
57 |
--- a/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild |
58 |
+++ b/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild |
59 |
@@ -12,9 +12,13 @@ SLOT="0" |
60 |
KEYWORDS="amd64 ~arm ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" |
61 |
IUSE="guile tk" |
62 |
|
63 |
+PATCHES=( |
64 |
+ "${FILESDIR}/xbindkeys-1.8.7-guile3.patch" |
65 |
+) |
66 |
+ |
67 |
RDEPEND=" |
68 |
x11-libs/libX11 |
69 |
- guile? ( >=dev-scheme/guile-1.8.4[deprecated] ) |
70 |
+ guile? ( >=dev-scheme/guile-1.8.4:=[deprecated] ) |
71 |
tk? ( dev-lang/tk ) |
72 |
" |
73 |
DEPEND=" |