| 1 |
sping 12/02/06 20:17:38 |
| 2 |
|
| 3 |
Added: spnavcfg-0.2.1-destdir.patch |
| 4 |
spnavcfg-0.2.1-custom-flags.patch |
| 5 |
spnavcfg-0.2.1-x11-libs.patch |
| 6 |
Log: |
| 7 |
x11-misc/spnavcfg: 0.2.1 (bug #390427) |
| 8 |
|
| 9 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: spnavcfg-0.2.1-destdir.patch |
| 18 |
=================================================================== |
| 19 |
diff -Npur spnavcfg-0.2.1.orig/Makefile.in spnavcfg-0.2.1/Makefile.in |
| 20 |
--- spnavcfg-0.2.1.orig/Makefile.in 2012-01-24 19:50:04.738222230 +0100 |
| 21 |
+++ spnavcfg-0.2.1/Makefile.in 2012-01-24 19:51:13.199221053 +0100 |
| 22 |
@@ -20,9 +20,9 @@ clean: |
| 23 |
|
| 24 |
.PHONY: install |
| 25 |
install: |
| 26 |
- $(INSTALL) -d $(PREFIX)/bin |
| 27 |
- $(INSTALL) -m 4775 $(bin) $(PREFIX)/bin/$(bin) |
| 28 |
+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin |
| 29 |
+ $(INSTALL) -m 4775 $(bin) $(DESTDIR)$(PREFIX)/bin/$(bin) |
| 30 |
|
| 31 |
.PHONY: uninstall |
| 32 |
uninstall: |
| 33 |
- rm -f $(PREFIX)/bin/$(bin) |
| 34 |
+ rm -f $(DESTDIR)$(PREFIX)/bin/$(bin) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.1 x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch?rev=1.1&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch?rev=1.1&content-type=text/plain |
| 42 |
|
| 43 |
Index: spnavcfg-0.2.1-custom-flags.patch |
| 44 |
=================================================================== |
| 45 |
diff -Npur spnavcfg-0.2.1.orig/Makefile.in spnavcfg-0.2.1/Makefile.in |
| 46 |
--- spnavcfg-0.2.1.orig/Makefile.in 2012-01-31 22:16:40.789374658 +0100 |
| 47 |
+++ spnavcfg-0.2.1/Makefile.in 2012-01-31 22:17:01.146374359 +0100 |
| 48 |
@@ -5,8 +5,8 @@ warn = -Wall -Wno-int-to-pointer-cast -W |
| 49 |
|
| 50 |
CC = gcc |
| 51 |
INSTALL = install |
| 52 |
-CFLAGS = -pedantic $(warn) $(dbg) $(opt) `pkg-config --cflags gtk+-2.0` |
| 53 |
-LDFLAGS = `pkg-config --libs gtk+-2.0` |
| 54 |
+CFLAGS = $(user_cflags) `pkg-config --cflags gtk+-2.0` |
| 55 |
+LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0` |
| 56 |
|
| 57 |
$(bin): $(obj) |
| 58 |
$(CC) -o $@ $(obj) $(LDFLAGS) |
| 59 |
diff -Npur spnavcfg-0.2.1.orig/configure spnavcfg-0.2.1/configure |
| 60 |
--- spnavcfg-0.2.1.orig/configure 2012-01-31 22:16:40.789374658 +0100 |
| 61 |
+++ spnavcfg-0.2.1/configure 2012-01-31 22:17:01.146374359 +0100 |
| 62 |
@@ -43,6 +43,12 @@ done |
| 63 |
echo " prefix: $PREFIX" |
| 64 |
echo " optimize for speed: $OPT" |
| 65 |
echo " include debugging symbols: $DBG" |
| 66 |
+if [ -n "$CFLAGS" ]; then |
| 67 |
+ echo " cflags: $CFLAGS" |
| 68 |
+fi |
| 69 |
+if [ -n "$LDFLAGS" ]; then |
| 70 |
+ echo " ldflags: $LDFLAGS" |
| 71 |
+fi |
| 72 |
echo |
| 73 |
|
| 74 |
# create Makefile |
| 75 |
@@ -58,6 +64,13 @@ if [ "$OPT" = 'yes' ]; then |
| 76 |
echo 'opt = -O3' >>Makefile |
| 77 |
fi |
| 78 |
|
| 79 |
+if [ -n "$CFLAGS" ]; then |
| 80 |
+ echo "user_cflags = $CFLAGS" >>Makefile |
| 81 |
+fi |
| 82 |
+if [ -n "$LDFLAGS" ]; then |
| 83 |
+ echo "user_ldflags = $LDFLAGS" >>Makefile |
| 84 |
+fi |
| 85 |
+ |
| 86 |
cat "$srcdir/Makefile.in" >>Makefile |
| 87 |
|
| 88 |
echo '' |
| 89 |
|
| 90 |
|
| 91 |
|
| 92 |
1.1 x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch |
| 93 |
|
| 94 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch?rev=1.1&view=markup |
| 95 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch?rev=1.1&content-type=text/plain |
| 96 |
|
| 97 |
Index: spnavcfg-0.2.1-x11-libs.patch |
| 98 |
=================================================================== |
| 99 |
diff -Npur spnavcfg-0.2.1.orig/Makefile.in spnavcfg-0.2.1/Makefile.in |
| 100 |
--- spnavcfg-0.2.1.orig/Makefile.in 2012-01-31 22:10:35.832381151 +0100 |
| 101 |
+++ spnavcfg-0.2.1/Makefile.in 2012-01-31 22:11:14.254380520 +0100 |
| 102 |
@@ -6,7 +6,7 @@ warn = -Wall -Wno-int-to-pointer-cast -W |
| 103 |
CC = gcc |
| 104 |
INSTALL = install |
| 105 |
CFLAGS = $(user_cflags) `pkg-config --cflags gtk+-2.0` |
| 106 |
-LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0` |
| 107 |
+LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0` -lX11 |
| 108 |
|
| 109 |
$(bin): $(obj) |
| 110 |
$(CC) -o $@ $(obj) $(LDFLAGS) |
Archives