1 |
commit: a52a222a24a7dfa9b27ab8bba8036433f5891cf7 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Nov 29 13:30:38 2019 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 29 18:27:32 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a52a222a |
7 |
|
8 |
dev-libs/libspnav: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/13799 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> |
13 |
|
14 |
.../files/libspnav-0.2.2-custom-flags.patch | 75 ---------------------- |
15 |
.../libspnav/files/libspnav-0.2.2-makefile.patch | 27 -------- |
16 |
2 files changed, 102 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch b/dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch |
19 |
deleted file mode 100644 |
20 |
index cc96655bf46..00000000000 |
21 |
--- a/dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch |
22 |
+++ /dev/null |
23 |
@@ -1,75 +0,0 @@ |
24 |
-diff -Npur libspnav-0.2.2.orig/Makefile.in libspnav-0.2.2/Makefile.in |
25 |
---- libspnav-0.2.2.orig/Makefile.in 2012-01-31 22:34:01.448356249 +0100 |
26 |
-+++ libspnav-0.2.2/Makefile.in 2012-01-31 22:39:20.229350669 +0100 |
27 |
-@@ -7,7 +7,8 @@ lib_so = $(soname).1 |
28 |
- |
29 |
- CC = gcc |
30 |
- AR = ar |
31 |
--CFLAGS = $(opt) $(dbg) -std=c89 -fpic -pedantic -Wall -fno-strict-aliasing -I. |
32 |
-+CFLAGS = $(opt) -fpic -I. |
33 |
-+LDFLAGS = $(ldopt) -shared -Wl,-soname,$(soname) |
34 |
- |
35 |
- .PHONY: all |
36 |
- all: $(lib_a) $(lib_so) |
37 |
-@@ -16,7 +17,7 @@ $(lib_a): $(obj) |
38 |
- $(AR) rcs $@ $(obj) |
39 |
- |
40 |
- $(lib_so): $(obj) |
41 |
-- $(CC) -shared -Wl,-soname,$(soname) -o $@ $(obj) |
42 |
-+ $(CC) $(LDFLAGS) -o $@ $(obj) |
43 |
- |
44 |
- %.o: $(srcdir)/%.c |
45 |
- $(CC) $(CFLAGS) -c $< -o $@ |
46 |
-diff -Npur libspnav-0.2.2.orig/configure libspnav-0.2.2/configure |
47 |
---- libspnav-0.2.2.orig/configure 2012-01-31 22:34:01.448356249 +0100 |
48 |
-+++ libspnav-0.2.2/configure 2012-01-31 22:34:39.703355615 +0100 |
49 |
-@@ -4,6 +4,7 @@ echo 'configuring spacenav library...' |
50 |
- |
51 |
- PREFIX=/usr/local |
52 |
- OPT=yes |
53 |
-+LDOPT=yes |
54 |
- DBG=yes |
55 |
- X11=yes |
56 |
- |
57 |
-@@ -26,6 +27,11 @@ for arg; do |
58 |
- --disable-opt) |
59 |
- OPT=no;; |
60 |
- |
61 |
-+ --enable-ldopt) |
62 |
-+ LDOPT=yes;; |
63 |
-+ --disable-ldopt) |
64 |
-+ LDOPT=no;; |
65 |
-+ |
66 |
- --enable-debug) |
67 |
- DBG=yes;; |
68 |
- --disable-debug) |
69 |
-@@ -44,6 +50,8 @@ for arg; do |
70 |
- echo ' --disable-x11: disable X11 communication mode' |
71 |
- echo ' --enable-opt: enable speed optimizations (default)' |
72 |
- echo ' --disable-opt: disable speed optimizations' |
73 |
-+ echo ' --enable-ldopt: enable link optimizations (default)' |
74 |
-+ echo ' --disable-ldopt: disable link optimizations' |
75 |
- echo ' --enable-debug: include debugging symbols (default)' |
76 |
- echo ' --disable-debug: do not include debugging symbols' |
77 |
- echo 'all invalid options are silently ignored' |
78 |
-@@ -54,6 +62,7 @@ done |
79 |
- |
80 |
- echo " prefix: $PREFIX" |
81 |
- echo " optimize for speed: $OPT" |
82 |
-+echo " optimize link: $LDOPT" |
83 |
- echo " include debugging symbols: $DBG" |
84 |
- echo " x11 communication method: $X11" |
85 |
- echo "" |
86 |
-@@ -74,7 +83,11 @@ if [ "$DBG" = 'yes' ]; then |
87 |
- fi |
88 |
- |
89 |
- if [ "$OPT" = 'yes' ]; then |
90 |
-- echo 'opt = -O3' >>Makefile |
91 |
-+ echo "opt = ${CFLAGS:--O3}" >>Makefile |
92 |
-+fi |
93 |
-+ |
94 |
-+if [ "$LDOPT" = 'yes' ]; then |
95 |
-+ echo "ldopt = ${LDFLAGS}" >>Makefile |
96 |
- fi |
97 |
- |
98 |
- if [ "$X11" = 'yes' ]; then |
99 |
|
100 |
diff --git a/dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch b/dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch |
101 |
deleted file mode 100644 |
102 |
index f65300c5f58..00000000000 |
103 |
--- a/dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch |
104 |
+++ /dev/null |
105 |
@@ -1,27 +0,0 @@ |
106 |
-diff -Npur libspnav-0.2.2.orig/Makefile.in libspnav-0.2.2/Makefile.in |
107 |
---- libspnav-0.2.2.orig/Makefile.in 2012-01-31 22:40:36.619349333 +0100 |
108 |
-+++ libspnav-0.2.2/Makefile.in 2012-01-31 22:41:52.554347975 +0100 |
109 |
-@@ -11,7 +11,7 @@ CFLAGS = $(opt) -I. |
110 |
- LDFLAGS = $(ldopt) -shared -Wl,-soname,$(soname) |
111 |
- |
112 |
- .PHONY: all |
113 |
--all: $(lib_a) $(lib_so) |
114 |
-+all: $(lib_so) |
115 |
- |
116 |
- $(lib_a): $(obj) |
117 |
- $(AR) rcs $@ $(obj) |
118 |
-@@ -31,10 +31,10 @@ distclean: |
119 |
- rm -f $(obj) $(lib_a) $(lib_so) Makefile |
120 |
- |
121 |
- .PHONY: install |
122 |
--install: $(lib_a) $(lib_so) |
123 |
-- cp $(lib_a) $(PREFIX)/$(libdir)/$(lib_a) |
124 |
-- cp $(lib_so) $(PREFIX)/$(libdir)/$(lib_so) |
125 |
-- for h in $(hdr); do cp -p $(srcdir)/$$h $(PREFIX)/include/; done |
126 |
-+install: $(lib_so) |
127 |
-+ mkdir -p $(DESTDIR)$(PREFIX)/$(libdir) $(DESTDIR)$(PREFIX)/include |
128 |
-+ cp $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so) |
129 |
-+ for h in $(hdr); do cp -p $(srcdir)/$$h $(DESTDIR)$(PREFIX)/include/; done |
130 |
- |
131 |
- .PHONY: uninstall |
132 |
- uninstall: |