Github messages for voidlinux
 help / color / Atom feed
* [PR PATCH] xbindkeys: unmark nocross
@ 2020-01-12 21:53 voidlinux-github
  2020-01-16 10:41 ` [PR PATCH] [Merged]: " voidlinux-github
  0 siblings, 1 reply; 2+ messages in thread
From: voidlinux-github @ 2020-01-12 21:53 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 379 bytes --]

There is a new pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages xbindkeys
https://github.com/void-linux/void-packages/pull/18273

xbindkeys: unmark nocross
@leahneukirchen 
Signed-off-by: Nathan Owens <ndowens04@gmail.com>

A patch file from https://github.com/void-linux/void-packages/pull/18273.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbindkeys-18273.patch --]
[-- Type: text/x-diff, Size: 2059 bytes --]

From cfd040836ad117972ac455bd81e1a858b4e6c206 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sun, 12 Jan 2020 15:24:20 -0600
Subject: [PATCH] xbindkeys: unmark nocross

Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
 srcpkgs/xbindkeys/patches/cross.patch | 15 +++++++++++++++
 srcpkgs/xbindkeys/template            |  7 ++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xbindkeys/patches/cross.patch

diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch
new file mode 100644
index 00000000000..eb5086f5875
--- /dev/null
+++ b/srcpkgs/xbindkeys/patches/cross.patch
@@ -0,0 +1,15 @@
+diff --git Makefile.in Makefile.in
+index 7bb5cba..e557452 100644
+--- Makefile.in
++++ Makefile.in
+@@ -205,8 +205,8 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall
+ @GUILE_TRUE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ @GUILE_CFLAGS@ -I. -Wall
+-@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@
+-@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ @GUILE_LDFLAGS@
++@GUILE_FALSE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.0 -lgc
++@GUILE_TRUE@xbindkeys_LDADD = @X_LIBS@ -lguile-2.0 -lgc
+ xbindkeys_SOURCES = xbindkeys.c xbindkeys.h \
+ 		keys.h keys.c \
+ 		options.c options.h \
diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template
index 4d61017e4c6..806571204d5 100644
--- a/srcpkgs/xbindkeys/template
+++ b/srcpkgs/xbindkeys/template
@@ -11,4 +11,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=6c0d18be19fc19ab9b4595edf3a23c0a6946c8a5eb5c1bc395471c8f9a710d18
-nocross="configure: error: guile required but not found"
+
+if [ "$CROSS_BUILD" ]; then
+	CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/guile/2.0"
+	configure_args="ac_cv_path_GUILE=${XBPS_CROSS_BASE}/usr/lib
+	 ac_cv_path_GUILE_CONFIG=${XBPS_CROSS_BASE}/usr/bin/guile-config"
+fi

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: xbindkeys: unmark nocross
  2020-01-12 21:53 [PR PATCH] xbindkeys: unmark nocross voidlinux-github
@ 2020-01-16 10:41 ` voidlinux-github
  0 siblings, 0 replies; 2+ messages in thread
From: voidlinux-github @ 2020-01-16 10:41 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 226 bytes --]

There's a merged pull request on the void-packages repository

xbindkeys: unmark nocross
https://github.com/void-linux/void-packages/pull/18273

Description:
@leahneukirchen 
Signed-off-by: Nathan Owens <ndowens04@gmail.com>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-12 21:53 [PR PATCH] xbindkeys: unmark nocross voidlinux-github
2020-01-16 10:41 ` [PR PATCH] [Merged]: " voidlinux-github

Github messages for voidlinux

Archives are clonable: git clone --mirror http://inbox.vuxu.org/voidlinux-github

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git