Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 chat-im/gajim/DETAILS          |    1 
 chat-im/gajim/HISTORY          |    4 +++
 chat-im/gajim/PRE_BUILD        |    4 ---
 chat-im/gajim/py27.patch       |   13 -----------
 x11-toolkits/pygtk2/DETAILS    |    1 
 x11-toolkits/pygtk2/HISTORY    |    5 ++++
 x11-toolkits/pygtk2/PRE_BUILD  |    4 +++
 x11-toolkits/pygtk2/py27.patch |   46 
+++++++++++++++++++++++++++++++++++++++++
 8 files changed, 61 insertions(+), 17 deletions(-)

New commits:
commit 8842216919673187810bb16636c80b415e26e29b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    gajim: removed not needed patch

commit c7bf7498c5d91670d9ee67deb29ae542f672eefe
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    pygtk2: proper fix for segfaulting bug with Python 2.7

diff --git a/chat-im/gajim/DETAILS b/chat-im/gajim/DETAILS
index 839675e..26c0ea7 100755
--- a/chat-im/gajim/DETAILS
+++ b/chat-im/gajim/DETAILS
@@ -1,5 +1,6 @@
            SPELL=gajim
          VERSION=0.14.1
+      PATCHLEVEL=1
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://www.gajim.org/downloads/$BRANCH/$SOURCE
diff --git a/chat-im/gajim/HISTORY b/chat-im/gajim/HISTORY
index fa09781..97e2f43 100644
--- a/chat-im/gajim/HISTORY
+++ b/chat-im/gajim/HISTORY
@@ -1,3 +1,7 @@
+2010-10-31 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: PATCHLEVEL=1
+       * PRE_BUILD, py27.patch: removed, not needed anymore
+
 2010-10-30 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.14.1
 
diff --git a/chat-im/gajim/PRE_BUILD b/chat-im/gajim/PRE_BUILD
deleted file mode 100755
index 9e42183..0000000
--- a/chat-im/gajim/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/py27.patch"
diff --git a/chat-im/gajim/py27.patch b/chat-im/gajim/py27.patch
deleted file mode 100644
index db9f7e9..0000000
--- a/chat-im/gajim/py27.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/gajim.py.orig  2010-03-28 13:35:54.000000000 +0400
-+++ src/gajim.py       2010-07-06 15:58:22.356292703 +0400
-@@ -130,8 +130,8 @@
- 
-       sys.stderr = MyStderr()
- 
--# PyGTK2.10+ only throws a warning
--warnings.filterwarnings('error', module='gtk')
-+# Don't make Gajim crash with Python 2.7
-+# warnings.filterwarnings('error', module='gtk')
- try:
-       import gtk
- except Warning, msg:
diff --git a/x11-toolkits/pygtk2/DETAILS b/x11-toolkits/pygtk2/DETAILS
index 5195a1a..a31dc7b 100755
--- a/x11-toolkits/pygtk2/DETAILS
+++ b/x11-toolkits/pygtk2/DETAILS
@@ -1,5 +1,6 @@
            SPELL=pygtk2
          VERSION=2.22.0
+      PATCHLEVEL=1
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=pygtk-$VERSION.tar.bz2
    SOURCE_URL[0]=$GNOME_URL/sources/pygtk/$BRANCH/$SOURCE
diff --git a/x11-toolkits/pygtk2/HISTORY b/x11-toolkits/pygtk2/HISTORY
index a9818c5..2ecd798 100644
--- a/x11-toolkits/pygtk2/HISTORY
+++ b/x11-toolkits/pygtk2/HISTORY
@@ -1,3 +1,8 @@
+2010-10-31 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: PATCHLEVEL=1
+       * PRE_BUILD: added, to apply patch
+       * py27.patch: added, to fix segfaults with recent python
+
 2010-09-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
        * DETAILS: updated spell to 2.22.0
 
diff --git a/x11-toolkits/pygtk2/PRE_BUILD b/x11-toolkits/pygtk2/PRE_BUILD
new file mode 100755
index 0000000..9e42183
--- /dev/null
+++ b/x11-toolkits/pygtk2/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/py27.patch"
diff --git a/x11-toolkits/pygtk2/py27.patch b/x11-toolkits/pygtk2/py27.patch
new file mode 100644
index 0000000..22cbc36
--- /dev/null
+++ b/x11-toolkits/pygtk2/py27.patch
@@ -0,0 +1,46 @@
+--- gtk/gtkmodule.c.orig
++++ gtk/gtkmodule.c
+@@ -227,8 +227,12 @@ init_gtk(void)
+     pygtk_add_stock_items(d);
+     
+     /* extension API */
+-    PyDict_SetItemString(d, "_PyGtk_API",
+-                       o=PyCObject_FromVoidPtr(&functions, NULL));
++#if PY_VERSION_HEX >= 0x02070000
++    o = PyCapsule_New(&functions, "gtk._gtk._PyGtk_API", NULL);
++#else
++    o = PyCObject_FromVoidPtr(&functions, NULL);
++#endif
++    PyDict_SetItemString(d, "_PyGtk_API", o);
+     Py_DECREF(o);
+       
+     PyGtkDeprecationWarning = 
PyErr_NewException("gtk.GtkDeprecationWarning",
+--- gtk/pygtk.h.orig
++++ gtk/pygtk.h
+@@ -60,6 +60,18 @@ struct _PyGtk_FunctionStruct *_PyGtk_API;
+ 
+ 
+ /* a function to initialise the pygtk functions */
++
++/* Python 2.7 introduced the PyCapsule API and deprecated the CObject API */
++#if PY_VERSION_HEX >= 0x02070000
++#define init_pygtk() G_STMT_START { \
++    void *capsule = PyCapsule_Import("gtk._gtk._PyGtk_API", 0); \
++    if (!capsule) { \
++        return; \
++    } \
++    _PyGtk_API = (struct _PyGtk_FunctionStruct*)capsule; \
++} G_STMT_END
++#else /* PY_VERSION_HEX */
++/* Python 2.6 and earlier use the CObject API */
+ #define init_pygtk() G_STMT_START { \
+     PyObject *pygtk = PyImport_ImportModule("gtk"); \
+     if (pygtk != NULL) { \
+@@ -79,6 +91,7 @@ struct _PyGtk_FunctionStruct *_PyGtk_API;
+         return; \
+     } \
+ } G_STMT_END
++#endif /* PY_VERSION_HEX */
+ 
+ #endif
+