summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-12-08 08:56:10 +0000
committerSam James <sam@gentoo.org>2021-12-08 08:56:10 +0000
commitcb4de3871de3e055fea2ba145dfee9aec767c851 (patch)
treee436b08daa476ddb9e63dc0ebbdeeb419c057175 /x11-misc/xbindkeys
parentx11-misc/xbindkeys: use eautoreconf for guile patch (diff)
downloadgentoo-cb4de3871de3e055fea2ba145dfee9aec767c851.tar.gz
gentoo-cb4de3871de3e055fea2ba145dfee9aec767c851.tar.bz2
gentoo-cb4de3871de3e055fea2ba145dfee9aec767c851.zip
x11-misc/xbindkeys: drop unnecessary patch
Closes: https://bugs.gentoo.org/828555 Bug: https://bugs.gentoo.org/828532 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'x11-misc/xbindkeys')
-rw-r--r--x11-misc/xbindkeys/files/xbindkeys-1.8.7-guile3.patch25
-rw-r--r--x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild7
2 files changed, 2 insertions, 30 deletions
diff --git a/x11-misc/xbindkeys/files/xbindkeys-1.8.7-guile3.patch b/x11-misc/xbindkeys/files/xbindkeys-1.8.7-guile3.patch
deleted file mode 100644
index caf0e222cd13..000000000000
--- a/x11-misc/xbindkeys/files/xbindkeys-1.8.7-guile3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 75909d99b18ddc76c78bf7b9e184de46d3d24468 Mon Sep 17 00:00:00 2001
-From: Evgeny Ratnikov <ratnikov.ev@gmail.com>
-Date: Sun, 14 Jun 2020 22:13:59 +0200
-Subject: add support for GNU Guile 3 to xbindkeys
-
----
- aclocal.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 6dfea6d..647b5fd 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -48,7 +48,7 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
- #
- AC_DEFUN([GUILE_PKG],
- [PKG_PROG_PKG_CONFIG
-- _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
-+ _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0 1.8])"
- if test -n "$GUILE_EFFECTIVE_VERSION"; then
- _guile_tmp=""
- for v in $_guile_versions_to_search; do
---
-cgit v1.2.1
-
diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild
index 03a121ac68a1..3eba2a59a23a 100644
--- a/x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild
+++ b/x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild
@@ -26,14 +26,11 @@ DEPEND="
DOCS=( AUTHORS BUGS ChangeLog README TODO xbindkeysrc )
-PATCHES=(
- "${FILESDIR}/xbindkeys-1.8.7-guile3.patch"
-)
-
src_prepare() {
default
- # For guile patch, touches m4/
+ # Regenerate to pick up newer versions of Guile macros
+ # bug #828532
eautoreconf
}