summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc/spnavcfg/files')
-rw-r--r--x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch44
-rw-r--r--x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch16
-rw-r--r--x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch12
3 files changed, 72 insertions, 0 deletions
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
new file mode 100644
index 000000000000..5e4c788dcffe
--- /dev/null
+++ b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch
@@ -0,0 +1,44 @@
+diff -Npur spnavcfg-0.2.1.orig/Makefile.in spnavcfg-0.2.1/Makefile.in
+--- 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 = $(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-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"
+ echo " include debugging symbols: $DBG"
++if [ -n "$CFLAGS" ]; then
++ echo " cflags: $CFLAGS"
++fi
++if [ -n "$LDFLAGS" ]; then
++ echo " ldflags: $LDFLAGS"
++fi
+ echo
+
+ # create Makefile
+@@ -58,6 +64,13 @@ if [ "$OPT" = 'yes' ]; then
+ echo 'opt = -O3' >>Makefile
+ fi
+
++if [ -n "$CFLAGS" ]; then
++ echo "user_cflags = $CFLAGS" >>Makefile
++fi
++if [ -n "$LDFLAGS" ]; then
++ echo "user_ldflags = $LDFLAGS" >>Makefile
++fi
++
+ cat "$srcdir/Makefile.in" >>Makefile
+
+ echo ''
diff --git a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch
new file mode 100644
index 000000000000..8e6848baa102
--- /dev/null
+++ b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch
@@ -0,0 +1,16 @@
+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:50:04.738222230 +0100
++++ spnavcfg-0.2.1/Makefile.in 2012-01-24 19:51:13.199221053 +0100
+@@ -20,9 +20,9 @@ clean:
+
+ .PHONY: install
+ install:
+- $(INSTALL) -d $(PREFIX)/bin
+- $(INSTALL) -m 4775 $(bin) $(PREFIX)/bin/$(bin)
++ $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
++ $(INSTALL) -m 4775 $(bin) $(DESTDIR)$(PREFIX)/bin/$(bin)
+
+ .PHONY: uninstall
+ uninstall:
+- rm -f $(PREFIX)/bin/$(bin)
++ rm -f $(DESTDIR)$(PREFIX)/bin/$(bin)
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
new file mode 100644
index 000000000000..7294013ac5c4
--- /dev/null
+++ b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch
@@ -0,0 +1,12 @@
+diff -Npur spnavcfg-0.2.1.orig/Makefile.in spnavcfg-0.2.1/Makefile.in
+--- 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
+ INSTALL = install
+ 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
+
+ $(bin): $(obj)
+ $(CC) -o $@ $(obj) $(LDFLAGS)