Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0f3f51ccd6b5631c5cb604c2f0683ecd6d178581)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0f3f51ccd6b5631c5cb604c2f0683ecd6d178581)
  • Date: Tue, 3 Aug 2010 00:34:28 -0500

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

devel/python/DETAILS | 2 +-
devel/python/HISTORY | 4 ----
gnome2-libs/gobject-introspection/DETAILS | 1 +
gnome2-libs/gobject-introspection/HISTORY | 6 ++++++
gnome2-libs/gobject-introspection/PRE_BUILD | 4 ++++
gnome2-libs/gobject-introspection/py27.patch | 24 ++++++++++++++++++++++++
6 files changed, 36 insertions(+), 5 deletions(-)

New commits:
commit 0f3f51ccd6b5631c5cb604c2f0683ecd6d178581
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "python: downgraded to 2.6.5 again, too many breakage with 2.7"

This reverts commit e60de48d88510237e8935ec96c5d7b182c37276b.

Blocking upstream GI bug has been fixed. Come back to new Python.

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

gobject-introspection: fixed bug with Python 2.7

diff --git a/devel/python/DETAILS b/devel/python/DETAILS
index 6c95fc0..6bc430c 100755
--- a/devel/python/DETAILS
+++ b/devel/python/DETAILS
@@ -1,5 +1,5 @@
SPELL=python
- VERSION=2.6.5
+ VERSION=2.7
SOURCE=Python-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index ef76134..0ca5ae4 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,7 +1,3 @@
-2010-07-14 Arjan Bouter <abouter AT sourcemage.org>
- * DETAILS: downgraded to 2.6.5 again, too many xml and
- gobject-introspection related breakage.
-
2010-07-06 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.7
* CONFIGURE: use sentence case; added signal module selection
diff --git a/gnome2-libs/gobject-introspection/DETAILS
b/gnome2-libs/gobject-introspection/DETAILS
index 8ce2013..4a3ad93 100755
--- a/gnome2-libs/gobject-introspection/DETAILS
+++ b/gnome2-libs/gobject-introspection/DETAILS
@@ -1,5 +1,6 @@
SPELL=gobject-introspection
VERSION=0.6.14
+ PATCHLEVEL=1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-libs/gobject-introspection/HISTORY
b/gnome2-libs/gobject-introspection/HISTORY
index 99fb152..419baa6 100644
--- a/gnome2-libs/gobject-introspection/HISTORY
+++ b/gnome2-libs/gobject-introspection/HISTORY
@@ -1,3 +1,9 @@
+2010-08-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: added, to apply the patch
+ * py27.patch: added, upstream patch to fix a bug with Python 2.7 from
+ http://bugzilla.gnome.org/show_bug.cgi?id=618562
+
2010-06-12 Robin Cook <rcook AT wyrms.net>
* DEPENDS: added cairo

diff --git a/gnome2-libs/gobject-introspection/PRE_BUILD
b/gnome2-libs/gobject-introspection/PRE_BUILD
new file mode 100755
index 0000000..9e42183
--- /dev/null
+++ b/gnome2-libs/gobject-introspection/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/py27.patch"
diff --git a/gnome2-libs/gobject-introspection/py27.patch
b/gnome2-libs/gobject-introspection/py27.patch
new file mode 100644
index 0000000..5e89693
--- /dev/null
+++ b/gnome2-libs/gobject-introspection/py27.patch
@@ -0,0 +1,24 @@
+--- giscanner/sourcescanner.py
++++ giscanner/sourcescanner.py
+@@ -196,7 +196,7 @@ class SourceSymbol(object):
+ class SourceScanner(object):
+
+ def __init__(self):
+- with LibtoolImporter:
++ with LibtoolImporter(None, None):
+ from giscanner._giscanner import SourceScanner
+ self._scanner = SourceScanner()
+ self._filenames = []
+diff --git a/giscanner/xmlwriter.py b/giscanner/xmlwriter.py
+index 0db286b..c10bcc6 100644
+--- giscanner/xmlwriter.py
++++ giscanner/xmlwriter.py
+@@ -67,7 +67,7 @@ def collect_attributes(tag_name, attributes, self_indent,
+ return attr_value
+
+
+-with LibtoolImporter:
++with LibtoolImporter(None, None):
+ from giscanner._giscanner import collect_attributes
+
+



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0f3f51ccd6b5631c5cb604c2f0683ecd6d178581), Vlad Glagolev, 08/03/2010

Archive powered by MHonArc 2.6.24.

Top of Page