summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/spnavcfg/Manifest6
-rw-r--r--x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch10
-rw-r--r--x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch8
-rw-r--r--x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild6
4 files changed, 17 insertions, 13 deletions
diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
index c893c51..a5abc95 100644
--- a/x11-misc/spnavcfg/Manifest
+++ b/x11-misc/spnavcfg/Manifest
@@ -1,6 +1,6 @@
-AUX spnavcfg-0.2.1-custom-flags.patch 1368 RMD160 bddedeb35e6907728462c909fbd4e024a6505375 SHA1 04a39aaf85c576f58ad488231ad783fdae8e818e SHA256 4745249131b85b5d3c5e1a5bd8a95ff696d461ca454819abe6c916f76f50140d
+AUX spnavcfg-0.2.1-custom-flags.patch 1336 RMD160 8691b02d04a7b39e8663f98ef0cac6b1dc1ed2e2 SHA1 25acb4d2cb727280e997dfebbad0f916614daf80 SHA256 975eca694315dc7f4fdccb1ffed43312c0dc20f4ca0113fa0beb143a1ddfd2b6
AUX spnavcfg-0.2.1-destdir.patch 542 RMD160 e7744f7243debef4f4434b609804bafbf3c0d145 SHA1 57284c303ec0e526dd1aa82dfa1473b77096b782 SHA256 573f5cf902364f1b7cab5a4168c3e2e30b1160d9c7ab9aabccceb5e57854b8b7
-AUX spnavcfg-0.2.1-x11-libs.patch 551 RMD160 f623ade9542b1cc9b483e313f82fa622a507154f SHA1 823f6b657213b2c366b8e0df282db41f2911878d SHA256 0ce8c19cd87beb842c53441924377e308218f96512cf6931b49c70767b71f884
+AUX spnavcfg-0.2.1-x11-libs.patch 520 RMD160 d7b8743f559cff2de9574bded5639609f203a7c4 SHA1 d63f355381b9372f2ea24fa82e963dc09c9642eb SHA256 65a396afe6690817c31eee7682f4fd4beb50672d931801f9fb7896d073299f3c
DIST spnavcfg-0.2.1.tar.gz 18717 RMD160 fee35e0350b685004b176d9d0e2d1fddecd2ae46 SHA1 1ec1e414d8edcd1621e2c555d0fe8a06c16dbef5 SHA256 a26d4478480f2fb65217cb0d88da5ff81a38c27aaa74710778ea0b999259c4c1
-EBUILD spnavcfg-0.2.1.ebuild 784 RMD160 29512d6264dbf176bf3da0c6a01d0e42be593f7b SHA1 7a1c1a7a1cba7de0ae84d16406f99b469fb90538 SHA256 0e911f5a27adbb3e7766fe3f7700692836dc0d6e3345281a8bbeb063e3f3d341
+EBUILD spnavcfg-0.2.1.ebuild 863 RMD160 9a2b5bbd6b2cf6a6eb35dbd5fc6b354ee90b420a SHA1 59db0833834d57b3c2cbba3e28d463804c544fb3 SHA256 e69c75617c7e39ac74359de539e0af2cfb0d9f35508c66b20b17f441c5dc6c8a
MISC metadata.xml 452 RMD160 adc1bb571f2ac1b430206154239dbdd76a9e90de SHA1 b8fdae4cf71747f2a7f615c58e2145a914e3ec3d SHA256 3b37a70b2fd497730c5f18d65adc6e6a711058f4a13e794ae990205d60146eac
diff --git a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch
index 94b046b..5e4c788 100644
--- a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch
+++ b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch
@@ -1,20 +1,20 @@
diff -Npur spnavcfg-0.2.1.orig/Makefile.in spnavcfg-0.2.1/Makefile.in
---- spnavcfg-0.2.1.orig/Makefile.in 2012-01-24 19:52:29.982219716 +0100
-+++ spnavcfg-0.2.1/Makefile.in 2012-01-24 20:06:07.528205248 +0100
+--- spnavcfg-0.2.1.orig/Makefile.in 2012-01-31 22:16:40.789374658 +0100
++++ spnavcfg-0.2.1/Makefile.in 2012-01-31 22:17:01.146374359 +0100
@@ -5,8 +5,8 @@ warn = -Wall -Wno-int-to-pointer-cast -W
CC = gcc
INSTALL = install
-CFLAGS = -pedantic $(warn) $(dbg) $(opt) `pkg-config --cflags gtk+-2.0`
-LDFLAGS = `pkg-config --libs gtk+-2.0`
-+CFLAGS = -pedantic $(warn) $(dbg) $(opt) $(user_cflags) `pkg-config --cflags gtk+-2.0`
++CFLAGS = $(user_cflags) `pkg-config --cflags gtk+-2.0`
+LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0`
$(bin): $(obj)
$(CC) -o $@ $(obj) $(LDFLAGS)
diff -Npur spnavcfg-0.2.1.orig/configure spnavcfg-0.2.1/configure
---- spnavcfg-0.2.1.orig/configure 2012-01-24 19:52:29.982219716 +0100
-+++ spnavcfg-0.2.1/configure 2012-01-24 20:03:17.079208262 +0100
+--- spnavcfg-0.2.1.orig/configure 2012-01-31 22:16:40.789374658 +0100
++++ spnavcfg-0.2.1/configure 2012-01-31 22:17:01.146374359 +0100
@@ -43,6 +43,12 @@ done
echo " prefix: $PREFIX"
echo " optimize for speed: $OPT"
diff --git a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch
index eee6775..7294013 100644
--- a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch
+++ b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch
@@ -1,10 +1,10 @@
diff -Npur spnavcfg-0.2.1.orig/Makefile.in spnavcfg-0.2.1/Makefile.in
---- spnavcfg-0.2.1.orig/Makefile.in 2012-01-24 21:14:55.115132278 +0100
-+++ spnavcfg-0.2.1/Makefile.in 2012-01-24 21:15:07.796132054 +0100
+--- spnavcfg-0.2.1.orig/Makefile.in 2012-01-31 22:10:35.832381151 +0100
++++ spnavcfg-0.2.1/Makefile.in 2012-01-31 22:11:14.254380520 +0100
@@ -6,7 +6,7 @@ warn = -Wall -Wno-int-to-pointer-cast -W
- CC = gcc
+ CC = gcc
INSTALL = install
- CFLAGS = -pedantic $(warn) $(dbg) $(opt) $(user_cflags) `pkg-config --cflags gtk+-2.0`
+ CFLAGS = $(user_cflags) `pkg-config --cflags gtk+-2.0`
-LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0`
+LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0` -lX11
diff --git a/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild b/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild
index e6ddacf..3702967 100644
--- a/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild
+++ b/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild
@@ -4,7 +4,7 @@
EAPI="3"
-inherit eutils
+inherit eutils toolchain-funcs
DESCRIPTION="GTK-based GUI to configure a space navigator device"
HOMEPAGE="http://spacenav.sourceforge.net/"
@@ -27,6 +27,10 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-x11-libs.patch
}
+src_compile() {
+ emake CC=$(tc-getCC) || die "Make failed."
+}
+
src_install() {
emake DESTDIR="${D}" install || die "Install failed"
dodoc README || die