Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (4d2ea7a8b2ccbd15b42cef0bbc4711391e0aed6b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (4d2ea7a8b2ccbd15b42cef0bbc4711391e0aed6b)
  • Date: Wed, 14 Mar 2012 07:17:34 -0500

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

chat-im/pidgin/DETAILS | 4 ++--
chat-im/pidgin/HISTORY | 5 +++++
chat-im/pidgin/PRE_BUILD | 3 +--
chat-im/pidgin/glib-2.31.patch | 13 -------------
4 files changed, 8 insertions(+), 17 deletions(-)

New commits:
commit 4d2ea7a8b2ccbd15b42cef0bbc4711391e0aed6b
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

pidgin: updated version to 2.10.2, SECURITY_PATCH=13
removed patch for glib 2.31, integrated upstream

diff --git a/chat-im/pidgin/DETAILS b/chat-im/pidgin/DETAILS
index 8e22880..8061608 100755
--- a/chat-im/pidgin/DETAILS
+++ b/chat-im/pidgin/DETAILS
@@ -1,6 +1,6 @@
SPELL=pidgin
- VERSION=2.10.1
- SECURITY_PATCH=12
+ VERSION=2.10.2
+ SECURITY_PATCH=13
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index 4504fa9..f33d45f 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,8 @@
+2012-03-14 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 2.10.2, SECURITY_PATCH=13
+ * glib-2.31.patch: removed, integrated upstream
+ * PRE_BUILD: no longer applying former patch
+
2012-01-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: LIBS+=-lm to avoid linker error

diff --git a/chat-im/pidgin/PRE_BUILD b/chat-im/pidgin/PRE_BUILD
index 8a7fd53..fa78ec4 100755
--- a/chat-im/pidgin/PRE_BUILD
+++ b/chat-im/pidgin/PRE_BUILD
@@ -3,5 +3,4 @@ cd ${SOURCE_DIRECTORY} &&
if [ "$PIDGIN_CVS" == "y" ]
then
NOCONFIGURE=Y ./autogen.sh
-fi &&
-patch -p1 < $SPELL_DIRECTORY/glib-2.31.patch
+fi
diff --git a/chat-im/pidgin/glib-2.31.patch b/chat-im/pidgin/glib-2.31.patch
deleted file mode 100644
index f3bfc27..0000000
--- a/chat-im/pidgin/glib-2.31.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pidgin-2.10.0/libpurple/protocols/mxit/formcmds.c
-===================================================================
---- pidgin-2.10.0.orig/libpurple/protocols/mxit/formcmds.c
-+++ pidgin-2.10.0/libpurple/protocols/mxit/formcmds.c
-@@ -25,7 +25,7 @@
-
-
- #include "internal.h"
--#include <glib/gprintf.h>
-+#include <glib.h>
-
- #include "purple.h"
-



  • [SM-Commit] GIT changes to master grimoire by Julien ROZO (4d2ea7a8b2ccbd15b42cef0bbc4711391e0aed6b), Julien ROZO, 03/14/2012

Archive powered by MHonArc 2.6.24.

Top of Page