tags 713587 patch pending confirmed tags 677363 pending tags 591662 moreinfo thanks
Hi, I have uploaded the attached update to DELAYED/10. It will probably fix 591662, too. Please confirm that when .2 becomes available in unstable. Cheers, Balint
diff -Nru gtkhtml3.14-3.32.2/debian/changelog gtkhtml3.14-3.32.2/debian/changelog
--- gtkhtml3.14-3.32.2/debian/changelog 2011-12-09 16:12:23.000000000 +0100
+++ gtkhtml3.14-3.32.2/debian/changelog 2013-11-04 14:05:36.000000000 +0100
@@ -1,3 +1,13 @@
+gtkhtml3.14 (3.32.2-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Don't call g_thread_init() (Closes: #713587)
+ * Add dependency on libglib2.0-dev (>= 2.32.0) to ensure that
+ g_thread_init() is not needed
+ * Fix FTBFS on Hurd (Closes: #677363)
+
+ -- Balint Reczey <bal...@balintreczey.hu> Mon, 04 Nov 2013 12:59:32 +0100
+
gtkhtml3.14 (3.32.2-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru gtkhtml3.14-3.32.2/debian/control gtkhtml3.14-3.32.2/debian/control
--- gtkhtml3.14-3.32.2/debian/control 2011-02-06 14:16:56.000000000 +0100
+++ gtkhtml3.14-3.32.2/debian/control 2013-11-04 14:04:30.000000000 +0100
@@ -25,6 +25,7 @@
liborbit2-dev,
libsoup2.4-dev,
libgtk2.0-dev (>= 2.20.0),
+ libglib2.0-dev (>= 2.32.0),
gnome-icon-theme (>= 1.2.0),
gnome-pkg-tools,
chrpath,
diff -Nru gtkhtml3.14-3.32.2/debian/patches/02_dont_call_g_thread_init.patch gtkhtml3.14-3.32.2/debian/patches/02_dont_call_g_thread_init.patch
--- gtkhtml3.14-3.32.2/debian/patches/02_dont_call_g_thread_init.patch 1970-01-01 01:00:00.000000000 +0100
+++ gtkhtml3.14-3.32.2/debian/patches/02_dont_call_g_thread_init.patch 2013-11-04 12:55:53.000000000 +0100
@@ -0,0 +1,17 @@
+Description: Don't call g_thread_init(), it is now obsolete
+ It causes FTBFS with newer glibs
+ .
+Author: Balint Reczey <bal...@balintreczey.hu>
+Bug-Debian: http://bugs.debian.org/713587
+
+--- gtkhtml3.14-3.32.2.orig/components/editor/main.c
++++ gtkhtml3.14-3.32.2/components/editor/main.c
+@@ -373,8 +373,6 @@ main (gint argc, gchar **argv)
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+
+- g_thread_init (NULL);
+-
+ gtk_init (&argc, &argv);
+
+ editor = gtkhtml_editor_new ();
diff -Nru gtkhtml3.14-3.32.2/debian/patches/03_gtkhtml-no-rpath-on-Hurd.patch gtkhtml3.14-3.32.2/debian/patches/03_gtkhtml-no-rpath-on-Hurd.patch
--- gtkhtml3.14-3.32.2/debian/patches/03_gtkhtml-no-rpath-on-Hurd.patch 1970-01-01 01:00:00.000000000 +0100
+++ gtkhtml3.14-3.32.2/debian/patches/03_gtkhtml-no-rpath-on-Hurd.patch 2013-11-04 13:05:13.000000000 +0100
@@ -0,0 +1,205 @@
+Description: Fix FTBFS on hurd-i386
+ gtkhtml3.14 currently FTBFS on hurd-i386 due to libtool spuriously adding
+ an rpath to /usr/lib/i386-gnu. This was fixed upstream, gtkhtml3.14 just
+ needs to update. Could you apply the attached patch which brings just
+ the fix?
+ .
+Author: Samuel Thibault <sthiba...@debian.org>
+Bug-Debian: http://bugs.debian.org/677363
+
+--- ./m4/libtool.m4.orig 2012-06-13 12:22:08.607729176 +0100
++++ ./m4/libtool.m4 2012-06-13 12:22:26.879368445 +0100
+@@ -2318,16 +2318,6 @@
+ esac
+ ;;
+
+-gnu*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- hardcode_into_libs=yes
+- ;;
+-
+ haiku*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -2444,7 +2434,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -3047,10 +3037,6 @@
+ fi
+ ;;
+
+-gnu*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+-
+ haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+@@ -3089,7 +3075,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -3733,7 +3719,7 @@
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+@@ -4030,7 +4016,7 @@
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -5784,9 +5770,6 @@
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ ;;
+
+- gnu*)
+- ;;
+-
+ haiku*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+@@ -5948,7 +5931,7 @@
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ ;;
+
+- linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+--- ./configure.orig 2012-06-13 12:22:39.979109818 +0100
++++ ./configure 2012-06-13 12:23:03.994635678 +0100
+@@ -8326,10 +8326,6 @@
+ fi
+ ;;
+
+-gnu*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+-
+ haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+@@ -8368,7 +8364,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -10871,7 +10867,7 @@
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -12879,16 +12875,6 @@
+ esac
+ ;;
+
+-gnu*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- hardcode_into_libs=yes
+- ;;
+-
+ haiku*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -13005,7 +12991,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -14746,9 +14732,6 @@
+ ld_shlibs_CXX=yes
+ ;;
+
+- gnu*)
+- ;;
+-
+ haiku*)
+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ link_all_deplibs_CXX=yes
+@@ -14910,7 +14893,7 @@
+ inherit_rpath_CXX=yes
+ ;;
+
+- linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -15747,7 +15730,7 @@
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+@@ -16546,16 +16529,6 @@
+ esac
+ ;;
+
+-gnu*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- hardcode_into_libs=yes
+- ;;
+-
+ haiku*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -16672,7 +16645,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
diff -Nru gtkhtml3.14-3.32.2/debian/patches/series gtkhtml3.14-3.32.2/debian/patches/series
--- gtkhtml3.14-3.32.2/debian/patches/series 2011-04-12 08:47:17.000000000 +0200
+++ gtkhtml3.14-3.32.2/debian/patches/series 2013-11-04 13:12:47.000000000 +0100
@@ -1 +1,3 @@
01_remove-disable-deprecated.patch
+02_dont_call_g_thread_init.patch
+03_gtkhtml-no-rpath-on-Hurd.patch
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Pkg-evolution-maintainers mailing list Pkg-evolution-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-evolution-maintainers
