tags 707456 patch thanks Hi,
I plan doing an NMU using the attached patch after the Perl transition is over and dependencies are installable again. Cheers, Balint On 05/09/2013 10:12 AM, Lucas Nussbaum wrote: > Source: orbit2 > Version: 1:2.14.19-0.1 > Severity: serious > Tags: jessie sid > User: debian...@lists.debian.org > Usertags: qa-ftbfs-20130509 qa-ftbfs > Justification: FTBFS on amd64 > > Hi, > > During a rebuild of all packages in sid, your package failed to build on > amd64. > > Relevant part: >> /bin/bash ../../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. >> -I../.. -I../../linc2/include -I../../linc2/include -pthread >> -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -Wall >> -Wunused -Wmissing-prototypes -Wmissing-declarations -DG_DISABLE_DEPRECATED >> -D_GNU_SOURCE -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector >> --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall >> -Werror-implicit-function-declaration -c -o linc.lo linc.c >> libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../.. -I../../linc2/include >> -I../../linc2/include -pthread -I/usr/include/glib-2.0 >> -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -Wall -Wunused >> -Wmissing-prototypes -Wmissing-declarations -DG_DISABLE_DEPRECATED >> -D_GNU_SOURCE -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector >> --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall >> -Werror-implicit-function-declaration -c linc.c -fPIC -DPIC -o .libs/linc.o >> linc.c: In function 'link_init': >> linc.c:199:2: error: implicit declaration of function 'g_thread_supported' >> [-Werror=implicit-function-declaration] >> linc.c:200:3: error: implicit declaration of function 'g_thread_init' >> [-Werror=implicit-function-declaration] >> linc.c:204:2: warning: 'g_type_init' is deprecated (declared at >> /usr/include/glib-2.0/gobject/gtype.h:669) [-Wdeprecated-declarations] >> linc.c:262:3: error: implicit declaration of function 'g_cond_new' >> [-Werror=implicit-function-declaration] >> linc.c:262:18: warning: assignment makes pointer from integer without a cast >> [enabled by default] >> linc.c:263:23: warning: assignment makes pointer from integer without a cast >> [enabled by default] >> linc.c: In function 'link_mutex_new': >> linc.c:324:3: error: implicit declaration of function 'g_mutex_new' >> [-Werror=implicit-function-declaration] >> linc.c:324:3: warning: return makes pointer from integer without a cast >> [enabled by default] >> linc.c: In function 'link_exec_set_io_thread': >> linc.c:463:3: error: implicit declaration of function 'g_thread_create_full' >> [-Werror=implicit-function-declaration] >> linc.c:464:4: error: 'G_THREAD_PRIORITY_NORMAL' undeclared (first use in >> this function) >> linc.c:464:4: note: each undeclared identifier is reported only once for >> each function it appears in >> linc.c: In function 'link_mainloop_handle_input': >> linc.c:94:7: warning: ignoring return value of 'read', declared with >> attribute warn_unused_result [-Wunused-result] >> cc1: some warnings being treated as errors >> make[4]: *** [linc.lo] Error 1 > > The full build log is available from: > > http://people.debian.org/~lucas/logs/2013/05/09/orbit2_2.14.19-0.1_unstable.log > > A list of current common problems and possible solutions is available at > http://wiki.debian.org/qa.debian.org/FTBFS . You're welcome to contribute! > > About the archive rebuild: The rebuild was done on EC2 VM instances from > Amazon Web Services, using a clean, minimal and up-to-date chroot. Every > failed build was retried once to eliminate random failures. > > >
diff -u orbit2-2.14.19/debian/liborbit2.install orbit2-2.14.19/debian/liborbit2.install
--- orbit2-2.14.19/debian/liborbit2.install
+++ orbit2-2.14.19/debian/liborbit2.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/lib*.so.*
-debian/tmp/usr/lib/orbit-2.0/Everything_module.so
+debian/tmp/usr/lib/*/lib*.so.*
+debian/tmp/usr/lib/*/orbit-2.0/Everything_module.so
diff -u orbit2-2.14.19/debian/liborbit2-dev.install orbit2-2.14.19/debian/liborbit2-dev.install
--- orbit2-2.14.19/debian/liborbit2-dev.install
+++ orbit2-2.14.19/debian/liborbit2-dev.install
@@ -3,10 +3,8 @@
debian/tmp/usr/share/idl/orbit-2.0
debian/tmp/usr/share/doc/liborbit2-dev/ORBit2
-debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/*.la
-debian/tmp/usr/lib/*.a
-debian/tmp/usr/lib/orbit-2.0/Everything_module.la
-debian/tmp/usr/lib/orbit-2.0/Everything_module.a
-debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/*/*.so
+debian/tmp/usr/lib/*/*.a
+debian/tmp/usr/lib/*/orbit-2.0/Everything_module.a
+debian/tmp/usr/lib/*/pkgconfig
debian/tmp/usr/bin/orbit2-config
debian/tmp/usr/bin/orbit-idl-2
diff -u orbit2-2.14.19/debian/control orbit2-2.14.19/debian/control
--- orbit2-2.14.19/debian/control
+++ orbit2-2.14.19/debian/control
@@ -3,11 +3,13 @@
Priority: optional
Maintainer: Sebastian Rittau <srit...@debian.org>
Standards-Version: 3.8.3
-Build-Depends: libglib2.0-dev (>= 2.8.0), libidl-dev (>= 0.8.10), pkg-config (>= 0.20), cdbs, debhelper (>= 7.0.0), docbook-xsl, gtk-doc-tools (>= 1.6-2), autotools-dev, dh-autoreconf
+Build-Depends: libglib2.0-dev (>= 2.8.0), libidl-dev (>= 0.8.10), pkg-config (>= 0.20), cdbs (>= 0.4.93), debhelper (>= 8.1.3), docbook-xsl, gtk-doc-tools (>= 1.6-2), autotools-dev, dh-autoreconf
Package: liborbit2
Architecture: any
+Multi-Arch: same
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: liborbit2-dev (<< 2.8.1-1)
Conflicts: liborbit2-dev (<< 2.8.1-1), liblinc1 (<< 1.0.3-4), libbonobo-activation4 (<< 1:2.4.0)
@@ -26,6 +28,7 @@
Architecture: any
Section: devel
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: foreign
Description: a CORBA ORB
ORBit2 is a high-performance CORBA (Common Object Request Broker
Architecture) ORB (Object Request Broker). It allows programs to send
@@ -41,6 +44,7 @@
Architecture: any
Section: devel
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: foreign
Description: a CORBA name server
ORBit2 is a high-performance CORBA (Common Object Request Broker
Architecture) ORB (Object Request Broker). It allows programs to send
diff -u orbit2-2.14.19/debian/changelog orbit2-2.14.19/debian/changelog
--- orbit2-2.14.19/debian/changelog
+++ orbit2-2.14.19/debian/changelog
@@ -1,3 +1,26 @@
+orbit2 (1:2.14.19-0.2) unstable; urgency=low
+
+ [Balint Reczey]
+ * Non-maintainer upload.
+ * incorporating patches from Ubuntu to fix build failures
+
+ [Sebastien Bacher]
+ * debian/patches/git_new_autotools_build.patch:
+ - fix the build with the new automake version
+ * debian/patches/glib_no_deprecations.patch: turn off glib deprecations,
+ to fix the build with the current version
+
+ [ Riku Voipio ]
+ * Multiarchize. Closes: #641615.
+
+ [ Steve Langasek ]
+ * Remove .la files from the package, as they're no longer needed.
+ * debian/patches/pre-multiarch-compatibility.patch: Support pre-
+ multiarch directory as a compatibility fallback. Closes: #641615,
+ LP: #977966.
+
+ -- Balint Reczey <bal...@balintreczey.hu> Tue, 27 Aug 2013 18:32:04 +0200
+
orbit2 (1:2.14.19-0.1) unstable; urgency=low
* Non-maintainer upload, for the GNOME 3 transition.
diff -u orbit2-2.14.19/debian/rules orbit2-2.14.19/debian/rules
--- orbit2-2.14.19/debian/rules
+++ orbit2-2.14.19/debian/rules
@@ -13,7 +13,7 @@
DEB_DH_MAKESHLIBS_ARGS_liborbit2 := -V 'liborbit2 $(shlibver)'
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-purify --enable-gtk-doc --with-html-dir=/usr/share/doc/liborbit2-dev
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-purify --enable-gtk-doc --with-html-dir=/usr/share/doc/liborbit2-dev --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
#
# Man page generation (from Docbook source)
@@ -33 +33 @@
- sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
+ rm `find debian/tmp -name '*.la'`
only in patch2:
unchanged:
--- orbit2-2.14.19.orig/debian/patches/git_new_autotools_build.patch
+++ orbit2-2.14.19/debian/patches/git_new_autotools_build.patch
@@ -0,0 +1,30 @@
+From d91dbb42dc3b6073720027f68827acd0abee6d75 Mon Sep 17 00:00:00 2001
+From: Kjartan Maraas <kmar...@gnome.org>
+Date: Tue, 14 May 2013 11:29:53 +0000
+Subject: Use AM_CPPFLAGS instead of INCLUDES and fix problem using
+
+---
+diff --git a/test/everything/Makefile.am b/test/everything/Makefile.am
+index 32beb36..cb4b1d6 100644
+--- a/test/everything/Makefile.am
++++ b/test/everything/Makefile.am
+@@ -10,7 +10,7 @@ EVERYTHING_IDLOUT = \
+ $(EVERYTHING_BUILT) \
+ everything-imodule.c
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
+ -I$(top_builddir)/src \
+@@ -78,7 +78,7 @@ include $(top_srcdir)/Makefile.shared
+ BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c
+ CLEANFILES = ${BUILT_SOURCES} iorfile
+
+-TESTS = $(srcdir)/test.sh
++TESTS = $(top_builddir)/test/everything/test.sh
+
+ EXTRA_DIST = $(IDL_FILES) test.sh $(included_src)
+
+--
+cgit v0.9.2
only in patch2:
unchanged:
--- orbit2-2.14.19.orig/debian/patches/glib_no_deprecations.patch
+++ orbit2-2.14.19/debian/patches/glib_no_deprecations.patch
@@ -0,0 +1,13 @@
+diff -Nur orbit2-2.14.19/linc2/src/Makefile.am orbit2-2.14.19.build/linc2/src/Makefile.am
+--- orbit2-2.14.19/linc2/src/Makefile.am 2010-02-09 13:05:35.000000000 +0100
++++ orbit2-2.14.19.build/linc2/src/Makefile.am 2013-04-02 16:51:33.434373357 +0200
+@@ -12,8 +12,7 @@
+ -I$(top_builddir)/linc2/include \
+ -I$(top_srcdir)/linc2/include \
+ $(LINC_CFLAGS) \
+- $(WARN_CFLAGS) \
+- -DG_DISABLE_DEPRECATED
++ $(WARN_CFLAGS)
+
+ if OS_WIN32
+ else
only in patch2:
unchanged:
--- orbit2-2.14.19.orig/debian/patches/pre-multiarch-compatibility.patch
+++ orbit2-2.14.19/debian/patches/pre-multiarch-compatibility.patch
@@ -0,0 +1,16 @@
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+Description: Support pre-multiarch directory as a compatibility fallback
+Bug-Debian: http://bugs.debian.org/641615
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/977966
+
+diff -Nur -x '*.orig' -x '*~' trunk/src/orb/orb-core/orbit-typelib.c trunk.new/src/orb/orb-core/orbit-typelib.c
+--- trunk/src/orb/orb-core/orbit-typelib.c 2012-04-18 20:39:57.000000000 +0000
++++ trunk.new/src/orb/orb-core/orbit-typelib.c 2012-04-20 23:27:57.969753251 +0000
+@@ -218,6 +218,7 @@
+ paths = g_ptr_array_sized_new (8);
+
+ g_ptr_array_add (paths, g_strdup (ORBIT_TYPELIB_DIR));
++ g_ptr_array_add (paths, g_strdup ("/usr/lib/orbit-2.0"));
+
+ if ((path = g_getenv ("ORBIT_TYPELIB_PATH"))) {
+ char **strv;
signature.asc
Description: OpenPGP digital signature
