Source Mage code commit list

[Julien ROZO <scm AT sourcemage.org>]

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

 chat-im/pidgin/HISTORY              |    4 
 chat-im/pidgin/PRE_BUILD            |    3 
 chat-im/pidgin/glib-2.31.patch      |   13 +
 chat-libs/meanwhile/HISTORY         |    4 
 chat-libs/meanwhile/PRE_BUILD       |    3 
 chat-libs/meanwhile/glib-2.31.patch |  278 
++++++++++++++++++++++++++++++++++++
 gnome2-apps/dia/HISTORY             |    4 
 gnome2-apps/dia/PRE_BUILD           |    3 
 gnome2-apps/dia/glib-2.31.patch     |   53 ++++++
 9 files changed, 363 insertions(+), 2 deletions(-)

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

    dia: added patch to fix compilation issue with glib2 2.31.x

commit 66dd669b1c040178538fe10d825b3f08fea7dad0
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

    pidgin: added a patch to fix compilation issue with glib2 2.31.x

commit 4e1e9a9633272a6dc95308285a5d1144e121a1de
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

    meanwhile: added a patch to fix compilation issue with glib2 2.31.x

diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index 4cb4764..877bb12 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,7 @@
+2011-12-28 Julien "_kaze_" ROZO <julien AT rozo.org>
+       * glib-2.31.patch: added, to fix compilation issue with latest glib2
+       * PRE_BUILD: applying new patch
+
 2011-12-15 Justin Boffemmyer <flux AT sourcemage.org>
        * DEPENDS: remove CVS if block, add intltool
 
diff --git a/chat-im/pidgin/PRE_BUILD b/chat-im/pidgin/PRE_BUILD
index fa78ec4..8a7fd53 100755
--- a/chat-im/pidgin/PRE_BUILD
+++ b/chat-im/pidgin/PRE_BUILD
@@ -3,4 +3,5 @@ cd ${SOURCE_DIRECTORY} &&
 if  [  "$PIDGIN_CVS"  ==  "y"  ]
 then
   NOCONFIGURE=Y ./autogen.sh
-fi
+fi &&
+patch -p1 < $SPELL_DIRECTORY/glib-2.31.patch
diff --git a/chat-im/pidgin/glib-2.31.patch b/chat-im/pidgin/glib-2.31.patch
new file mode 100644
index 0000000..f3bfc27
--- /dev/null
+++ b/chat-im/pidgin/glib-2.31.patch
@@ -0,0 +1,13 @@
+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"
+ 
diff --git a/chat-libs/meanwhile/HISTORY b/chat-libs/meanwhile/HISTORY
index 887ed31..b5d7e1a 100644
--- a/chat-libs/meanwhile/HISTORY
+++ b/chat-libs/meanwhile/HISTORY
@@ -1,3 +1,7 @@
+2011-12-28 Julien "_kaze_" ROZO <julien AT rozo.org>
+       * PRE_BUILD, glib-2.31.patch: added, to fix compilation issue with
+         latest glib2
+
 2007-09-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Created
 
diff --git a/chat-libs/meanwhile/PRE_BUILD b/chat-libs/meanwhile/PRE_BUILD
new file mode 100755
index 0000000..a7e8463
--- /dev/null
+++ b/chat-libs/meanwhile/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/glib-2.31.patch
diff --git a/chat-libs/meanwhile/glib-2.31.patch 
b/chat-libs/meanwhile/glib-2.31.patch
new file mode 100644
index 0000000..48c3fc9
--- /dev/null
+++ b/chat-libs/meanwhile/glib-2.31.patch
@@ -0,0 +1,278 @@
+Index: meanwhile-1.0.2/samples/logging_proxy.c
+===================================================================
+--- meanwhile-1.0.2.orig/samples/logging_proxy.c
++++ meanwhile-1.0.2/samples/logging_proxy.c
+@@ -25,7 +25,6 @@
+ #include <unistd.h>
+ 
+ #include <glib.h>
+-#include <glib/glist.h>
+ 
+ #include <mw_cipher.h>
+ #include <mw_common.h>
+Index: meanwhile-1.0.2/samples/login_server.c
+===================================================================
+--- meanwhile-1.0.2.orig/samples/login_server.c
++++ meanwhile-1.0.2/samples/login_server.c
+@@ -19,7 +19,6 @@
+ #include <unistd.h>
+ 
+ #include <glib.h>
+-#include <glib/glist.h>
+ 
+ #include <mw_cipher.h>
+ #include <mw_common.h>
+Index: meanwhile-1.0.2/samples/nocipher_proxy.c
+===================================================================
+--- meanwhile-1.0.2.orig/samples/nocipher_proxy.c
++++ meanwhile-1.0.2/samples/nocipher_proxy.c
+@@ -29,7 +29,6 @@
+ #include <unistd.h>
+ 
+ #include <glib.h>
+-#include <glib/glist.h>
+ 
+ #include <mw_common.h>
+ #include <mw_message.h>
+Index: meanwhile-1.0.2/samples/redirect_server.c
+===================================================================
+--- meanwhile-1.0.2.orig/samples/redirect_server.c
++++ meanwhile-1.0.2/samples/redirect_server.c
+@@ -22,7 +22,6 @@
+ #include <unistd.h>
+ 
+ #include <glib.h>
+-#include <glib/glist.h>
+ 
+ #include <mw_common.h>
+ #include <mw_message.h>
+Index: meanwhile-1.0.2/src/channel.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/channel.c
++++ meanwhile-1.0.2/src/channel.c
+@@ -19,8 +19,6 @@
+ */
+ 
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ #include <string.h>
+ 
+ #include "mw_channel.h"
+Index: meanwhile-1.0.2/src/mw_debug.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/mw_debug.c
++++ meanwhile-1.0.2/src/mw_debug.c
+@@ -19,7 +19,7 @@
+ */
+ 
+ 
+-#include <glib/gstring.h>
++#include <glib.h>
+ 
+ #include "mw_debug.h"
+ 
+Index: meanwhile-1.0.2/src/mw_message.h
+===================================================================
+--- meanwhile-1.0.2.orig/src/mw_message.h
++++ meanwhile-1.0.2/src/mw_message.h
+@@ -22,7 +22,7 @@
+ #define _MW_MESSAGE_H
+ 
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+ 
+ 
+Index: meanwhile-1.0.2/src/mw_srvc_conf.h
+===================================================================
+--- meanwhile-1.0.2.orig/src/mw_srvc_conf.h
++++ meanwhile-1.0.2/src/mw_srvc_conf.h
+@@ -22,7 +22,7 @@
+ #define _MW_SRVC_CONF_H
+ 
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+ 
+ 
+Index: meanwhile-1.0.2/src/mw_srvc_dir.h
+===================================================================
+--- meanwhile-1.0.2.orig/src/mw_srvc_dir.h
++++ meanwhile-1.0.2/src/mw_srvc_dir.h
+@@ -22,7 +22,6 @@
+ 
+ 
+ #include <glib.h>
+-#include <glib/glist.h>
+ 
+ 
+ #ifdef __cplusplus
+Index: meanwhile-1.0.2/src/mw_srvc_place.h
+===================================================================
+--- meanwhile-1.0.2.orig/src/mw_srvc_place.h
++++ meanwhile-1.0.2/src/mw_srvc_place.h
+@@ -22,7 +22,7 @@
+ #define _MW_SRVC_PLACE_H
+ 
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+ 
+ 
+Index: meanwhile-1.0.2/src/mw_srvc_resolve.h
+===================================================================
+--- meanwhile-1.0.2.orig/src/mw_srvc_resolve.h
++++ meanwhile-1.0.2/src/mw_srvc_resolve.h
+@@ -23,7 +23,6 @@
+ 
+ 
+ #include <glib.h>
+-#include <glib/glist.h>
+ 
+ 
+ #ifdef __cplusplus
+Index: meanwhile-1.0.2/src/mw_st_list.h
+===================================================================
+--- meanwhile-1.0.2.orig/src/mw_st_list.h
++++ meanwhile-1.0.2/src/mw_st_list.h
+@@ -30,7 +30,6 @@
+ 
+ 
+ #include <glib.h>
+-#include <glib/glist.h>
+ #include "mw_common.h"
+ 
+ 
+Index: meanwhile-1.0.2/src/mw_util.h
+===================================================================
+--- meanwhile-1.0.2.orig/src/mw_util.h
++++ meanwhile-1.0.2/src/mw_util.h
+@@ -23,8 +23,6 @@
+ 
+ 
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ 
+ 
+ #define map_guint_new() \
+Index: meanwhile-1.0.2/src/srvc_aware.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/srvc_aware.c
++++ meanwhile-1.0.2/src/srvc_aware.c
+@@ -19,8 +19,6 @@
+ */
+ 
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ #include <string.h>
+ 
+ #include "mw_channel.h"
+Index: meanwhile-1.0.2/src/srvc_conf.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/srvc_conf.c
++++ meanwhile-1.0.2/src/srvc_conf.c
+@@ -19,8 +19,6 @@
+ */
+ 
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+Index: meanwhile-1.0.2/src/srvc_dir.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/srvc_dir.c
++++ meanwhile-1.0.2/src/srvc_dir.c
+@@ -18,7 +18,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
+-#include <glib/ghash.h>
++#include <glib.h>
+ 
+ #include "mw_channel.h"
+ #include "mw_common.h"
+Index: meanwhile-1.0.2/src/srvc_ft.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/srvc_ft.c
++++ meanwhile-1.0.2/src/srvc_ft.c
+@@ -19,7 +19,7 @@
+ */
+ 
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ #include "mw_channel.h"
+ #include "mw_common.h"
+Index: meanwhile-1.0.2/src/srvc_im.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/srvc_im.c
++++ meanwhile-1.0.2/src/srvc_im.c
+@@ -19,7 +19,6 @@
+ */
+ 
+ #include <glib.h>
+-#include <glib/glist.h>
+ #include <string.h>
+ 
+ #include "mw_channel.h"
+Index: meanwhile-1.0.2/src/srvc_place.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/srvc_place.c
++++ meanwhile-1.0.2/src/srvc_place.c
+@@ -19,8 +19,6 @@
+ */
+ 
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+Index: meanwhile-1.0.2/src/srvc_resolve.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/srvc_resolve.c
++++ meanwhile-1.0.2/src/srvc_resolve.c
+@@ -18,7 +18,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
+-#include <glib/ghash.h>
++#include <glib.h>
+ 
+ #include "mw_channel.h"
+ #include "mw_common.h"
+Index: meanwhile-1.0.2/src/srvc_store.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/srvc_store.c
++++ meanwhile-1.0.2/src/srvc_store.c
+@@ -18,7 +18,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ #include "mw_channel.h"
+ #include "mw_debug.h"
+Index: meanwhile-1.0.2/src/st_list.c
+===================================================================
+--- meanwhile-1.0.2.orig/src/st_list.c
++++ meanwhile-1.0.2/src/st_list.c
+@@ -20,7 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ 
+ #include "mw_debug.h"
+ #include "mw_util.h"
diff --git a/gnome2-apps/dia/HISTORY b/gnome2-apps/dia/HISTORY
index d46cb70..18f6dfc 100644
--- a/gnome2-apps/dia/HISTORY
+++ b/gnome2-apps/dia/HISTORY
@@ -1,3 +1,7 @@
+2011-12-28 Julien "_kaze_" ROZO <julien AT rozo.org>
+       * glib-2.31.patch: added, to fix compilation issue with latest glib2
+       * PRE_BUILD: applying new patch
+
 2011-12-19 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.97.2, bz2 -> xz
        * PRE_BUILD: added due to bz2 -> xz
diff --git a/gnome2-apps/dia/PRE_BUILD b/gnome2-apps/dia/PRE_BUILD
index 6f54504..958f6d3 100755
--- a/gnome2-apps/dia/PRE_BUILD
+++ b/gnome2-apps/dia/PRE_BUILD
@@ -2,4 +2,5 @@ mk_source_dir $SOURCE_DIRECTORY &&
 cd $BUILD_DIRECTORY &&
 verify_file '' &&
 xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
-cd $SOURCE_DIRECTORY
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/glib-2.31.patch
diff --git a/gnome2-apps/dia/glib-2.31.patch b/gnome2-apps/dia/glib-2.31.patch
new file mode 100644
index 0000000..209d196
--- /dev/null
+++ b/gnome2-apps/dia/glib-2.31.patch
@@ -0,0 +1,53 @@
+Index: dia-0.97.1/objects/custom/shape_typeinfo.c
+===================================================================
+--- dia-0.97.1.orig/objects/custom/shape_typeinfo.c
++++ dia-0.97.1/objects/custom/shape_typeinfo.c
+@@ -27,7 +27,7 @@
+ #include "custom_util.h"
+ #include <string.h>
+ #include <stdarg.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <glib/gstdio.h>
+ #include <libxml/parser.h>
+ 
+Index: dia-0.97.1/plug-ins/pgf/render_pgf.c
+===================================================================
+--- dia-0.97.1.orig/plug-ins/pgf/render_pgf.c
++++ dia-0.97.1/plug-ins/pgf/render_pgf.c
+@@ -61,7 +61,7 @@ TODO:
+ #endif
+ #include <errno.h>
+ 
+-#include <glib/gprintf.h>
++#include <glib.h>
+ #include <glib/gstdio.h>
+ 
+ #include "intl.h"
+Index: dia-0.97.1/tests/test-boundingbox.c
+===================================================================
+--- dia-0.97.1.orig/tests/test-boundingbox.c
++++ dia-0.97.1/tests/test-boundingbox.c
+@@ -28,7 +28,7 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ 
+-#if GLIB_CHECK_VERSION(2,16,0)
++#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0)
+ #include <glib/gtestutils.h>
+ #endif
+ #include "dialib.h"
+Index: dia-0.97.1/tests/test-objects.c
+===================================================================
+--- dia-0.97.1.orig/tests/test-objects.c
++++ dia-0.97.1/tests/test-objects.c
+@@ -28,7 +28,7 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ 
+-#if GLIB_CHECK_VERSION(2,16,0)
++#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0)
+ #include <glib/gtestutils.h>
+ #endif
+ 
+