1 |
commit: 961385ab4aad30f9c6f2c73cfcba21556d2051db |
2 |
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> |
3 |
AuthorDate: Sun Apr 8 21:29:48 2018 +0000 |
4 |
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 8 21:30:33 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=961385ab |
7 |
|
8 |
app-emulation/free42: Clean duplicate patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/7894 |
11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
12 |
|
13 |
.../files/free42-2.0.10-fix-build-intel-lib.patch | 4 +- |
14 |
.../free42/files/free42-2.0.10-fix-makefile.patch | 4 +- |
15 |
.../files/free42-2.0.17-fix-build-intel-lib.patch | 12 ----- |
16 |
.../free42/files/free42-2.0.17-fix-makefile.patch | 58 ---------------------- |
17 |
app-emulation/free42/free42-2.0.10.ebuild | 4 +- |
18 |
app-emulation/free42/free42-2.0.17.ebuild | 4 +- |
19 |
6 files changed, 8 insertions(+), 78 deletions(-) |
20 |
|
21 |
diff --git a/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch |
22 |
index a321b1d714b..543595c6a1a 100644 |
23 |
--- a/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch |
24 |
+++ b/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch |
25 |
@@ -1,6 +1,6 @@ |
26 |
diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh |
27 |
---- a/gtk/build-intel-lib.sh 2018-01-08 02:52:33.000000000 +0100 |
28 |
-+++ b/gtk/build-intel-lib.sh 2018-01-13 19:43:23.709997784 +0100 |
29 |
+--- a/gtk/build-intel-lib.sh |
30 |
++++ b/gtk/build-intel-lib.sh |
31 |
@@ -4,7 +4,7 @@ |
32 |
cd IntelRDFPMathLib20U1 |
33 |
patch -p0 <../intel-lib-linux.patch |
34 |
|
35 |
diff --git a/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch |
36 |
index 7642316920f..c033bbc60ce 100644 |
37 |
--- a/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch |
38 |
+++ b/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch |
39 |
@@ -1,6 +1,6 @@ |
40 |
diff -Nuar a/gtk/Makefile b/gtk/Makefile |
41 |
---- a/gtk/Makefile 2018-01-08 02:52:33.000000000 +0100 |
42 |
-+++ b/gtk/Makefile 2018-01-13 19:40:49.059998446 +0100 |
43 |
+--- a/gtk/Makefile |
44 |
++++ b/gtk/Makefile |
45 |
@@ -15,11 +15,11 @@ |
46 |
# along with this program; if not, see http://www.gnu.org/licenses/. |
47 |
############################################################################### |
48 |
|
49 |
diff --git a/app-emulation/free42/files/free42-2.0.17-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.17-fix-build-intel-lib.patch |
50 |
deleted file mode 100644 |
51 |
index a321b1d714b..00000000000 |
52 |
--- a/app-emulation/free42/files/free42-2.0.17-fix-build-intel-lib.patch |
53 |
+++ /dev/null |
54 |
@@ -1,12 +0,0 @@ |
55 |
-diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh |
56 |
---- a/gtk/build-intel-lib.sh 2018-01-08 02:52:33.000000000 +0100 |
57 |
-+++ b/gtk/build-intel-lib.sh 2018-01-13 19:43:23.709997784 +0100 |
58 |
-@@ -4,7 +4,7 @@ |
59 |
- cd IntelRDFPMathLib20U1 |
60 |
- patch -p0 <../intel-lib-linux.patch |
61 |
- cd LIBRARY |
62 |
--make CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 |
63 |
-+make A=a CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 |
64 |
- mv libbid.a ../../gcc111libbid.a |
65 |
- cd ../.. |
66 |
- ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc |
67 |
|
68 |
diff --git a/app-emulation/free42/files/free42-2.0.17-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.17-fix-makefile.patch |
69 |
deleted file mode 100644 |
70 |
index 7642316920f..00000000000 |
71 |
--- a/app-emulation/free42/files/free42-2.0.17-fix-makefile.patch |
72 |
+++ /dev/null |
73 |
@@ -1,58 +0,0 @@ |
74 |
-diff -Nuar a/gtk/Makefile b/gtk/Makefile |
75 |
---- a/gtk/Makefile 2018-01-08 02:52:33.000000000 +0100 |
76 |
-+++ b/gtk/Makefile 2018-01-13 19:40:49.059998446 +0100 |
77 |
-@@ -15,11 +15,11 @@ |
78 |
- # along with this program; if not, see http://www.gnu.org/licenses/. |
79 |
- ############################################################################### |
80 |
- |
81 |
--CFLAGS = -MMD \ |
82 |
-+CFLAGS := -MMD \ |
83 |
- -Wall \ |
84 |
- -Wno-parentheses \ |
85 |
- -Wno-write-strings \ |
86 |
-- -g \ |
87 |
-+ -Wno-error=narrowing \ |
88 |
- -I/usr/X11R6/include \ |
89 |
- $(shell pkg-config --cflags gtk+-2.0) \ |
90 |
- -DVERSION="\"$(shell cat ../VERSION)\"" \ |
91 |
-@@ -27,21 +27,25 @@ |
92 |
- -DDECIMAL_GLOBAL_ROUNDING=1 \ |
93 |
- -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \ |
94 |
- -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \ |
95 |
-- -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 |
96 |
-+ -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \ |
97 |
-+ ${CFLAGS} |
98 |
- |
99 |
--CXXFLAGS = $(CFLAGS) \ |
100 |
-+CXXFLAGS := $(CFLAGS) \ |
101 |
- -fno-exceptions \ |
102 |
- -fno-rtti \ |
103 |
-- -D_WCHAR_T_DEFINED |
104 |
-+ -D_WCHAR_T_DEFINED \ |
105 |
-+ ${CXXFLAGS} |
106 |
- |
107 |
--LDFLAGS = -L/usr/X11R6/lib |
108 |
--LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0) |
109 |
-+MYLDFLAGS = -L/usr/X11R6/lib |
110 |
-+LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0) |
111 |
- |
112 |
- ifeq "$(shell uname -s)" "Linux" |
113 |
--LDFLAGS += -Wl,--hash-style=both |
114 |
-+MYLDFLAGS += -Wl,--hash-style=both |
115 |
- LIBS += -lpthread |
116 |
- endif |
117 |
- |
118 |
-+MYLDFLAGS += ${LDFLAGS} |
119 |
-+ |
120 |
- SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \ |
121 |
- shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \ |
122 |
- core_commands3.cc core_commands4.cc core_commands5.cc \ |
123 |
-@@ -83,7 +87,7 @@ |
124 |
- endif |
125 |
- |
126 |
- $(EXE): $(OBJS) |
127 |
-- $(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS) |
128 |
-+ $(CXX) -o $(EXE) $(MYLDFLAGS) $(OBJS) $(LIBS) |
129 |
- |
130 |
- $(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks |
131 |
- |
132 |
|
133 |
diff --git a/app-emulation/free42/free42-2.0.10.ebuild b/app-emulation/free42/free42-2.0.10.ebuild |
134 |
index 467f13b3806..5d440a08b23 100644 |
135 |
--- a/app-emulation/free42/free42-2.0.10.ebuild |
136 |
+++ b/app-emulation/free42/free42-2.0.10.ebuild |
137 |
@@ -32,8 +32,8 @@ S="${WORKDIR}/${MY_PV}" |
138 |
src_prepare() { |
139 |
sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \ |
140 |
"${S}/gtk/shell_main.cc" || die |
141 |
- epatch "${FILESDIR}"/${P}-fix-makefile.patch |
142 |
- epatch "${FILESDIR}"/${P}-fix-build-intel-lib.patch |
143 |
+ epatch "${FILESDIR}/${PN}-2.0.10-fix-makefile.patch" |
144 |
+ epatch "${FILESDIR}/${PN}-2.0.10-fix-build-intel-lib.patch" |
145 |
eapply_user |
146 |
} |
147 |
|
148 |
|
149 |
diff --git a/app-emulation/free42/free42-2.0.17.ebuild b/app-emulation/free42/free42-2.0.17.ebuild |
150 |
index 78b6e63cfd3..417714d3504 100644 |
151 |
--- a/app-emulation/free42/free42-2.0.17.ebuild |
152 |
+++ b/app-emulation/free42/free42-2.0.17.ebuild |
153 |
@@ -32,8 +32,8 @@ S="${WORKDIR}/${MY_PV}" |
154 |
src_prepare() { |
155 |
sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \ |
156 |
"${S}/gtk/shell_main.cc" || die |
157 |
- epatch "${FILESDIR}"/${P}-fix-makefile.patch |
158 |
- epatch "${FILESDIR}"/${P}-fix-build-intel-lib.patch |
159 |
+ epatch "${FILESDIR}/${PN}-2.0.10-fix-makefile.patch" |
160 |
+ epatch "${FILESDIR}/${PN}-2.0.10-fix-build-intel-lib.patch" |
161 |
eapply_user |
162 |
} |