diff options
| author |   Jaco Kroon <jaco@uls.co.za> | 2021-12-08 00:19:00 +0200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2021-12-07 23:55:37 +0000 |
| commit | c6e1e2eb1131efae1b32695a0726413acc219b20 (patch) | |
| tree | 62022ed256adfd57f45e04e9bda95672a8832575 /x11-misc | |
| parent | app-admin/mkosi: add missing firmware deps for booting with qemu (diff) | |
| download | gentoo-c6e1e2eb1131efae1b32695a0726413acc219b20.tar.gz gentoo-c6e1e2eb1131efae1b32695a0726413acc219b20.tar.bz2 gentoo-c6e1e2eb1131efae1b32695a0726413acc219b20.zip | |
x11-misc/xbindkeys: fix guile 3 in configure
Closes: https://bugs.gentoo.org/828532
Thanks ionen for tracking this.
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jaco Kroon <jaco@uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/23214
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xbindkeys/files/xbindkeys-1.8.7-guile3.patch | 25 | ||||
| -rw-r--r-- | x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild | 6 |
2 files changed, 30 insertions, 1 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 new file mode 100644 index 000000000000..caf0e222cd13 --- /dev/null +++ b/x11-misc/xbindkeys/files/xbindkeys-1.8.7-guile3.patch @@ -0,0 +1,25 @@ +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-r1.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild index 35d49280bb07..7b821afa63e4 100644 --- a/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild +++ b/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild @@ -12,9 +12,13 @@ SLOT="0" KEYWORDS="amd64 ~arm ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" IUSE="guile tk" +PATCHES=( + "${FILESDIR}/xbindkeys-1.8.7-guile3.patch" +) + RDEPEND=" x11-libs/libX11 - guile? ( >=dev-scheme/guile-1.8.4[deprecated] ) + guile? ( >=dev-scheme/guile-1.8.4:=[deprecated] ) tk? ( dev-lang/tk ) " DEPEND=" |