In article <20140116010703.1C0876015C(a)smtp.hushmail.com>om>,
Darrell Anderson <trinity-devel(a)lists.pearsoncomputing.net> wrote:
-=-=-=-=-=-
Debian fixed a bug with wv2 I need to patch/fix
for tde. The bug
was:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707417
How in the heck do you find out what debian did?
I have never figured out how to find patches mentioned in Debian
bug reports. I'm sure there is a method to their madness.
Attached are two patches I use to build wv2. The patches only allow
me to build wv2. I have no way of knowing whether wv2 is actually
providing kword the necessary support because wv2 has been
unsupported for a long time. Probably should be Yet Another Bug
Report.
[patch snippage]
The debdiff between wv2_0.4.2.dfsg.1-9.1 and wv2_0.4.2.dfsg.1-10 is as
follows, if it is useful (sorry it's inline, trn doesn't do MIME ;-))
Nick
diff -Nru wv2-0.4.2.dfsg.1/debian/changelog wv2-0.4.2.dfsg.1/debian/changelog
--- wv2-0.4.2.dfsg.1/debian/changelog 2012-08-26 14:21:08.000000000 +0100
+++ wv2-0.4.2.dfsg.1/debian/changelog 2013-05-10 01:33:40.000000000 +0100
@@ -1,3 +1,12 @@
+wv2 (0.4.2.dfsg.1-10) unstable; urgency=low
+
+ * Fix to use -I options from libgsf's pkg-config so libxml headers are
+ found. (Closes: #707417)
+ * Honour DEB_BUILD_OPTIONS nocheck in debian/rules. (Closes: #685920)
+ * Fix double "-l" in output from wv2-config --libs. (LP: #1017413)
+
+ -- Olly Betts <olly(a)survex.com> Fri, 10 May 2013 12:06:41 +1200
+
wv2 (0.4.2.dfsg.1-9.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru wv2-0.4.2.dfsg.1/debian/patches/fix-ftbfs-with-gold.patch
wv2-0.4.2.dfsg.1/debian/patches/fix-ftbfs-with-gold.patch
--- wv2-0.4.2.dfsg.1/debian/patches/fix-ftbfs-with-gold.patch 2011-11-30
14:26:19.000000000 +0000
+++ wv2-0.4.2.dfsg.1/debian/patches/fix-ftbfs-with-gold.patch 2013-05-10
01:30:46.000000000 +0100
@@ -5,7 +5,7 @@
Origin: debian
Bug-Debian:
http://bugs.debian.org/556686
Forwarded: no
-Last-Update: 2011-11-30
+Last-Update: 2013-05-10
diff -ru wv2-0.4.2.dfsg.1.orig/CMakeLists.txt wv2-0.4.2.dfsg.1/CMakeLists.txt
--- wv2-0.4.2.dfsg.1.orig/CMakeLists.txt 2009-11-01 07:22:43.000000000 +1300
@@ -14,7 +14,7 @@
ENDIF( ICONV_FOUND )
IF( GLIB2_FOUND )
-+ SET( GLIB2_LIBRARIES ${GLIB2_LIBRARIES} -lgobject-2.0 )
++ SET( GLIB2_LIBRARIES ${GLIB2_LIBRARIES} gobject-2.0 )
SET( _WV2_LDFLAGS ${_WV2_LDFLAGS} ${GLIB2_LIBRARIES} )
SET( _WV2_CFLAGS ${_WV2_CFLAGS} ${GLIB2_INCLUDE_DIR} )
ENDIF( GLIB2_FOUND )
diff -Nru wv2-0.4.2.dfsg.1/debian/rules wv2-0.4.2.dfsg.1/debian/rules
--- wv2-0.4.2.dfsg.1/debian/rules 2012-03-25 05:07:57.000000000 +0100
+++ wv2-0.4.2.dfsg.1/debian/rules 2013-05-10 01:39:16.000000000 +0100
@@ -1,5 +1,9 @@
#!/usr/bin/make -f
+# Upstream build system seems to just ignore these, and as a result, libgsf
+# fails to find libxml headers (see #707417).
+CPPFLAGS += $(shell pkg-config libgsf-1 --cflags)
+
# Cmake doesn't use CPPFLAGS by default.
CFLAGS += $(CPPFLAGS)
CXXFLAGS += $(CPPFLAGS)
@@ -16,6 +20,7 @@
override_dh_auto_test:
dh_auto_test
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
cp tests/*.doc obj-*/tests
cd obj-*/tests ; for t in *test ; do \
echo "Running test $$t" ;\
@@ -25,3 +30,4 @@
set -e ; ./$$t ;\
fi \
done
+endif
--
"The Internet, a sort of ersatz counterfeit of real life"
-- Janet Street-Porter, BBC2, 19th March 1996