Package: libgtkhtml2.0-cil Version: 2.16.0-8 Severity: wishlist Hello :)
libgtkhtml2.0-cil is the last package still using gtkhtml3.8. We would like to remove this old version since gtkhtml3.14 is downwards compatible. It is not API-compatible tho', so a configure-patch and rebuild is needed to use libgtkhtml3.14-dev instead I've attached a patch, which changes the following files: debian/control debian/patches/00list debian/patches/05_configure_with_new_gtkhtml.dpatch (the dpatch updates configure and configure.in) Hope you get to apply this soonish. I'll file a bug upstream as well. Cheers :) Heikki
diff -ruN gnome-sharp2-2.16.0/debian/control gnome-sharp2-2.16.0.new/debian/control
--- gnome-sharp2-2.16.0/debian/control 2007-12-05 10:43:27.000000000 +0100
+++ gnome-sharp2-2.16.0.new/debian/control 2007-12-05 10:41:22.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Mono Group <[EMAIL PROTECTED]>
Uploaders: Mirco Bauer <[EMAIL PROTECTED]>, Sebastian Dröge <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), cli-common-dev (>= 0.4.6), dpatch, mono-mcs (>= 1.0) | c-sharp-compiler, mono-gac (>= 1.0), libmono-dev (>= 1.0), pkg-config, libtool, libgtk2.0-dev (>= 2.10.0), libglib2.0-dev (>= 2.10.0), libgtk2.0-cil (>= 2.10.1-3), libglade2.0-cil (>= 2.10.1-3), gtk-sharp2-gapi (>= 2.10.1-3), libgnomevfs2-dev (>= 1:2.15.0), librsvg2-dev (>= 2.0.1), libgtkhtml3.8-dev (>= 3.8.0), libgnomeui-dev (>= 2.15.0), libgnomecanvas2-dev (>= 2.14.0), libgnomeprint2.2-dev (>= 2.10.0) , libgnomeprintui2.2-dev (>= 2.10.0), libart-2.0-dev (>= 2.3.16), libvte-dev (>= 0.16.0), libpanel-applet2-dev (>= 2.14.0), libmono0 (>= 1.0), mono-utils (>= 1.0-2), libmono-cairo1.0-cil
+Build-Depends: debhelper (>= 5), cli-common-dev (>= 0.4.6), dpatch, mono-mcs (>= 1.0) | c-sharp-compiler, mono-gac (>= 1.0), libmono-dev (>= 1.0), pkg-config, libtool, libgtk2.0-dev (>= 2.10.0), libglib2.0-dev (>= 2.10.0), libgtk2.0-cil (>= 2.10.1-3), libglade2.0-cil (>= 2.10.1-3), gtk-sharp2-gapi (>= 2.10.1-3), libgnomevfs2-dev (>= 1:2.15.0), librsvg2-dev (>= 2.0.1), libgtkhtml3.14-dev (>= 3.14.0), libgnomeui-dev (>= 2.15.0), libgnomecanvas2-dev (>= 2.14.0), libgnomeprint2.2-dev (>= 2.10.0) , libgnomeprintui2.2-dev (>= 2.10.0), libart-2.0-dev (>= 2.3.16), libvte-dev (>= 0.16.0), libpanel-applet2-dev (>= 2.14.0), libmono0 (>= 1.0), mono-utils (>= 1.0-2), libmono-cairo1.0-cil
Standards-Version: 3.7.2
Package: gnome-sharp2
diff -ruN gnome-sharp2-2.16.0/debian/patches/00list gnome-sharp2-2.16.0.new/debian/patches/00list
--- gnome-sharp2-2.16.0/debian/patches/00list 2007-12-05 10:43:27.000000000 +0100
+++ gnome-sharp2-2.16.0.new/debian/patches/00list 2007-12-05 10:39:34.000000000 +0100
@@ -1,3 +1,4 @@
01_glue-locations.dpatch
02_missing_dllmaps.dpatch
+05_configure_with_new_gtkhtml.dpatch
99_ltmain_as-needed.dpatch
diff -ruN gnome-sharp2-2.16.0/debian/patches/05_configure_with_new_gtkhtml.dpatch gnome-sharp2-2.16.0.new/debian/patches/05_configure_with_new_gtkhtml.dpatch
--- gnome-sharp2-2.16.0/debian/patches/05_configure_with_new_gtkhtml.dpatch 1970-01-01 01:00:00.000000000 +0100
+++ gnome-sharp2-2.16.0.new/debian/patches/05_configure_with_new_gtkhtml.dpatch 2007-12-05 11:05:18.000000000 +0100
@@ -0,0 +1,113 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
[EMAIL PROTECTED]@
+
+diff -ruN gnome-sharp2-2.16.0.orig/configure gnome-sharp2-2.16.0/configure
+--- gnome-sharp2-2.16.0.orig/configure 2007-12-05 10:15:30.000000000 +0100
++++ gnome-sharp2-2.16.0/configure 2007-12-05 10:36:49.000000000 +0100
+@@ -21744,6 +21744,80 @@
+ fi
+
+ if test "x$enable_gnome" = "xyes"; then
++GTKHTML_REQUIRED_VERSION=3.14.0
++
++pkg_failed=no
++echo "$as_me:$LINENO: checking for GTKHTML_DEPENDENCIES" >&5
++echo $ECHO_N "checking for GTKHTML_DEPENDENCIES... $ECHO_C" >&6
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GTKHTML_DEPENDENCIES_CFLAGS"; then
++ pkg_cv_GTKHTML_DEPENDENCIES_CFLAGS="$GTKHTML_DEPENDENCIES_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14 >= \$GTKHTML_REQUIRED_VERSION\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14 >= $GTKHTML_REQUIRED_VERSION") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14 >= $GTKHTML_REQUIRED_VERSION" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GTKHTML_DEPENDENCIES_LIBS"; then
++ pkg_cv_GTKHTML_DEPENDENCIES_LIBS="$GTKHTML_DEPENDENCIES_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14 >= \$GTKHTML_REQUIRED_VERSION\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14 >= $GTKHTML_REQUIRED_VERSION") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GTKHTML_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14 >= $GTKHTML_REQUIRED_VERSION" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GTKHTML_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgtkhtml-3.14 >= $GTKHTML_REQUIRED_VERSION"`
++ else
++ GTKHTML_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.14 >= $GTKHTML_REQUIRED_VERSION"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKHTML_DEPENDENCIES_PKG_ERRORS" >&5
++
++ enable_gtkhtml=no
++elif test $pkg_failed = untried; then
++ enable_gtkhtml=no
++else
++ GTKHTML_DEPENDENCIES_CFLAGS=$pkg_cv_GTKHTML_DEPENDENCIES_CFLAGS
++ GTKHTML_DEPENDENCIES_LIBS=$pkg_cv_GTKHTML_DEPENDENCIES_LIBS
++ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++ enable_gtkhtml=yes
++fi
++if test "x$enable_gtkhtml" = "xyes"; then
++GTKHTML_VERSION=3.14
++GTKHTML_SOVERSION=19
++else
+ GTKHTML_REQUIRED_VERSION=3.8.0
+
+ pkg_failed=no
+@@ -22046,6 +22120,7 @@
+ fi
+ fi
+ fi
++fi
+
+
+ else
+
+diff -ruN gnome-sharp2-2.16.0.orig/configure.in gnome-sharp2-2.16.0/configure.in
+--- gnome-sharp2-2.16.0.orig/configure.in 2007-12-05 10:15:30.000000000 +0100
++++ gnome-sharp2-2.16.0/configure.in 2007-12-05 10:19:10.000000000 +0100
+@@ -195,6 +195,12 @@
+ PKG_CHECK_MODULES(RSVG_DEPENDENCIES, librsvg-2.0 >= $RSVG_REQUIRED_VERSION, enable_rsvg=yes, enable_rsvg=no)
+
+ if test "x$enable_gnome" = "xyes"; then
++GTKHTML_REQUIRED_VERSION=3.14.0
++PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.14 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
++if test "x$enable_gtkhtml" = "xyes"; then
++GTKHTML_VERSION=3.14
++GTKHTML_SOVERSION=19
++else
+ GTKHTML_REQUIRED_VERSION=3.8.0
+ PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
+ if test "x$enable_gtkhtml" = "xyes"; then
signature.asc
Description: Dette er en digitalt signert meldingsdel
