| 1 |
tomjbe 10/05/30 15:14:36 |
| 2 |
|
| 3 |
Added: gwave-20090213-as-needed.patch |
| 4 |
Log: |
| 5 |
Fix for bug #248351 |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-electronics/gwave/files/gwave-20090213-as-needed.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/gwave/files/gwave-20090213-as-needed.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/gwave/files/gwave-20090213-as-needed.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: gwave-20090213-as-needed.patch |
| 15 |
=================================================================== |
| 16 |
--- gwave2-20090213.orig/src/Makefile.am 2008-01-22 05:36:59.000000000 +0100 |
| 17 |
+++ gwave2-20090213/src/Makefile.am 2010-02-06 18:10:38.011218381 +0100 |
| 18 |
@@ -15,8 +15,7 @@ |
| 19 |
rgeval.c xgserver.c measurebtn.c measurebtn.h \ |
| 20 |
GtkTable_indel.c GtkTable_indel.h xsnarf.h |
| 21 |
|
| 22 |
-gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ @GUILE_GNOME_LIBS@ |
| 23 |
-gwave_LDFLAGS = @GUILE_LDFLAGS@ |
| 24 |
+gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ @GUILE_GNOME_LIBS@ @GUILE_LDFLAGS@ |
| 25 |
|
| 26 |
AM_CFLAGS = @GTK_CFLAGS@ @GUILE_CFLAGS@ @GUILE_GNOME_CFLAGS@ \ |
| 27 |
-DDATADIR=\"$(datadir)\" -DBINGWAVE=\"$(bindir)/gwave\" |
| 28 |
--- gwave2-20090213.orig/spicefile/Makefile.am 2008-01-22 05:31:45.000000000 +0100 |
| 29 |
+++ gwave2-20090213/spicefile/Makefile.am 2010-02-06 18:11:53.008964326 +0100 |
| 30 |
@@ -10,11 +10,9 @@ |
| 31 |
|
| 32 |
noinst_PROGRAMS = test_read |
| 33 |
test_read_SOURCES = test_read.c |
| 34 |
-test_read_LDFLAGS = @GTK_LIBS@ |
| 35 |
-test_read_LDADD = libspicefile.a |
| 36 |
+test_read_LDADD = libspicefile.a @GTK_LIBS@ |
| 37 |
|
| 38 |
bin_PROGRAMS=sp2sp |
| 39 |
sp2sp_SOURCES=sp2sp.c |
| 40 |
-sp2sp_LDFLAGS= @GTK_LIBS@ |
| 41 |
-sp2sp_LDADD= libspicefile.a |
| 42 |
+sp2sp_LDADD= libspicefile.a @GTK_LIBS@ |
| 43 |
|
| 44 |
--- gwave2-20090213.orig/configure.ac 2009-02-13 06:00:57.000000000 +0100 |
| 45 |
+++ gwave2-20090213/configure.ac 2010-02-06 18:23:11.522964311 +0100 |
| 46 |
@@ -84,7 +84,8 @@ |
| 47 |
dnl GUILE_MODULE_REQUIRED(gnome gtk) |
| 48 |
|
| 49 |
PKG_CHECK_MODULES(GUILE_GNOME, guile-gnome-gtk-2, ,AC_MSG_ERROR(Can not find Guile-gnome-platform)) |
| 50 |
- |
| 51 |
+PKG_CHECK_MODULES([X11], [x11]) |
| 52 |
+PKG_CHECK_MODULES([GLIB], [glib-2.0]) |
| 53 |
dnl remind myself how to check for somthing I know exists |
| 54 |
dnl GUILE_MODULE_EXPORTS(foo_widget_show, (gnome-0)(gnome gtk),gtk-widget-show) |
| 55 |
dnl if test "$foo_widget_show" = yes; then |
| 56 |
--- gwave2-20090213.orig/remote/Makefile.am 2010-02-06 18:33:14.340215309 +0100 |
| 57 |
+++ gwave2-20090213/remote/Makefile.am 2010-02-06 18:34:19.810967947 +0100 |
| 58 |
@@ -4,7 +4,9 @@ |
| 59 |
AM_CFLAGS = @GTK_CFLAGS@ |
| 60 |
bin_PROGRAMS=gwave-exec gwaverepl |
| 61 |
gwave_exec_SOURCES=gwave-exec.c xgclient.c xgexec.h |
| 62 |
-gwave_exec_LDADD= @GTK_LIBS@ |
| 63 |
+gwave_exec_CFLAGS= @X11_CFLAGS@ |
| 64 |
+gwave_exec_LDADD= @GTK_LIBS@ @X11_LIBS@ |
| 65 |
|
| 66 |
gwaverepl_SOURCES=gwaverepl.c xgclient.c xgexec.h repllib.c |
| 67 |
-gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@ |
| 68 |
+gwaverepl_CFLAGS= @X11_CFLAGS@ @GLIB_CFLAGS@ |
| 69 |
+gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@ @X11_LIBS@ @GLIB_LIBS@ |
Archives