Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (3f7e58fad3de8397e4a3e26b565a677ae14f556c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (3f7e58fad3de8397e4a3e26b565a677ae14f556c)
  • Date: Mon, 11 Jun 2012 15:45:50 -0500

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

gnome2-libs/pygobject/BUILD | 3 +++
gnome2-libs/pygobject/DEPENDS | 14 ++++++++++----
gnome2-libs/pygobject/HISTORY | 9 +++++++++
gnome2-libs/pygobject/PRE_BUILD | 4 ++++
gnome2-libs/pygobject/introspection.patch | 28 ++++++++++++++++++++++++++++
5 files changed, 54 insertions(+), 4 deletions(-)

New commits:
commit 3f7e58fad3de8397e4a3e26b565a677ae14f556c
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

pygobject: fix build with gobject-introspection

BUILD: only build with introspection if pygobject3 does not have
introspection enabled.
see https://bugzilla.gnome.org/show_bug.cgi?id=657054
DEPENDS: only depend on gobject-introspection if pygobject3 does not have
introspection enabled.
PRE_BUILD: added, apply patch to fix introspection
introspection.patch: added, remove depreciated references

diff --git a/gnome2-libs/pygobject/BUILD b/gnome2-libs/pygobject/BUILD
index c7d76f3..ea5c468 100755
--- a/gnome2-libs/pygobject/BUILD
+++ b/gnome2-libs/pygobject/BUILD
@@ -1,2 +1,5 @@
+if spell_ok pygobject3; then
+ OPTS="$OPTS --disable-introspection"
+fi &&
OPTS="$OPTS --enable-thread" &&
default_build
diff --git a/gnome2-libs/pygobject/DEPENDS b/gnome2-libs/pygobject/DEPENDS
index 26683a7..d26c97a 100755
--- a/gnome2-libs/pygobject/DEPENDS
+++ b/gnome2-libs/pygobject/DEPENDS
@@ -2,10 +2,16 @@ depends python &&
depends glib2 &&
depends pycairo &&

-optional_depends gobject-introspection \
- "--enable-introspection" \
- "--disable-introspection" \
- "to enable introspection" &&
+# introspection in pygoject3 conflicts with introspection in pygobject
+# https://bugzilla.gnome.org/show_bug.cgi?id=657054
+#if ! spell_ok pygobject3; then
+
+ optional_depends gobject-introspection \
+ "--enable-introspection" \
+ "--disable-introspection" \
+ "to enable introspection"
+
+#fi &&

optional_depends libffi \
"--with-ffi" \
diff --git a/gnome2-libs/pygobject/HISTORY b/gnome2-libs/pygobject/HISTORY
index b681377..70b14e7 100644
--- a/gnome2-libs/pygobject/HISTORY
+++ b/gnome2-libs/pygobject/HISTORY
@@ -1,3 +1,12 @@
+2012-06-11 Sukneet Basuta <sukneet AT sourcemage.org>
+ * BUILD: only build with introspection if pygobject3
+ does not have introspection enabled.
+ see https://bugzilla.gnome.org/show_bug.cgi?id=657054
+ * DEPENDS: only depend on gobject-introspection if pygobject3
+ does not have introspection enabled.
+ * PRE_BUILD: added, apply patch to fix introspection
+ * introspection.patch: added, remove depreciated references
+
2012-05-18 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: added missing optional dep on libffi

diff --git a/gnome2-libs/pygobject/PRE_BUILD b/gnome2-libs/pygobject/PRE_BUILD
new file mode 100755
index 0000000..9dafa11
--- /dev/null
+++ b/gnome2-libs/pygobject/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p0 < $SPELL_DIRECTORY/introspection.patch
diff --git a/gnome2-libs/pygobject/introspection.patch
b/gnome2-libs/pygobject/introspection.patch
new file mode 100644
index 0000000..0b63759
--- /dev/null
+++ b/gnome2-libs/pygobject/introspection.patch
@@ -0,0 +1,28 @@
+--- gi/pygi-info.c.orig 2011-06-13 16:30:25.000000000 +0000
++++ gi/pygi-info.c
+@@ -162,9 +162,6 @@ _pygi_info_new (GIBaseInfo *info)
+ case GI_INFO_TYPE_CONSTANT:
+ type = &PyGIConstantInfo_Type;
+ break;
+- case GI_INFO_TYPE_ERROR_DOMAIN:
+- type = &PyGIErrorDomainInfo_Type;
+- break;
+ case GI_INFO_TYPE_UNION:
+ type = &PyGIUnionInfo_Type;
+ break;
+@@ -481,7 +478,6 @@ _pygi_g_type_info_size (GITypeInfo *type
+ case GI_INFO_TYPE_INVALID:
+ case GI_INFO_TYPE_FUNCTION:
+ case GI_INFO_TYPE_CONSTANT:
+- case GI_INFO_TYPE_ERROR_DOMAIN:
+ case GI_INFO_TYPE_VALUE:
+ case GI_INFO_TYPE_SIGNAL:
+ case GI_INFO_TYPE_PROPERTY:
+@@ -860,7 +856,6 @@ pygi_g_struct_info_is_simple (GIStructIn
+ case GI_INFO_TYPE_INVALID:
+ case GI_INFO_TYPE_FUNCTION:
+ case GI_INFO_TYPE_CONSTANT:
+- case GI_INFO_TYPE_ERROR_DOMAIN:
+ case GI_INFO_TYPE_VALUE:
+ case GI_INFO_TYPE_SIGNAL:
+ case GI_INFO_TYPE_PROPERTY:



  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (3f7e58fad3de8397e4a3e26b565a677ae14f556c), Sukneet Basuta, 06/11/2012

Archive powered by MHonArc 2.6.24.

Top of Page