summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2007-01-05 06:45:54 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2007-01-05 06:45:54 +0000
commitaa5726bd7ab384f1261881ad2d1a35de7d189dc8 (patch)
tree30093bd19c9f748417baf2307dbfe65bf6a361f5 /dev-embedded/gpsim/files
parentStable for HPPA. (diff)
downloadhistorical-aa5726bd7ab384f1261881ad2d1a35de7d189dc8.tar.gz
historical-aa5726bd7ab384f1261881ad2d1a35de7d189dc8.tar.bz2
historical-aa5726bd7ab384f1261881ad2d1a35de7d189dc8.zip
Fix patch and autotools rebuilding, as reported also by Timothy Redaelli in bug #154280.
Package-Manager: portage-2.1.2_rc4-r5
Diffstat (limited to 'dev-embedded/gpsim/files')
-rw-r--r--dev-embedded/gpsim/files/gpsim-0.21.11-eXdbm.patch37
1 files changed, 27 insertions, 10 deletions
diff --git a/dev-embedded/gpsim/files/gpsim-0.21.11-eXdbm.patch b/dev-embedded/gpsim/files/gpsim-0.21.11-eXdbm.patch
index a4d19bd35739..dd080f6f5f0d 100644
--- a/dev-embedded/gpsim/files/gpsim-0.21.11-eXdbm.patch
+++ b/dev-embedded/gpsim/files/gpsim-0.21.11-eXdbm.patch
@@ -1,6 +1,8 @@
---- gpsim-0.21.11.orig/cli/Makefile.am 2005-04-27 10:55:13.000000000 +1000
-+++ gpsim-0.21.11/cli/Makefile.am 2006-11-04 14:00:26.000000000 +1100
-@@ -46,6 +46,7 @@
+Index: gpsim-0.21.11/cli/Makefile.am
+===================================================================
+--- gpsim-0.21.11.orig/cli/Makefile.am
++++ gpsim-0.21.11/cli/Makefile.am
+@@ -46,6 +46,7 @@ libgpsimcli_la_SOURCES = \
cmd_version.h misc.h cmd_disasm.h cmd_list.h cmd_quit.h \
cmd_stimulus.h cmd_x.h symbol_t.h cmd_frequency.h cmd_icd.h \
cmd_macro.h ui_gpsim.h
@@ -8,19 +10,23 @@
AM_YFLAGS = -dvt
---- gpsim-0.21.11.orig/gui/Makefile.am 2005-09-19 23:54:21.000000000 +1000
-+++ gpsim-0.21.11/gui/Makefile.am 2006-11-04 14:02:02.000000000 +1100
-@@ -17,6 +17,7 @@
+Index: gpsim-0.21.11/gui/Makefile.am
+===================================================================
+--- gpsim-0.21.11.orig/gui/Makefile.am
++++ gpsim-0.21.11/gui/Makefile.am
+@@ -17,6 +17,7 @@ libgpsimgui_la_SOURCES = gui_break.cc g
preferences.cc preferences.h \
settings.h settings_exdbm.h
-+libgpsimgui_la_LDADD = ../eXdbm/libgpsim_eXdbm.la
++libgpsimgui_la_LIBADD = ../eXdbm/libgpsim_eXdbm.la
libgpsimgui_la_LDFLAGS = @X_LDFLAGS@ @Y_LDFLAGS@
pixmapdir = $(datadir)/gpsim
---- gpsim-0.21.11/gpsim/Makefile.am.orig 2006-11-04 14:57:41.000000000 +1100
-+++ gpsim-0.21.11/gpsim/Makefile.am 2006-11-04 14:58:03.000000000 +1100
-@@ -9,6 +9,6 @@
+Index: gpsim-0.21.11/gpsim/Makefile.am
+===================================================================
+--- gpsim-0.21.11.orig/gpsim/Makefile.am
++++ gpsim-0.21.11/gpsim/Makefile.am
+@@ -9,6 +9,6 @@ bin_PROGRAMS = gpsim
gpsim_SOURCES = main.cc
gpsim_LDFLAGS = $(shell gtk-config --cflags)
@@ -29,3 +35,14 @@
+gpsim_LDADD = ../src/libgpsim.la ../eXdbm/libgpsim_eXdbm.la ../cli/libgpsimcli.la ../gui/libgpsimgui.la \
+ @GTK@ @GDK@ @GLIB@ -lstdc++ -lpopt \
@X_LDFLAGS@ @Y_LDFLAGS@ @LIBREADLINE@
+Index: gpsim-0.21.11/Makefile.am
+===================================================================
+--- gpsim-0.21.11.orig/Makefile.am
++++ gpsim-0.21.11/Makefile.am
+@@ -1,5 +1,5 @@
+
+-SUBDIRS = cli xpms eXdbm gui src gpsim modules examples doc
++SUBDIRS = eXdbm cli xpms gui src gpsim modules examples doc
+
+ dist-hook:
+ cp gpsim.spec $(distdir)