1 |
commit: cb4de3871de3e055fea2ba145dfee9aec767c851 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 8 08:56:10 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 8 08:56:10 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb4de387 |
7 |
|
8 |
x11-misc/xbindkeys: drop unnecessary patch |
9 |
|
10 |
Closes: https://bugs.gentoo.org/828555 |
11 |
Bug: https://bugs.gentoo.org/828532 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
.../xbindkeys/files/xbindkeys-1.8.7-guile3.patch | 25 ---------------------- |
15 |
x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild | 7 ++---- |
16 |
2 files changed, 2 insertions(+), 30 deletions(-) |
17 |
|
18 |
diff --git a/x11-misc/xbindkeys/files/xbindkeys-1.8.7-guile3.patch b/x11-misc/xbindkeys/files/xbindkeys-1.8.7-guile3.patch |
19 |
deleted file mode 100644 |
20 |
index caf0e222cd13..000000000000 |
21 |
--- a/x11-misc/xbindkeys/files/xbindkeys-1.8.7-guile3.patch |
22 |
+++ /dev/null |
23 |
@@ -1,25 +0,0 @@ |
24 |
-From 75909d99b18ddc76c78bf7b9e184de46d3d24468 Mon Sep 17 00:00:00 2001 |
25 |
-From: Evgeny Ratnikov <ratnikov.ev@×××××.com> |
26 |
-Date: Sun, 14 Jun 2020 22:13:59 +0200 |
27 |
-Subject: add support for GNU Guile 3 to xbindkeys |
28 |
- |
29 |
---- |
30 |
- aclocal.m4 | 2 +- |
31 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
32 |
- |
33 |
-diff --git a/aclocal.m4 b/aclocal.m4 |
34 |
-index 6dfea6d..647b5fd 100644 |
35 |
---- a/aclocal.m4 |
36 |
-+++ b/aclocal.m4 |
37 |
-@@ -48,7 +48,7 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) |
38 |
- # |
39 |
- AC_DEFUN([GUILE_PKG], |
40 |
- [PKG_PROG_PKG_CONFIG |
41 |
-- _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])" |
42 |
-+ _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0 1.8])" |
43 |
- if test -n "$GUILE_EFFECTIVE_VERSION"; then |
44 |
- _guile_tmp="" |
45 |
- for v in $_guile_versions_to_search; do |
46 |
--- |
47 |
-cgit v1.2.1 |
48 |
- |
49 |
|
50 |
diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild |
51 |
index 03a121ac68a1..3eba2a59a23a 100644 |
52 |
--- a/x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild |
53 |
+++ b/x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild |
54 |
@@ -26,14 +26,11 @@ DEPEND=" |
55 |
|
56 |
DOCS=( AUTHORS BUGS ChangeLog README TODO xbindkeysrc ) |
57 |
|
58 |
-PATCHES=( |
59 |
- "${FILESDIR}/xbindkeys-1.8.7-guile3.patch" |
60 |
-) |
61 |
- |
62 |
src_prepare() { |
63 |
default |
64 |
|
65 |
- # For guile patch, touches m4/ |
66 |
+ # Regenerate to pick up newer versions of Guile macros |
67 |
+ # bug #828532 |
68 |
eautoreconf |
69 |
} |