r32376 - in /desktop/unstable/gnome-keyring/debian: changelog patches/00git_gmodule_include.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Thu Jan 12 10:25:18 2012
New Revision: 32376

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32376
Log:
Add 00git_gmodule_include.patch: Fix FTBFS due to missing gmodule package
check when building against glib 2.31.

Added:
    desktop/unstable/gnome-keyring/debian/patches/00git_gmodule_include.patch
Modified:
    desktop/unstable/gnome-keyring/debian/changelog
    desktop/unstable/gnome-keyring/debian/patches/series

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=32376&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog [utf-8] Thu Jan 12 10:25:18 2012
@@ -1,3 +1,10 @@
+gnome-keyring (3.2.2-2) UNRELEASED; urgency=low
+
+  * Add 00git_gmodule_include.patch: Fix FTBFS due to missing gmodule package
+    check when building against glib 2.31.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 12 Jan 2012 11:23:14 +0100
+
 gnome-keyring (3.2.2-1) unstable; urgency=low
 
   [ Michael Biebl ]

Added: desktop/unstable/gnome-keyring/debian/patches/00git_gmodule_include.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/00git_gmodule_include.patch?rev=32376&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/00git_gmodule_include.patch (added)
+++ desktop/unstable/gnome-keyring/debian/patches/00git_gmodule_include.patch [utf-8] Thu Jan 12 10:25:18 2012
@@ -1,0 +1,33 @@
+Description: Fix FTBFS due to missing include/wrong linking when building with glib 2.31.
+Author: Martin Pitt <martin.pitt at ubuntu.com>
+Forwarded: Not needed, fixed in gcr upstream trunk
+
+Index: gnome-keyring/gck/gck-module.c
+===================================================================
+--- gnome-keyring.orig/gck/gck-module.c	2012-01-03 12:11:43.407134045 +0100
++++ gnome-keyring/gck/gck-module.c	2012-01-03 12:11:44.751134111 +0100
+@@ -28,6 +28,7 @@
+ #include "gck-marshal.h"
+ 
+ #include <glib/gi18n.h>
++#include <gmodule.h>
+ 
+ #include <p11-kit/p11-kit.h>
+ 
+Index: gnome-keyring/configure.ac
+===================================================================
+--- gnome-keyring.orig/configure.ac	2012-01-03 11:12:36.684355000 +0100
++++ gnome-keyring/configure.ac	2012-01-03 12:14:43.783142775 +0100
+@@ -64,11 +64,7 @@
+ DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
+ AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
+ 
+-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16.0)
+-AC_SUBST(GLIB_CFLAGS)
+-AC_SUBST(GLIB_LIBS)
+-
+-PKG_CHECK_MODULES(GMODULE, gmodule-no-export-2.0)
++PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16.0 gmodule-no-export-2.0)
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+ 

Modified: desktop/unstable/gnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/series?rev=32376&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/series [utf-8] Thu Jan 12 10:25:18 2012
@@ -1,2 +1,3 @@
+00git_gmodule_include.patch
 03_kfreebsd.patch
 99_ltmain_as-needed.patch