commit: bff49afa090b4a26f8a00f3d677e79d0ae27c1e0 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Tue Jan 31 17:42:24 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Wed Feb 1 22:40:24 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff49afa
sci-electronics/electric: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/3740 .../electric/files/7.00-fix-sandbox.patch | 11 ----- sci-electronics/electric/files/7.00-qt.patch | 35 ---------------- .../files/electric-7.00-gcc4.1-gentoo.patch | 11 ----- .../electric/files/electric-7.00-qt-gentoo.patch | 48 ---------------------- 4 files changed, 105 deletions(-) diff --git a/sci-electronics/electric/files/7.00-fix-sandbox.patch b/sci-electronics/electric/files/7.00-fix-sandbox.patch deleted file mode 100644 index 29c3654..00000000 --- a/sci-electronics/electric/files/7.00-fix-sandbox.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in 2004-12-03 16:27:37.000000000 +0100 -+++ Makefile.in.new 2004-12-03 16:38:28.203830495 +0100 -@@ -936,7 +936,7 @@ - rm -f src/vhdl/*~ src/vhdl/"#"*"#" - - install: all -- $(INSTALL) -d -m755 @bindir@ $(DESTDIR)@datadir@/electric/lib -+ $(INSTALL) -d -m755 ${DESTDIR}/@bindir@ $(DESTDIR)@datadir@/electric/lib - $(INSTALL) -m755 $(PROGNAME) $(DESTDIR)@bindir@/$(PROGNAME) - $(INSTALL) -m644 lib/.cadrc $(DESTDIR)@datadir@/electric/lib - @(cd lib ; \ diff --git a/sci-electronics/electric/files/7.00-qt.patch b/sci-electronics/electric/files/7.00-qt.patch deleted file mode 100644 index 137f1e9..00000000 --- a/sci-electronics/electric/files/7.00-qt.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- Makefile.in.oric 2004-03-15 10:31:14.000000000 +1030 -+++ Makefile.in 2004-03-15 10:39:14.000000000 +1030 -@@ -1,10 +1,10 @@ - ########################################################## USING QT - ##### If using Qt, uncomment these five lines --# GRAPH_FLAGS = -DUSEQT -DQT_THREAD_SUPPORT -I$(QTDIR)/include $(QUI_CFLAGS) --# GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS) --# GRAPH_OBJS = $(GRAPH_OBJS_QT) --# GRAPH_SRC = $(GRAPH_SRC_QT) --# CCOMPILER = @CXX@ -+GRAPH_FLAGS = -DUSEQT -DQT_THREAD_SUPPORT -I$(QTDIR)/include $(QUI_CFLAGS) -+GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS) -+GRAPH_OBJS = $(GRAPH_OBJS_QT) -+GRAPH_SRC = $(GRAPH_SRC_QT) -+CCOMPILER = @CXX@ - - ##### Qt on UNIX/Linux: uncomment the next two lines: - ELECTRIC_TARGET = electric-target-unix -@@ -20,11 +20,11 @@ - - ########################################################### USING MOTIF - ##### If using Motif (or OpenMotif/Lesstif), uncomment these five lines --GRAPH_FLAGS = @X_CFLAGS@ --GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11 --GRAPH_OBJS = $(GRAPH_OBJS_XT) --GRAPH_SRC = $(GRAPH_SRC_XT) --CCOMPILER = @PTHREAD_CC@ -+#GRAPH_FLAGS = @X_CFLAGS@ -+#GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11 -+#GRAPH_OBJS = $(GRAPH_OBJS_XT) -+#GRAPH_SRC = $(GRAPH_SRC_XT) -+#CCOMPILER = @PTHREAD_CC@ - - ##### For the general-purpose X facility, uncomment this line - XPOWER = -DANYDEPTH 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 deleted file mode 100644 index b2e678d..00000000 --- a/sci-electronics/electric/files/electric-7.00-gcc4.1-gentoo.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur electric-7.00/src/graph/graphqtdlg.h electric-7.00-new/src/graph/graphqtdlg.h ---- electric-7.00/src/graph/graphqtdlg.h 2004-07-15 20:59:53.000000000 -0500 -+++ electric-7.00-new/src/graph/graphqtdlg.h 2006-03-15 22:11:39.000000000 -0600 -@@ -59,6 +59,7 @@ - class QSignalMapper; - class EScrollField; - class EDialogPrivate; -+class EDialog; - - class EDialogPrivate: public QDialog - { diff --git a/sci-electronics/electric/files/electric-7.00-qt-gentoo.patch b/sci-electronics/electric/files/electric-7.00-qt-gentoo.patch deleted file mode 100644 index f21c4c5..00000000 --- a/sci-electronics/electric/files/electric-7.00-qt-gentoo.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naur electric-7.00/Makefile.in electric-7.00-new/Makefile.in ---- electric-7.00/Makefile.in 2004-07-15 20:59:50.000000000 -0500 -+++ electric-7.00-new/Makefile.in 2006-03-15 22:19:08.000000000 -0600 -@@ -1,10 +1,10 @@ - ########################################################## USING QT - ##### If using Qt, uncomment these five lines --# GRAPH_FLAGS = -DUSEQT -DQT_THREAD_SUPPORT -I$(QTDIR)/include $(QUI_CFLAGS) --# GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS) --# GRAPH_OBJS = $(GRAPH_OBJS_QT) --# GRAPH_SRC = $(GRAPH_SRC_QT) --# CCOMPILER = @CXX@ -+GRAPH_FLAGS = -DUSEQT -DQT_THREAD_SUPPORT -I$(QTDIR)/include $(QUI_CFLAGS) -+GRAPH_LIBS = -L$(QTDIR)/lib $(QUI_LIBS) $(QT_LIB_EXTRAS) -+GRAPH_OBJS = $(GRAPH_OBJS_QT) -+GRAPH_SRC = $(GRAPH_SRC_QT) -+CCOMPILER = @CXX@ - - ##### Qt on UNIX/Linux: uncomment the next two lines: - ELECTRIC_TARGET = electric-target-unix -@@ -20,11 +20,11 @@ - - ########################################################### USING MOTIF - ##### If using Motif (or OpenMotif/Lesstif), uncomment these five lines --GRAPH_FLAGS = @X_CFLAGS@ --GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11 --GRAPH_OBJS = $(GRAPH_OBJS_XT) --GRAPH_SRC = $(GRAPH_SRC_XT) --CCOMPILER = @PTHREAD_CC@ -+#GRAPH_FLAGS = @X_CFLAGS@ -+#GRAPH_LIBS = -lXm @XMULIB@ -lXt @XPLIB@ @XEXTLIB@ -lX11 -+#GRAPH_OBJS = $(GRAPH_OBJS_XT) -+#GRAPH_SRC = $(GRAPH_SRC_XT) -+#CCOMPILER = @PTHREAD_CC@ - - ##### For the general-purpose X facility, uncomment this line - XPOWER = -DANYDEPTH -@@ -997,9 +997,9 @@ - src/graph/graphqtdlg.o: src/graph/graphqtdlg.cpp $(HDS)/global.h src/graph/graphqtdlg.h $(HDS)/edialogs.h - src/graph/graphqtdraw.o: src/graph/graphqtdraw.cpp $(HDS)/global.h src/graph/graphqt.h $(HDS)/egraphics.h - src/graph/moc_graphqt.cpp: src/graph/graphqt.h $(HDS)/global.h -- moc src/graph/graphqt.h -o $@ -+ $(QTDIR)/bin/moc src/graph/graphqt.h -o $@ - src/graph/moc_graphqtdlg.cpp: src/graph/graphqtdlg.h $(HDS)/global.h -- moc src/graph/graphqtdlg.h -o $@ -+ $(QTDIR)/bin/moc src/graph/graphqtdlg.h -o $@ - $(JARLOC): $(JAVA_OBJS) - (cd src/java; jar -cf ../../$(JARLOC) com/sun/dbmirror/*.class) - lib/java/romgen.class: lib/java/romgen.java
