1 |
commit: bff49afa090b4a26f8a00f3d677e79d0ae27c1e0 |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jan 31 17:42:24 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 1 22:40:24 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff49afa |
7 |
|
8 |
sci-electronics/electric: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/3740 |
11 |
|
12 |
.../electric/files/7.00-fix-sandbox.patch | 11 ----- |
13 |
sci-electronics/electric/files/7.00-qt.patch | 35 ---------------- |
14 |
.../files/electric-7.00-gcc4.1-gentoo.patch | 11 ----- |
15 |
.../electric/files/electric-7.00-qt-gentoo.patch | 48 ---------------------- |
16 |
4 files changed, 105 deletions(-) |
17 |
|
18 |
diff --git a/sci-electronics/electric/files/7.00-fix-sandbox.patch b/sci-electronics/electric/files/7.00-fix-sandbox.patch |
19 |
deleted file mode 100644 |
20 |
index 29c3654..00000000 |
21 |
--- a/sci-electronics/electric/files/7.00-fix-sandbox.patch |
22 |
+++ /dev/null |
23 |
@@ -1,11 +0,0 @@ |
24 |
---- Makefile.in 2004-12-03 16:27:37.000000000 +0100 |
25 |
-+++ Makefile.in.new 2004-12-03 16:38:28.203830495 +0100 |
26 |
-@@ -936,7 +936,7 @@ |
27 |
- rm -f src/vhdl/*~ src/vhdl/"#"*"#" |
28 |
- |
29 |
- install: all |
30 |
-- $(INSTALL) -d -m755 @bindir@ $(DESTDIR)@datadir@/electric/lib |
31 |
-+ $(INSTALL) -d -m755 ${DESTDIR}/@bindir@ $(DESTDIR)@datadir@/electric/lib |
32 |
- $(INSTALL) -m755 $(PROGNAME) $(DESTDIR)@bindir@/$(PROGNAME) |
33 |
- $(INSTALL) -m644 lib/.cadrc $(DESTDIR)@datadir@/electric/lib |
34 |
- @(cd lib ; \ |
35 |
|
36 |
diff --git a/sci-electronics/electric/files/7.00-qt.patch b/sci-electronics/electric/files/7.00-qt.patch |
37 |
deleted file mode 100644 |
38 |
index 137f1e9..00000000 |
39 |
--- a/sci-electronics/electric/files/7.00-qt.patch |
40 |
+++ /dev/null |
41 |
@@ -1,35 +0,0 @@ |
42 |
---- Makefile.in.oric 2004-03-15 10:31:14.000000000 +1030 |
43 |
-+++ Makefile.in 2004-03-15 10:39:14.000000000 +1030 |
44 |
-@@ -1,10 +1,10 @@ |
45 |
- ########################################################## USING QT |
46 |
- ##### If using Qt, uncomment these five lines |
47 |
--# GRAPH_FLAGS = -DUSEQT -DQT_THREAD_SUPPORT -I$(QTDIR)/include $(QUI_CFLAGS) |
48 |
--# GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS) |
49 |
--# GRAPH_OBJS = $(GRAPH_OBJS_QT) |
50 |
--# GRAPH_SRC = $(GRAPH_SRC_QT) |
51 |
--# CCOMPILER = @CXX@ |
52 |
-+GRAPH_FLAGS = -DUSEQT -DQT_THREAD_SUPPORT -I$(QTDIR)/include $(QUI_CFLAGS) |
53 |
-+GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS) |
54 |
-+GRAPH_OBJS = $(GRAPH_OBJS_QT) |
55 |
-+GRAPH_SRC = $(GRAPH_SRC_QT) |
56 |
-+CCOMPILER = @CXX@ |
57 |
- |
58 |
- ##### Qt on UNIX/Linux: uncomment the next two lines: |
59 |
- ELECTRIC_TARGET = electric-target-unix |
60 |
-@@ -20,11 +20,11 @@ |
61 |
- |
62 |
- ########################################################### USING MOTIF |
63 |
- ##### If using Motif (or OpenMotif/Lesstif), uncomment these five lines |
64 |
--GRAPH_FLAGS = @X_CFLAGS@ |
65 |
--GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11 |
66 |
--GRAPH_OBJS = $(GRAPH_OBJS_XT) |
67 |
--GRAPH_SRC = $(GRAPH_SRC_XT) |
68 |
--CCOMPILER = @PTHREAD_CC@ |
69 |
-+#GRAPH_FLAGS = @X_CFLAGS@ |
70 |
-+#GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11 |
71 |
-+#GRAPH_OBJS = $(GRAPH_OBJS_XT) |
72 |
-+#GRAPH_SRC = $(GRAPH_SRC_XT) |
73 |
-+#CCOMPILER = @PTHREAD_CC@ |
74 |
- |
75 |
- ##### For the general-purpose X facility, uncomment this line |
76 |
- XPOWER = -DANYDEPTH |
77 |
|
78 |
diff --git a/sci-electronics/electric/files/electric-7.00-gcc4.1-gentoo.patch b/sci-electronics/electric/files/electric-7.00-gcc4.1-gentoo.patch |
79 |
deleted file mode 100644 |
80 |
index b2e678d..00000000 |
81 |
--- a/sci-electronics/electric/files/electric-7.00-gcc4.1-gentoo.patch |
82 |
+++ /dev/null |
83 |
@@ -1,11 +0,0 @@ |
84 |
-diff -Naur electric-7.00/src/graph/graphqtdlg.h electric-7.00-new/src/graph/graphqtdlg.h |
85 |
---- electric-7.00/src/graph/graphqtdlg.h 2004-07-15 20:59:53.000000000 -0500 |
86 |
-+++ electric-7.00-new/src/graph/graphqtdlg.h 2006-03-15 22:11:39.000000000 -0600 |
87 |
-@@ -59,6 +59,7 @@ |
88 |
- class QSignalMapper; |
89 |
- class EScrollField; |
90 |
- class EDialogPrivate; |
91 |
-+class EDialog; |
92 |
- |
93 |
- class EDialogPrivate: public QDialog |
94 |
- { |
95 |
|
96 |
diff --git a/sci-electronics/electric/files/electric-7.00-qt-gentoo.patch b/sci-electronics/electric/files/electric-7.00-qt-gentoo.patch |
97 |
deleted file mode 100644 |
98 |
index f21c4c5..00000000 |
99 |
--- a/sci-electronics/electric/files/electric-7.00-qt-gentoo.patch |
100 |
+++ /dev/null |
101 |
@@ -1,48 +0,0 @@ |
102 |
-diff -Naur electric-7.00/Makefile.in electric-7.00-new/Makefile.in |
103 |
---- electric-7.00/Makefile.in 2004-07-15 20:59:50.000000000 -0500 |
104 |
-+++ electric-7.00-new/Makefile.in 2006-03-15 22:19:08.000000000 -0600 |
105 |
-@@ -1,10 +1,10 @@ |
106 |
- ########################################################## USING QT |
107 |
- ##### If using Qt, uncomment these five lines |
108 |
--# GRAPH_FLAGS = -DUSEQT -DQT_THREAD_SUPPORT -I$(QTDIR)/include $(QUI_CFLAGS) |
109 |
--# GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS) |
110 |
--# GRAPH_OBJS = $(GRAPH_OBJS_QT) |
111 |
--# GRAPH_SRC = $(GRAPH_SRC_QT) |
112 |
--# CCOMPILER = @CXX@ |
113 |
-+GRAPH_FLAGS = -DUSEQT -DQT_THREAD_SUPPORT -I$(QTDIR)/include $(QUI_CFLAGS) |
114 |
-+GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS) |
115 |
-+GRAPH_OBJS = $(GRAPH_OBJS_QT) |
116 |
-+GRAPH_SRC = $(GRAPH_SRC_QT) |
117 |
-+CCOMPILER = @CXX@ |
118 |
- |
119 |
- ##### Qt on UNIX/Linux: uncomment the next two lines: |
120 |
- ELECTRIC_TARGET = electric-target-unix |
121 |
-@@ -20,11 +20,11 @@ |
122 |
- |
123 |
- ########################################################### USING MOTIF |
124 |
- ##### If using Motif (or OpenMotif/Lesstif), uncomment these five lines |
125 |
--GRAPH_FLAGS = @X_CFLAGS@ |
126 |
--GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11 |
127 |
--GRAPH_OBJS = $(GRAPH_OBJS_XT) |
128 |
--GRAPH_SRC = $(GRAPH_SRC_XT) |
129 |
--CCOMPILER = @PTHREAD_CC@ |
130 |
-+#GRAPH_FLAGS = @X_CFLAGS@ |
131 |
-+#GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11 |
132 |
-+#GRAPH_OBJS = $(GRAPH_OBJS_XT) |
133 |
-+#GRAPH_SRC = $(GRAPH_SRC_XT) |
134 |
-+#CCOMPILER = @PTHREAD_CC@ |
135 |
- |
136 |
- ##### For the general-purpose X facility, uncomment this line |
137 |
- XPOWER = -DANYDEPTH |
138 |
-@@ -997,9 +997,9 @@ |
139 |
- src/graph/graphqtdlg.o: src/graph/graphqtdlg.cpp $(HDS)/global.h src/graph/graphqtdlg.h $(HDS)/edialogs.h |
140 |
- src/graph/graphqtdraw.o: src/graph/graphqtdraw.cpp $(HDS)/global.h src/graph/graphqt.h $(HDS)/egraphics.h |
141 |
- src/graph/moc_graphqt.cpp: src/graph/graphqt.h $(HDS)/global.h |
142 |
-- moc src/graph/graphqt.h -o $@ |
143 |
-+ $(QTDIR)/bin/moc src/graph/graphqt.h -o $@ |
144 |
- src/graph/moc_graphqtdlg.cpp: src/graph/graphqtdlg.h $(HDS)/global.h |
145 |
-- moc src/graph/graphqtdlg.h -o $@ |
146 |
-+ $(QTDIR)/bin/moc src/graph/graphqtdlg.h -o $@ |
147 |
- $(JARLOC): $(JAVA_OBJS) |
148 |
- (cd src/java; jar -cf ../../$(JARLOC) com/sun/dbmirror/*.class) |
149 |
- lib/java/romgen.class: lib/java/romgen.java |