app-emulation/free42: Clean duplicate patches

Closes: https://github.com/gentoo/gentoo/pull/7894
Package-Manager: Portage-2.3.24, Repoman-2.3.6

6 files changed, 8 insertions, 78 deletions

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
index a321b1d714b8..543595c6a1a1 100644
--- 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
@@ -1,6 +1,6 @@
 diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh
---- a/gtk/build-intel-lib.sh	2018-01-08 02:52:33.000000000 +0100
-+++ b/gtk/build-intel-lib.sh	2018-01-13 19:43:23.709997784 +0100
+--- a/gtk/build-intel-lib.sh
++++ b/gtk/build-intel-lib.sh
 @@ -4,7 +4,7 @@
  cd IntelRDFPMathLib20U1
  patch -p0 <../intel-lib-linux.patch
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
index 7642316920f4..c033bbc60ceb 100644
--- a/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch
+++ b/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch
@@ -1,6 +1,6 @@
 diff -Nuar a/gtk/Makefile b/gtk/Makefile
---- a/gtk/Makefile	2018-01-08 02:52:33.000000000 +0100
-+++ b/gtk/Makefile	2018-01-13 19:40:49.059998446 +0100
+--- a/gtk/Makefile
++++ b/gtk/Makefile
 @@ -15,11 +15,11 @@
  # along with this program; if not, see http://www.gnu.org/licenses/.
  ###############################################################################
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
deleted file mode 100644
index a321b1d714b8..000000000000
--- a/app-emulation/free42/files/free42-2.0.17-fix-build-intel-lib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh
---- a/gtk/build-intel-lib.sh	2018-01-08 02:52:33.000000000 +0100
-+++ b/gtk/build-intel-lib.sh	2018-01-13 19:43:23.709997784 +0100
-@@ -4,7 +4,7 @@
- cd IntelRDFPMathLib20U1
- patch -p0 <../intel-lib-linux.patch
- cd LIBRARY
--make CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
-+make A=a CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
- mv libbid.a ../../gcc111libbid.a
- cd ../..
- ( 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
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
deleted file mode 100644
index 7642316920f4..000000000000
--- a/app-emulation/free42/files/free42-2.0.17-fix-makefile.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Nuar a/gtk/Makefile b/gtk/Makefile
---- a/gtk/Makefile	2018-01-08 02:52:33.000000000 +0100
-+++ b/gtk/Makefile	2018-01-13 19:40:49.059998446 +0100
-@@ -15,11 +15,11 @@
- # along with this program; if not, see http://www.gnu.org/licenses/.
- ###############################################################################
- 
--CFLAGS = -MMD \
-+CFLAGS := -MMD \
- 	 -Wall \
- 	 -Wno-parentheses \
- 	 -Wno-write-strings \
--	 -g \
-+	 -Wno-error=narrowing \
- 	 -I/usr/X11R6/include \
- 	 $(shell pkg-config --cflags gtk+-2.0) \
- 	 -DVERSION="\"$(shell cat ../VERSION)\"" \
-@@ -27,21 +27,25 @@
- 	 -DDECIMAL_GLOBAL_ROUNDING=1 \
- 	 -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
- 	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
--	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
-+	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
-+	 ${CFLAGS}
- 
--CXXFLAGS = $(CFLAGS) \
-+CXXFLAGS := $(CFLAGS) \
- 	 -fno-exceptions \
- 	 -fno-rtti \
--	 -D_WCHAR_T_DEFINED
-+	 -D_WCHAR_T_DEFINED \
-+	 ${CXXFLAGS}
- 
--LDFLAGS = -L/usr/X11R6/lib
--LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0)
-+MYLDFLAGS = -L/usr/X11R6/lib
-+LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0)
- 
- ifeq "$(shell uname -s)" "Linux"
--LDFLAGS += -Wl,--hash-style=both
-+MYLDFLAGS += -Wl,--hash-style=both
- LIBS += -lpthread
- endif
- 
-+MYLDFLAGS += ${LDFLAGS}
-+
- SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
- 	shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
- 	core_commands3.cc core_commands4.cc core_commands5.cc \
-@@ -83,7 +87,7 @@
- endif
- 
- $(EXE): $(OBJS)
--	$(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
-+	$(CXX) -o $(EXE) $(MYLDFLAGS) $(OBJS) $(LIBS)
- 
- $(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks
- 
diff --git a/app-emulation/free42/free42-2.0.10.ebuild b/app-emulation/free42/free42-2.0.10.ebuild
index 467f13b38067..5d440a08b23e 100644
--- a/app-emulation/free42/free42-2.0.10.ebuild
+++ b/app-emulation/free42/free42-2.0.10.ebuild
@@ -32,8 +32,8 @@ S="${WORKDIR}/${MY_PV}"
 src_prepare() {
 	sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \
 		"${S}/gtk/shell_main.cc" || die
-	epatch "${FILESDIR}"/${P}-fix-makefile.patch
-	epatch "${FILESDIR}"/${P}-fix-build-intel-lib.patch
+	epatch "${FILESDIR}/${PN}-2.0.10-fix-makefile.patch"
+	epatch "${FILESDIR}/${PN}-2.0.10-fix-build-intel-lib.patch"
 	eapply_user
 }
 
diff --git a/app-emulation/free42/free42-2.0.17.ebuild b/app-emulation/free42/free42-2.0.17.ebuild
index 78b6e63cfd39..417714d3504f 100644
--- a/app-emulation/free42/free42-2.0.17.ebuild
+++ b/app-emulation/free42/free42-2.0.17.ebuild
@@ -32,8 +32,8 @@ S="${WORKDIR}/${MY_PV}"
 src_prepare() {
 	sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \
 		"${S}/gtk/shell_main.cc" || die
-	epatch "${FILESDIR}"/${P}-fix-makefile.patch
-	epatch "${FILESDIR}"/${P}-fix-build-intel-lib.patch
+	epatch "${FILESDIR}/${PN}-2.0.10-fix-makefile.patch"
+	epatch "${FILESDIR}/${PN}-2.0.10-fix-build-intel-lib.patch"
 	eapply_user
 }