Package: therion
Version: 5.3.3-1
Tags: patch
In Ubuntu, we've applied the attached patch to achieve the following:
* loch/Makefile: Add -lpng12 -ljpeg -lX11 for binutils-gold,
fixes FTBFS
We thought you might be interested in doing the same.
Build-log error:
c++ -c -Wall -D_GNU_SOURCE -DLOCH -DLXLINUX
-I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6
-DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES
-DNO_GCC_PRAGMA -Wno-deprecated -fno-strict-aliasing
-I/usr/include/freetype2 -I/usr/include/vtk-5.4 -O2 -o lxGLC.o lxGLC.cxx
c++ -c -Wall -D_GNU_SOURCE -DLOCH -DLXLINUX
-I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6
-DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES
-DNO_GCC_PRAGMA -Wno-deprecated -fno-strict-aliasing
-I/usr/include/freetype2 -I/usr/include/vtk-5.4 -O2 -o lxOptDlg.o
lxOptDlg.cxx
c++ -c -Wall -D_GNU_SOURCE -DLOCH -DLXLINUX
-I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6
-DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES
-DNO_GCC_PRAGMA -Wno-deprecated -fno-strict-aliasing
-I/usr/include/freetype2 -I/usr/include/vtk-5.4 -O2 -o lxAboutDlg.o
lxAboutDlg.cxx
gcc -c -Wall -D_GNU_SOURCE -DLOCH -DLXLINUX
-I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6
-DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES
-DNO_GCC_PRAGMA -O2 -o img.o img.c
img.c: In function 'img_read_item':
img.c:1050:8: warning: ignoring return value of 'fgets', declared with
attribute warn_unused_result
c++ -o loch -Wall lxR2P.o lxTR.o lxOGLFT.o lxSetup.o lxRender.o lxWX.o
lxImgIO.o lxLRUD.o lxFile.o lxSTree.o lxData.o lxMath.o lxSView.o
lxSScene.o lxGUI.o lxGLC.o lxOptDlg.o lxAboutDlg.o img.o
-lwx_gtk2u_gl-2.6 -pthread -Wl,-Bsymbolic-functions -lwx_gtk2u_xrc-2.6
-lwx_gtk2u_qa-2.6 -lwx_gtk2u_html-2.6 -lwx_gtk2u_adv-2.6
-lwx_gtk2u_core-2.6 -lwx_baseu_xml-2.6 -lwx_baseu_net-2.6 -lwx_baseu-2.6
-lvtkHybrid -lvtkImaging -lvtkIO -lvtkGraphics -lvtkFiltering
-lvtkCommon -lfreetype -lGLU -lpthread -lz
/usr/bin/ld: lxRender.o: undefined reference to symbol
'png_write_row@@PNG12_0'
/usr/bin/ld: note: 'png_write_row@@PNG12_0' is defined in
DSO /lib/libpng12.so.0 so try adding it to the linker command line
/lib/libpng12.so.0: could not read symbols: Invalid operation
collect2: ld returned 1 exit status
--
Roy Jamison (xteejx)
Ubuntu Bug Squad
Ubuntu Bug Control
www.ubuntu.com
diff -Nru therion-5.3.3/debian/changelog therion-5.3.3/debian/changelog
--- therion-5.3.3/debian/changelog 2010-06-06 23:51:31.000000000 +0100
+++ therion-5.3.3/debian/changelog 2010-11-03 23:21:23.000000000 +0000
@@ -1,3 +1,10 @@
+therion (5.3.3-1ubuntu1) natty; urgency=low
+
+ * loch/Makefile: Add -lpng12 -ljpeg -lX11 for binutils-gold,
+ fixes (LP: #670686)
+
+ -- Roy Jamison <[email protected]> Wed, 03 Nov 2010 23:19:24 +0000
+
therion (5.3.3-1) unstable; urgency=low
* New upstream release.
diff -Nru therion-5.3.3/debian/control therion-5.3.3/debian/control
--- therion-5.3.3/debian/control 2010-07-20 18:47:18.000000000 +0100
+++ therion-5.3.3/debian/control 2010-11-03 23:21:47.000000000 +0000
@@ -1,7 +1,8 @@
Source: therion
Section: science
Priority: extra
-Maintainer: Wookey <[email protected]>
+Maintainer: Ubuntu Developers <[email protected]>
+XSBC-Original-Maintainer: Wookey <[email protected]>
Build-Depends: debhelper (>= 7.0.50~), perl (>= 5.5), docbook-to-man, texlive-base, texlive-metapost, tcl8.5 | tclsh, libvtk5-dev, libwxgtk2.6-dev, libfreetype6-dev, libjpeg62-dev, libpng12-dev, imagemagick, ghostscript
Standards-Version: 3.8.4
diff -Nru therion-5.3.3/debian/patches/99-binutils-gold.patch therion-5.3.3/debian/patches/99-binutils-gold.patch
--- therion-5.3.3/debian/patches/99-binutils-gold.patch 1970-01-01 01:00:00.000000000 +0100
+++ therion-5.3.3/debian/patches/99-binutils-gold.patch 2010-11-03 23:19:05.000000000 +0000
@@ -0,0 +1,14 @@
+Description: Add -lpng12 -ljpeg -lX11 to loch/Makefile for binutils-gold
+Author: Roy Jamison <[email protected]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/therion/+bug/670686
+--- therion-5.3.3.orig/loch/Makefile 2010-11-03 23:15:40.881547622 +0000
++++ therion-5.3.3/loch/Makefile 2010-11-03 23:16:23.000000000 +0000
+@@ -19,7 +19,7 @@
+ CXXPFLAGS = -DLXLINUX $(shell wx-config --cxxflags) -Wno-deprecated -fno-strict-aliasing $(shell freetype-config --cflags) -I$(VTKPATH)
+ CCPFLAGS = -DLXLINUX $(shell wx-config --cflags)
+ LXLIBDIR = linux
+-PLIBS = $(shell wx-config --libs --gl-libs) $(VTKLIBS) -lGLU -lpthread -lz
++PLIBS = $(shell wx-config --libs --gl-libs) $(VTKLIBS) -lGLU -lpthread -lz -lpng12 -ljpeg -lX11
+ LXPLATFORM = LINUX
+
+ ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
diff -Nru therion-5.3.3/debian/patches/series therion-5.3.3/debian/patches/series
--- therion-5.3.3/debian/patches/series 2010-07-20 18:51:52.000000000 +0100
+++ therion-5.3.3/debian/patches/series 2010-11-03 23:15:31.000000000 +0000
@@ -7,3 +7,4 @@
82-nolang-segfault-fix.patch
92loch-fixes.patch
debian-changes-5.3.3-1
+99-binutils-gold.patch
