Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-06-15 14:09:48 (GMT)
committer Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-06-15 14:09:48 (GMT)
commit248de0a28eecb8e4367470e14ba48a7dcdda845b (patch)
treed1dc1ded250fb440d518379ed1797874c27ae56c
parente8db87bc832cb84e13802e9fc88c742dc9ae86ef (diff)
upgrade to telepathy-gabble 0.7.28
Drop telepathy-gabble-0001-Add-gthread-2.0-to-pkgconfig-check.patch, fix has been merged upstream.
-rw-r--r--config/modulesets/glucose-external.modules7
-rw-r--r--config/modulesets/patches/telepathy-gabble-0001-Add-gthread-2.0-to-pkgconfig-check.patch25
2 files changed, 3 insertions, 29 deletions
diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules
index 79ddc68..3cbe5cf 100644
--- a/config/modulesets/glucose-external.modules
+++ b/config/modulesets/glucose-external.modules
@@ -89,10 +89,9 @@
<autotools id="telepathy-gabble"
autogen-sh="configure">
<branch repo="telepathy"
- version="0.7.25"
- module="telepathy-gabble/telepathy-gabble-0.7.25.tar.gz"
- size="1732475" md5sum="5fae7fbfb8e40be28e8dae5cba5cb947">
- <patch file="telepathy-gabble-0001-Add-gthread-2.0-to-pkgconfig-check.patch" strip="1" />
+ version="0.7.28"
+ module="telepathy-gabble/telepathy-gabble-0.7.28.tar.gz"
+ size="1802403" md5sum="617b9f161a08f5b9598647aa78d721e5">
</branch>
<dependencies>
<dep package="telepathy-glib"/>
diff --git a/config/modulesets/patches/telepathy-gabble-0001-Add-gthread-2.0-to-pkgconfig-check.patch b/config/modulesets/patches/telepathy-gabble-0001-Add-gthread-2.0-to-pkgconfig-check.patch
deleted file mode 100644
index c797cc5..0000000
--- a/config/modulesets/patches/telepathy-gabble-0001-Add-gthread-2.0-to-pkgconfig-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a2e7aa987269d41ba157c7f3641c9d6f646b10b4 Mon Sep 17 00:00:00 2001
-From: Brian Pepple <bpepple@fedoraproject.org>
-Date: Sun, 29 Mar 2009 17:20:59 -0400
-Subject: [PATCH] Add gthread-2.0 to pkgconfig check.
-
----
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a2180a5..4b67d6c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -110,7 +110,7 @@ AC_SUBST(HANDLE_LEAK_DEBUG_CFLAGS)
- AC_SUBST([ENABLE_CODING_STYLE_CHECKS])
-
- dnl Check for Glib
--PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.16, gobject-2.0 >= 2.16])
-+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.16, gobject-2.0 >= 2.16, gthread-2.0 >= 2.16])
-
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
---
-1.6.0.6
-