summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSukneet Basuta2012-06-11 16:44:38 -0400
committerVlad Glagolev2012-06-14 12:39:19 +0400
commit8653da279cab96dbadcc2b3e7b29a393667053a8 (patch)
tree18aedfaa99dadc001924f84d7f00972da6d209d6
parentdca9b923ac6e4208471044d83971c672c3005b5c (diff)
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 (cherry picked from commit 3f7e58fad3de8397e4a3e26b565a677ae14f556c)
-rwxr-xr-xgnome2-libs/pygobject/BUILD3
-rwxr-xr-xgnome2-libs/pygobject/DEPENDS14
-rw-r--r--gnome2-libs/pygobject/HISTORY9
-rwxr-xr-xgnome2-libs/pygobject/PRE_BUILD4
-rw-r--r--gnome2-libs/pygobject/introspection.patch28
5 files changed, 54 insertions, 4 deletions
diff --git a/gnome2-libs/pygobject/BUILD b/gnome2-libs/pygobject/BUILD
index c7d76f3f05..ea5c4680cf 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 26683a749b..d26c97a4a2 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 b681377151..70b14e71d9 100644
--- a/gnome2-libs/pygobject/HISTORY
+++ b/gnome2-libs/pygobject/HISTORY
@@ -1,3 +1,12 @@
+2012-06-11 Sukneet Basuta <sukneet@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@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 0000000000..9dafa11da4
--- /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 0000000000..0b63759153
--- /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: