commit: 6a6cfc18a89e65a436e842fa58f636d9e8c36d85 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sun Jan 16 19:02:44 2022 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Mon Jan 31 13:53:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a6cfc18
sci-electronics/magic: remove unused patches Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/23830 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> .../magic/files/magic-7.5.202-include.patch | 20 ----------- .../magic/files/magic-7.5.202-install.patch | 15 -------- sci-electronics/magic/files/magic-ldflags.patch | 40 ---------------------- 3 files changed, 75 deletions(-) diff --git a/sci-electronics/magic/files/magic-7.5.202-include.patch b/sci-electronics/magic/files/magic-7.5.202-include.patch deleted file mode 100644 index f1fc95a60b32..000000000000 --- a/sci-electronics/magic/files/magic-7.5.202-include.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- magic-7.5.202/textio/txInput.c -+++ magic-7.5.202/textio/txInput.c -@@ -21,6 +21,7 @@ - #endif /* not lint */ - - #include <stdio.h> -+#include <stdlib.h> - #include <string.h> - #include <sys/time.h> - #include <sys/types.h> ---- magic-8.0.131/graphics/grX11su3.c -+++ magic-8.0.131/graphics/grX11su3.c -@@ -20,6 +20,7 @@ - - #include <stdio.h> - #include <string.h> -+#include <math.h> - #include <X11/Xlib.h> - - #include "utils/magic.h" diff --git a/sci-electronics/magic/files/magic-7.5.202-install.patch b/sci-electronics/magic/files/magic-7.5.202-install.patch deleted file mode 100644 index 6e28b950c510..000000000000 --- a/sci-electronics/magic/files/magic-7.5.202-install.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- magic-7.5.202/rules.mak -+++ magic-7.5.202/rules.mak -@@ -43,9 +43,9 @@ - ${RM} ${MODULE} - ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} lib${MODULE}.o ${EXTRA_LIBS} -o ${MODULE} ${LIBS} - --${BINDIR}/${MODULE}${EXEEXT}: ${MODULE}${EXEEXT} -- ${RM} ${BINDIR}/${MODULE}${EXEEXT} -- ${CP} ${MODULE}${EXEEXT} ${BINDIR} -+${DESTDIR}${BINDIR}/${MODULE}${EXEEXT}: ${MODULE}${EXEEXT} -+ ${RM} ${DESTDIR}${BINDIR}/${MODULE}${EXEEXT} -+ ${CP} ${MODULE}${EXEEXT} ${DESTDIR}${BINDIR} - - ../database/database.h: ../database/database.h.in - @echo --- making header file database/database.h diff --git a/sci-electronics/magic/files/magic-ldflags.patch b/sci-electronics/magic/files/magic-ldflags.patch deleted file mode 100644 index 60d5891beee0..000000000000 --- a/sci-electronics/magic/files/magic-ldflags.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -r -u magic-7.5.202.orig/scripts/configure.in magic-7.5.202/scripts/configure.in ---- magic-7.5.202.orig/scripts/configure.in 2010-03-08 14:33:07.000000000 +0100 -+++ magic-7.5.202/scripts/configure.in 2010-07-02 22:15:50.814199319 +0200 -@@ -1350,7 +1350,6 @@ - if test "x${loader_run_path}" != "x" ; then - LD_RUN_PATH="${LD_RUN_PATH} -Wl,-rpath,${loader_run_path}" - fi -- LDFLAGS="" - EXTRA_LIB_SPECS="-ldl" - ;; - -diff -r -u magic-7.5.202.orig/scripts/defs.mak.in magic-7.5.202/scripts/defs.mak.in ---- magic-7.5.202.orig/scripts/defs.mak.in 2010-03-08 14:33:07.000000000 +0100 -+++ magic-7.5.202/scripts/defs.mak.in 2010-07-02 22:15:50.814199319 +0200 -@@ -53,7 +53,7 @@ - M4 = @M4@ - RANLIB = @RANLIB@ - SHDLIB_EXT = @SHDLIB_EXT@ --LDDL_FLAGS = @LDDL_FLAGS@ -+LDDL_FLAGS = ${LDFLAGS} @LDDL_FLAGS@ - LD_RUN_PATH = @LD_RUN_PATH@ - LIB_SPECS = @LIB_SPECS@ - WISH_EXE = @WISH_EXE@ -diff -r -u magic-7.5.202.orig/tcltk/Makefile magic-7.5.202/tcltk/Makefile ---- magic-7.5.202.orig/tcltk/Makefile 2009-05-29 15:54:55.000000000 +0200 -+++ magic-7.5.202/tcltk/Makefile 2010-07-02 22:16:30.916202298 +0200 -@@ -41,11 +41,11 @@ - (cd $(DESTDIR)${TCLDIR}; chmod 0755 tkcon.tcl tkshell.tcl) - - magicexec: magicexec.c -- ${CC} ${CFLAGS} -pg ${CPPFLAGS} ${DFLAGS} magicexec.c -o magicexec \ -+ ${CC} ${CFLAGS} -pg ${CPPFLAGS} ${DFLAGS} ${LDFLAGS} magicexec.c -o magicexec \ - ${LD_RUN_PATH} ${LIBS} ${LIB_SPECS} - - magicdnull: magicdnull.c -- ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} magicdnull.c -o magicdnull \ -+ ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${LDFLAGS} magicdnull.c -o magicdnull \ - ${LD_RUN_PATH} ${LIBS} ${LIB_SPECS} - - magic.tcl: magic.tcl.in ${MAGICDIR}/defs.mak
