| 1 |
commit: 6a6cfc18a89e65a436e842fa58f636d9e8c36d85 |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Sun Jan 16 19:02:44 2022 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 31 13:53:16 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a6cfc18 |
| 7 |
|
| 8 |
sci-electronics/magic: remove unused patches |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/23830 |
| 13 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> |
| 14 |
|
| 15 |
.../magic/files/magic-7.5.202-include.patch | 20 ----------- |
| 16 |
.../magic/files/magic-7.5.202-install.patch | 15 -------- |
| 17 |
sci-electronics/magic/files/magic-ldflags.patch | 40 ---------------------- |
| 18 |
3 files changed, 75 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sci-electronics/magic/files/magic-7.5.202-include.patch b/sci-electronics/magic/files/magic-7.5.202-include.patch |
| 21 |
deleted file mode 100644 |
| 22 |
index f1fc95a60b32..000000000000 |
| 23 |
--- a/sci-electronics/magic/files/magic-7.5.202-include.patch |
| 24 |
+++ /dev/null |
| 25 |
@@ -1,20 +0,0 @@ |
| 26 |
---- magic-7.5.202/textio/txInput.c |
| 27 |
-+++ magic-7.5.202/textio/txInput.c |
| 28 |
-@@ -21,6 +21,7 @@ |
| 29 |
- #endif /* not lint */ |
| 30 |
- |
| 31 |
- #include <stdio.h> |
| 32 |
-+#include <stdlib.h> |
| 33 |
- #include <string.h> |
| 34 |
- #include <sys/time.h> |
| 35 |
- #include <sys/types.h> |
| 36 |
---- magic-8.0.131/graphics/grX11su3.c |
| 37 |
-+++ magic-8.0.131/graphics/grX11su3.c |
| 38 |
-@@ -20,6 +20,7 @@ |
| 39 |
- |
| 40 |
- #include <stdio.h> |
| 41 |
- #include <string.h> |
| 42 |
-+#include <math.h> |
| 43 |
- #include <X11/Xlib.h> |
| 44 |
- |
| 45 |
- #include "utils/magic.h" |
| 46 |
|
| 47 |
diff --git a/sci-electronics/magic/files/magic-7.5.202-install.patch b/sci-electronics/magic/files/magic-7.5.202-install.patch |
| 48 |
deleted file mode 100644 |
| 49 |
index 6e28b950c510..000000000000 |
| 50 |
--- a/sci-electronics/magic/files/magic-7.5.202-install.patch |
| 51 |
+++ /dev/null |
| 52 |
@@ -1,15 +0,0 @@ |
| 53 |
---- magic-7.5.202/rules.mak |
| 54 |
-+++ magic-7.5.202/rules.mak |
| 55 |
-@@ -43,9 +43,9 @@ |
| 56 |
- ${RM} ${MODULE} |
| 57 |
- ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} lib${MODULE}.o ${EXTRA_LIBS} -o ${MODULE} ${LIBS} |
| 58 |
- |
| 59 |
--${BINDIR}/${MODULE}${EXEEXT}: ${MODULE}${EXEEXT} |
| 60 |
-- ${RM} ${BINDIR}/${MODULE}${EXEEXT} |
| 61 |
-- ${CP} ${MODULE}${EXEEXT} ${BINDIR} |
| 62 |
-+${DESTDIR}${BINDIR}/${MODULE}${EXEEXT}: ${MODULE}${EXEEXT} |
| 63 |
-+ ${RM} ${DESTDIR}${BINDIR}/${MODULE}${EXEEXT} |
| 64 |
-+ ${CP} ${MODULE}${EXEEXT} ${DESTDIR}${BINDIR} |
| 65 |
- |
| 66 |
- ../database/database.h: ../database/database.h.in |
| 67 |
- @echo --- making header file database/database.h |
| 68 |
|
| 69 |
diff --git a/sci-electronics/magic/files/magic-ldflags.patch b/sci-electronics/magic/files/magic-ldflags.patch |
| 70 |
deleted file mode 100644 |
| 71 |
index 60d5891beee0..000000000000 |
| 72 |
--- a/sci-electronics/magic/files/magic-ldflags.patch |
| 73 |
+++ /dev/null |
| 74 |
@@ -1,40 +0,0 @@ |
| 75 |
-diff -r -u magic-7.5.202.orig/scripts/configure.in magic-7.5.202/scripts/configure.in |
| 76 |
---- magic-7.5.202.orig/scripts/configure.in 2010-03-08 14:33:07.000000000 +0100 |
| 77 |
-+++ magic-7.5.202/scripts/configure.in 2010-07-02 22:15:50.814199319 +0200 |
| 78 |
-@@ -1350,7 +1350,6 @@ |
| 79 |
- if test "x${loader_run_path}" != "x" ; then |
| 80 |
- LD_RUN_PATH="${LD_RUN_PATH} -Wl,-rpath,${loader_run_path}" |
| 81 |
- fi |
| 82 |
-- LDFLAGS="" |
| 83 |
- EXTRA_LIB_SPECS="-ldl" |
| 84 |
- ;; |
| 85 |
- |
| 86 |
-diff -r -u magic-7.5.202.orig/scripts/defs.mak.in magic-7.5.202/scripts/defs.mak.in |
| 87 |
---- magic-7.5.202.orig/scripts/defs.mak.in 2010-03-08 14:33:07.000000000 +0100 |
| 88 |
-+++ magic-7.5.202/scripts/defs.mak.in 2010-07-02 22:15:50.814199319 +0200 |
| 89 |
-@@ -53,7 +53,7 @@ |
| 90 |
- M4 = @M4@ |
| 91 |
- RANLIB = @RANLIB@ |
| 92 |
- SHDLIB_EXT = @SHDLIB_EXT@ |
| 93 |
--LDDL_FLAGS = @LDDL_FLAGS@ |
| 94 |
-+LDDL_FLAGS = ${LDFLAGS} @LDDL_FLAGS@ |
| 95 |
- LD_RUN_PATH = @LD_RUN_PATH@ |
| 96 |
- LIB_SPECS = @LIB_SPECS@ |
| 97 |
- WISH_EXE = @WISH_EXE@ |
| 98 |
-diff -r -u magic-7.5.202.orig/tcltk/Makefile magic-7.5.202/tcltk/Makefile |
| 99 |
---- magic-7.5.202.orig/tcltk/Makefile 2009-05-29 15:54:55.000000000 +0200 |
| 100 |
-+++ magic-7.5.202/tcltk/Makefile 2010-07-02 22:16:30.916202298 +0200 |
| 101 |
-@@ -41,11 +41,11 @@ |
| 102 |
- (cd $(DESTDIR)${TCLDIR}; chmod 0755 tkcon.tcl tkshell.tcl) |
| 103 |
- |
| 104 |
- magicexec: magicexec.c |
| 105 |
-- ${CC} ${CFLAGS} -pg ${CPPFLAGS} ${DFLAGS} magicexec.c -o magicexec \ |
| 106 |
-+ ${CC} ${CFLAGS} -pg ${CPPFLAGS} ${DFLAGS} ${LDFLAGS} magicexec.c -o magicexec \ |
| 107 |
- ${LD_RUN_PATH} ${LIBS} ${LIB_SPECS} |
| 108 |
- |
| 109 |
- magicdnull: magicdnull.c |
| 110 |
-- ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} magicdnull.c -o magicdnull \ |
| 111 |
-+ ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${LDFLAGS} magicdnull.c -o magicdnull \ |
| 112 |
- ${LD_RUN_PATH} ${LIBS} ${LIB_SPECS} |
| 113 |
- |
| 114 |
- magic.tcl: magic.tcl.in ${MAGICDIR}/defs.mak |
Archives