Lucas Nussbaum <[EMAIL PROTECTED]> (29/09/2007): > Justification: FTBFS on i386
Hi. Please find attached a patch, which isn't sufficient since: | i486-linux-gnu-g++ -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"gtkmm\" -I../../gtk -I../../gtk -I../../pango -I../../pango -I../../atk -I../../atk -I../../gdk -I../../gdk -I../../gtk -I../../gtk -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/cairomm-1.0 -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/gtk-unix-print-2.0 -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -g -O2 -MT toolbar.lo -MD -MP -MF .deps/toolbar.Tpo -c toolbar.cc -fPIC -DPIC -o .libs/toolbar.o | toolbar.cc: In member function 'Gtk::Tooltips* Gtk::Toolbar::get_tooltips_object() const': | toolbar.cc:569: error: 'const struct _GtkToolbar' has no member named 'tooltips' | make[6]: *** [toolbar.lo] Error 1 | make[6]: Leaving directory `/tmp/buildd/gtkmm2.4-2.10.10/gtk/gtkmm' | make[5]: *** [all-recursive] Error 1 | make[5]: Leaving directory `/tmp/buildd/gtkmm2.4-2.10.10/gtk/gtkmm' | make[4]: *** [all-recursive] Error 1 | make[4]: Leaving directory `/tmp/buildd/gtkmm2.4-2.10.10/gtk' | make[3]: *** [all] Error 2 | make[3]: Leaving directory `/tmp/buildd/gtkmm2.4-2.10.10/gtk' | make[2]: *** [all-recursive] Error 1 | make[2]: Leaving directory `/tmp/buildd/gtkmm2.4-2.10.10' | make[1]: *** [all] Error 2 | make[1]: Leaving directory `/tmp/buildd/gtkmm2.4-2.10.10' | make: *** [build-stamp] Error 2 | pbuilder: Failed autobuilding of package But hopefully that'll give you some hints on what has to be done on this package. Cheers, -- Cyril Brulebois
diff -u gtkmm2.4-2.10.10/scripts/config.sub gtkmm2.4-2.10.10/scripts/config.sub
--- gtkmm2.4-2.10.10/scripts/config.sub
+++ gtkmm2.4-2.10.10/scripts/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-01-18'
+timestamp='2007-06-28'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -475,8 +475,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -683,6 +683,10 @@
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
diff -u gtkmm2.4-2.10.10/scripts/config.guess gtkmm2.4-2.10.10/scripts/config.guess
--- gtkmm2.4-2.10.10/scripts/config.guess
+++ gtkmm2.4-2.10.10/scripts/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-03-06'
+timestamp='2007-07-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -330,7 +330,7 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -793,7 +793,7 @@
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
- x86)
+ x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
diff -u gtkmm2.4-2.10.10/configure gtkmm2.4-2.10.10/configure
--- gtkmm2.4-2.10.10/configure
+++ gtkmm2.4-2.10.10/configure
@@ -21764,9 +21764,7 @@
DISABLE_DEPRECATED_CFLAGS="\
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
--DGTK_DISABLE_DEPRECATED \
--DGDK_PIXBUF_DISABLE_DEPRECATED \
--DGNOME_DISABLE_DEPRECATED"
+-DGDK_PIXBUF_DISABLE_DEPRECATED"
fi
diff -u gtkmm2.4-2.10.10/debian/rules gtkmm2.4-2.10.10/debian/rules
--- gtkmm2.4-2.10.10/debian/rules
+++ gtkmm2.4-2.10.10/debian/rules
@@ -53,9 +53,9 @@
rm -f build-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) -C demos distclean
- -$(MAKE) -C examples distclean
- -$(MAKE) distclean
+ [ ! -f demos/Makefile ] || $(MAKE) -C demos distclean
+ [ ! -f examples/Makefile ] || $(MAKE) -C examples distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub scripts/config.sub
endif
diff -u gtkmm2.4-2.10.10/debian/changelog gtkmm2.4-2.10.10/debian/changelog
--- gtkmm2.4-2.10.10/debian/changelog
+++ gtkmm2.4-2.10.10/debian/changelog
@@ -1,3 +1,18 @@
+gtkmm2.4 (1:2.10.10-0.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove â-DGTK_DISABLE_DEPRECATEDâ and â-DGNOME_DISABLE_DEPRECATEDâ from
+ the DEPRECATION_FLAGS variable in configure{,.in} to avoid FTBFS due to
+ the transition to Gtk 2.12 (Closes: #444516). Also comment the
+ â#define GTK_DISABLE_DEPRECATEDâ line in the following files accordingly:
+ - gtk/gtkmm/toolbar.cc
+ - gtk/src/toolbar.ccg
+ * No longer ignore âmake distcleanâ errors, per lintian.
+ * No longer use deprecated âSource-Versionâ in the control file, use
+ âbinary:Versionâ instead.
+
+ -- Cyril Brulebois <[EMAIL PROTECTED]> Tue, 09 Oct 2007 17:01:20 +0200
+
gtkmm2.4 (1:2.10.10-0.2) unstable; urgency=low
* Non-maintainer upload.
diff -u gtkmm2.4-2.10.10/debian/control gtkmm2.4-2.10.10/debian/control
--- gtkmm2.4-2.10.10/debian/control
+++ gtkmm2.4-2.10.10/debian/control
@@ -8,7 +8,7 @@
Package: libgtkmm-2.4-dev
Section: libdevel
Architecture: any
-Depends: libgtkmm-2.4-1c2a (= ${Source-Version}), libgtk2.0-dev (>> 2.10.0), libglibmm-2.4-dev (>= 2.12.8-1), libatk1.0-dev (>> 1.9.0), libcairomm-1.0-dev (>= 1.1.12)
+Depends: libgtkmm-2.4-1c2a (= ${binary:Version}), libgtk2.0-dev (>> 2.10.0), libglibmm-2.4-dev (>= 2.12.8-1), libatk1.0-dev (>> 1.9.0), libcairomm-1.0-dev (>= 1.1.12)
Description: C++ wrappers for GTK+ 2.4 (development files)
Gtkmm is a C++ interface for the popular GUI library gtk+.
Gtkmm provides a convenient interface for C++ programmers to create
only in patch2:
unchanged:
--- gtkmm2.4-2.10.10.orig/configure.in
+++ gtkmm2.4-2.10.10/configure.in
@@ -299,9 +299,7 @@
DISABLE_DEPRECATED_CFLAGS="\
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
--DGTK_DISABLE_DEPRECATED \
--DGDK_PIXBUF_DISABLE_DEPRECATED \
--DGNOME_DISABLE_DEPRECATED"
+-DGDK_PIXBUF_DISABLE_DEPRECATED"
AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
fi
only in patch2:
unchanged:
--- gtkmm2.4-2.10.10.orig/gtk/gtkmm/toolbar.cc
+++ gtkmm2.4-2.10.10/gtk/gtkmm/toolbar.cc
@@ -31,7 +31,7 @@
//but the GtkToolbar compatibility system is particularly unpleasant, so we just removed it in gtkmm 2.4. murrayc.
//In future, this GTK_DISABLE_DEPRECATED might be inappropriate because it might cover extra GTK+ API. Just remove it then.
-#define GTK_DISABLE_DEPRECATED
+//#define GTK_DISABLE_DEPRECATED
#include <glib.h>
#include <gtkmm/button.h>
only in patch2:
unchanged:
--- gtkmm2.4-2.10.10.orig/gtk/src/toolbar.ccg
+++ gtkmm2.4-2.10.10/gtk/src/toolbar.ccg
@@ -25,7 +25,7 @@
//but the GtkToolbar compatibility system is particularly unpleasant, so we just removed it in gtkmm 2.4. murrayc.
//In future, this GTK_DISABLE_DEPRECATED might be inappropriate because it might cover extra GTK+ API. Just remove it then.
-#define GTK_DISABLE_DEPRECATED
+//#define GTK_DISABLE_DEPRECATED
#include <glib.h>
#include <gtkmm/button.h>
pgp02BdwNAjYu.pgp
Description: PGP signature
