Source: tomboy
Version: 1.8.3-1
Severity: normal
Tags: patch
Hi,
I'll be switching totem-pl-parser over to gmime 2.6.
totem and tomboy are both installed via the gnome meta-packages,
so it would be great if tomboy is switched over to gmime 2.6,
too so we don't require both gmime 2.4. and 2.6.
The attached patch should do the trick.
Cheers,
Michael
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-- no debconf information
diff --git a/debian/control b/debian/control
index 56d41af..4201b6d 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 7.0.50),
imagemagick,
libgtk2.0-dev (>= 2.14.0),
libatk1.0-dev (>= 1.2.4),
- libgmime2.4-cil-dev,
+ libgmime2.6-cil-dev,
gnome-doc-utils (>= 0.3.2),
scrollkeeper,
libdbus1.0-cil-dev (>= 0.4),
diff --git a/debian/patches/40_gmime2.6.patch b/debian/patches/40_gmime2.6.patch
new file mode 100644
index 0000000..20e015f
--- /dev/null
+++ b/debian/patches/40_gmime2.6.patch
@@ -0,0 +1,100 @@
+diff --git a/configure b/configure
+index 12c19f7..b809ac6 100755
+--- a/configure
++++ b/configure
+@@ -14977,7 +14977,79 @@ done
+ # Evolution.dll needs GMime#
+ #
+ if test "x$ENABLE_GNOME" != "xno"; then
+- if pkg-config --exists gmime-sharp-2.4; then
++ if pkg-config --exists gmime-sharp-2.6; then
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVOLUTION" >&5
++$as_echo_n "checking for EVOLUTION... " >&6; }
++
++if test -n "$EVOLUTION_CFLAGS"; then
++ pkg_cv_EVOLUTION_CFLAGS="$EVOLUTION_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmime-sharp-2.6\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gmime-sharp-2.6") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_EVOLUTION_CFLAGS=`$PKG_CONFIG --cflags "gmime-sharp-2.6" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$EVOLUTION_LIBS"; then
++ pkg_cv_EVOLUTION_LIBS="$EVOLUTION_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmime-sharp-2.6\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gmime-sharp-2.6") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_EVOLUTION_LIBS=`$PKG_CONFIG --libs "gmime-sharp-2.6" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++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
++ EVOLUTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmime-sharp-2.6" 2>&1`
++ else
++ EVOLUTION_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmime-sharp-2.6" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$EVOLUTION_PKG_ERRORS" >&5
++
++ ENABLE_EVOLUTION="no"
++elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ ENABLE_EVOLUTION="no"
++else
++ EVOLUTION_CFLAGS=$pkg_cv_EVOLUTION_CFLAGS
++ EVOLUTION_LIBS=$pkg_cv_EVOLUTION_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ ENABLE_EVOLUTION="yes"
++fi
++ elif pkg-config --exists gmime-sharp-2.4; then
+
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVOLUTION" >&5
+diff --git a/configure.in b/configure.in
+index d03c34d..42ce4fc 100644
+--- a/configure.in
++++ b/configure.in
+@@ -232,7 +232,9 @@ done
+ # Evolution.dll needs GMime#
+ #
+ if test "x$ENABLE_GNOME" != "xno"; then
+- if pkg-config --exists gmime-sharp-2.4; then
++ if pkg-config --exists gmime-sharp-2.6; then
++ PKG_CHECK_MODULES(EVOLUTION, gmime-sharp-2.6, ENABLE_EVOLUTION="yes", ENABLE_EVOLUTION="no")
++ elif pkg-config --exists gmime-sharp-2.4; then
+ PKG_CHECK_MODULES(EVOLUTION, gmime-sharp-2.4, ENABLE_EVOLUTION="yes", ENABLE_EVOLUTION="no")
+ else
+ PKG_CHECK_MODULES(EVOLUTION, gmime-sharp >= 2.2.7, ENABLE_EVOLUTION="yes", ENABLE_EVOLUTION="no")
diff --git a/debian/patches/series b/debian/patches/series
index 7d7ba76..db492f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
01_dllmaps.patch
20_remove_pcfile_requires
30_fix_manpage_syntax
+40_gmime2.6.patch
