Re: [trinity-devel] Need debian help - what fixed: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707417
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.
Darrell
In article 20140116010703.1C0876015C@smtp.hushmail.com, Darrell Anderson trinity-devel@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@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
On 01/15/2014 07:07 PM, Darrell Anderson 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.
Darrell
Darrell, Nick
Thanks. I don't know how I build without those patches, but it does build (well, I cheated.... ln -s /usr/include/libxml2/libxml /usr/include/libxml) I think I found the issue. The wv2 CMakeLists.txt sets:
IF( LIBGSF_FOUND ) SET( _WV2_LDFLAGS ${_WV2_LDFLAGS} ${LIBGSF_LIBRARIES} ) SET( _WV2_CFLAGS ${_WV2_CFLAGS} ${LIBGSF_INCLUDE_DIR} ) ENDIF( LIBGSF_FOUND )
So the directory the cmake file includes is ${LIBGSF_INCLUDE_DIR}. However, that is the wrong directory if I read the cache file correctly:
18:22 phoinix:/dat_e/tde/tstbld/wv2> grep -i include src/build/CMakeCache.txt <snip> //ADVANCED property for variable: LIBGSF_INCLUDE_DIR LIBGSF_INCLUDE_DIR-ADVANCED:INTERNAL=1 PC_LIBGSF_CFLAGS:INTERNAL=-I/usr/include/libgsf-1;-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include;-I/usr/include/libxml2 PC_LIBGSF_INCLUDEDIR:INTERNAL=/usr/include PC_LIBGSF_INCLUDE_DIRS:INTERNAL=/usr/include/libgsf-1;/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/include/libxml2 PC_LIBGSF_STATIC_CFLAGS:INTERNAL=-I/usr/include/libgsf-1;-I/usr/include/glib-2.0;-I/usr/lib/glib-2.0/include;-I/usr/include/libxml2 PC_LIBGSF_STATIC_INCLUDE_DIRS:INTERNAL=/usr/include/libgsf-1;/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/include/libxml2 PC_LIBGSF_libgsf-1_INCLUDEDIR:INTERNAL=
It just looks like cmake isn't getting the PC_LIBGSF_INCLUDE_DIRS or the PC_LIBGSF_CFLAGS information into the actual make. It is almost like I need:
SET( _WV2_CFLAGS ${_WV2_CFLAGS} ${PC_LIBGSF_INCLUDE_DIRS} )
but I know the correct way is to find where SET( _WV2_CFLAGS ${_WV2_CFLAGS} ${LIBGSF_INCLUDE_DIR} ) is supposed to include that information and fix it. Grr.. It's like reading Greek...
-
Darrell Anderson -
David C. Rankin -
Nick Leverton