[med-svn] r14468 - in trunk/packages/xmedcon/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2013-08-19 12:37:54 +0000 (Mon, 19 Aug 2013)
New Revision: 14468

Added:
   trunk/packages/xmedcon/trunk/debian/patches/add_gtk_libraries_to_linker.patch
Modified:
   trunk/packages/xmedcon/trunk/debian/changelog
   trunk/packages/xmedcon/trunk/debian/patches/series
Log:
Solved build issue (thanks to Andreas Moog <amoog at ubuntu.com>)


Modified: trunk/packages/xmedcon/trunk/debian/changelog
===================================================================
--- trunk/packages/xmedcon/trunk/debian/changelog	2013-08-19 12:34:21 UTC (rev 14467)
+++ trunk/packages/xmedcon/trunk/debian/changelog	2013-08-19 12:37:54 UTC (rev 14468)
@@ -1,17 +1,5 @@
 xmedcon (0.13.0-1) UNRELEASED; urgency=low
 
-  * FIXME:
-     - needs checking the resulting package
-     - clarifying legal issue with ecat7 format (see debian/patches/legal-dummies.patch)
-     - when building with pdebuild I get
-       ...
-       /bin/bash ../libtool  --tag=CC   --mode=link gcc  -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security  -lm -Wl,-z,relro -o xmedcon xcolmap.o xcolgbc.o xdefs.o xicons.o xerror.o xextract.o xfancy.o xfiles.o xfilesel.o xhelp.o ximages.o xinfo.o xlabels.o xmedcon.o xmnuftry.o xoptions.o xpages.o xprogbar.o xreader.o xrender.o xreset.o xresize.o xreslice.o xtransf.o xutils.o xviewer.o xvifi.o xwriter.o xzoom.o libmdc.la 
-       libtool: link: gcc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wl,-z -Wl,relro -o .libs/xmedcon xcolmap.o xcolgbc.o xdefs.o xicons.o xerror.o xextract.o xfancy.o xfiles.o xfilesel.o xhelp.o ximages.o xinfo.o xlabels.o xmedcon.o xmnuftry.o xoptions.o xpages.o xprogbar.o xreader.o xrender.o xreset.o xresize.o xreslice.o xtransf.o xutils.o xviewer.o xvifi.o xwriter.o xzoom.o  -lm ./.libs/libmdc.so
-        /usr/bin/ld: xprogbar.o: undefined reference to symbol 'gtk_main_iteration'
-        /usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0: error adding symbols: DSO missing from command line
-        collect2: error: ld returned 1 exit status
-        ...
-        but plain debuild works fine
   * New upstream version
     Closes: #704438
   * debian/control:

Added: trunk/packages/xmedcon/trunk/debian/patches/add_gtk_libraries_to_linker.patch
===================================================================
--- trunk/packages/xmedcon/trunk/debian/patches/add_gtk_libraries_to_linker.patch	                        (rev 0)
+++ trunk/packages/xmedcon/trunk/debian/patches/add_gtk_libraries_to_linker.patch	2013-08-19 12:37:54 UTC (rev 14468)
@@ -0,0 +1,15 @@
+Author: Andreas Moog <amoog at ubuntu.com>
+LastChanged: Sun, 18 Aug 2013 10:27:50 +0200
+Description: Make sure gtk libraries are added to linker call
+
+--- a/source/Makefile.am
++++ b/source/Makefile.am
+@@ -91,7 +91,7 @@ $(APPICON_OBJ): $(APPICON_OBJ:.o=.rc)
+ xmedcon_LDADD = $(APPICON_OBJ) libmdc.la
+ xmedcon_LDFLAGS = -mwindows $(GDK_PIXBUF_LIBS) -lm
+ else
+-xmedcon_LDADD =  libmdc.la
++xmedcon_LDADD =  libmdc.la $(XMEDCON_GTK_LIBS)
+ xmedcon_LDFLAGS = $(GDK_PIXBUF_LIBS) -lm
+ endif
+ 

Modified: trunk/packages/xmedcon/trunk/debian/patches/series
===================================================================
--- trunk/packages/xmedcon/trunk/debian/patches/series	2013-08-19 12:34:21 UTC (rev 14467)
+++ trunk/packages/xmedcon/trunk/debian/patches/series	2013-08-19 12:37:54 UTC (rev 14468)
@@ -1,3 +1,4 @@
 man-spelling.patch
 code-spelling.patch
 avoid_linking_to_unneeded_libs.patch
+add_gtk_libraries_to_linker.patch