From: Eric Bavier <ericbavier@gmail.com>
To: guix-devel@gnu.org
Cc: Eric Bavier <bavier@member.fsf.org>
Subject: [PATCH 11/13] gnu: Add python-pygobject.
Date: Thu, 20 Nov 2014 23:41:06 -0600 [thread overview]
Message-ID: <1416548468-28421-12-git-send-email-bavier@member.fsf.org> (raw)
In-Reply-To: <1416548468-28421-1-git-send-email-bavier@member.fsf.org>
* gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch:
New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/glib.scm (python-pygobject, python2-pygobject-2): New
variables.
---
gnu-system.am | 1 +
gnu/packages/glib.scm | 84 ++++++++++++++++++++
...on2-pygobject-2-gi-info-type-error-domain.patch | 39 +++++++++
3 files changed, 124 insertions(+)
create mode 100644 gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch
diff --git a/gnu-system.am b/gnu-system.am
index 6bdd6f0..41af6d1 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -408,6 +408,7 @@ dist_patch_DATA = \
gnu/packages/patches/python-libffi-mips-n32-fix.patch \
gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch \
gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch \
+ gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
gnu/packages/patches/qt4-tests.patch \
gnu/packages/patches/ratpoison-shell.patch \
gnu/packages/patches/readline-link-ncurses.patch \
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 9076643..494d3f9 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -22,6 +22,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages base)
@@ -37,6 +38,7 @@
#:use-module (gnu packages xml)
#:use-module (gnu packages bash)
#:use-module (gnu packages file)
+ #:use-module (gnu packages which)
#:use-module (gnu packages xorg)
#:use-module (gnu packages m4)
@@ -408,3 +410,85 @@ has an ease of use unmatched by other C++ callback libraries.")
"Glibmm provides a C++ programming interface to the part of GLib that are
useful for C++.")
(license license:lgpl2.1+)))
+
+(define-public python2-pygobject-2
+ (package
+ (name "python2-pygobject")
+ ;; This was the last version to declare the 2.0 platform number, i.e. its
+ ;; pkg-config files were named pygobject-2.0.pc
+ (version "2.28.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/pygobject/"
+ (version-major+minor version)
+ "/pygobject-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv"))
+ (patches
+ (list (search-patch
+ "python2-pygobject-2-gi-info-type-error-domain.patch")))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("which" ,which)
+ ("glib-bin" ,glib "bin") ;for tests: glib-compile-schemas
+ ("pkg-config" ,pkg-config)
+ ("dbus" ,dbus))) ;for tests
+ (inputs
+ `(("python" ,python-2)
+ ("glib" ,glib)
+ ("python2-py2cairo" ,python2-py2cairo)
+ ("gobject-introspection" ,gobject-introspection)))
+ (propagated-inputs
+ `(("libffi" ,libffi))) ;mentioned in pygobject-2.0.pc
+ (arguments
+ `(#:tests? #f ;segfaults during tests
+ #:configure-flags '("LIBS=-lcairo-gobject")))
+ (home-page "https://pypi.python.org/pypi/PyGObject")
+ (synopsis "Python bindings for GObject")
+ (description
+ "Python bindings for GLib, GObject, and GIO.")
+ (license license:lgpl2.1+)))
+
+(define-public python-pygobject
+ (package
+ (name "python-pygobject")
+ (version "3.12.2") ;last version that works with
+ ;gobject-introspection 1.38
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/pygobject/"
+ (version-major+minor version)
+ "/pygobject-" version ".tar.xz"))
+ (sha256
+ (base32
+ "08m5yad1hjdax4g39w6lgjk4124mcwpa8fc5iyvb8nygk8s3syky"))))
+ ;; 3.14.0: 0m1d75iwxa6k1xbkn6c6yq5r10pxnf7i5c2a5yvwsnab7ylzz7kp
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("which" ,which)
+ ("glib-bin" ,glib "bin") ;for tests: glib-compile-schemas
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("python" ,python)
+ ("glib" ,glib)
+ ("python-pycairo" ,python-pycairo)
+ ("gobject-introspection" ,gobject-introspection)
+ ("libffi" ,libffi)))
+ (arguments
+ ;; TODO: failing tests: test_native_calls_async
+ ;; test_native_calls_async_errors test_native_calls_sync
+ ;; test_native_calls_sync_errors test_python_calls_async
+ ;; test_python_calls_async_error test_python_calls_async_error_result
+ ;; test_python_calls_sync test_python_calls_sync_errors
+ ;; test_python_calls_sync_noargs test_callback_user_data_middle_none
+ ;; test_callback_user_data_middle_single
+ ;; test_callback_user_data_middle_tuple
+ '(#:tests? #f))
+ (home-page "https://pypi.python.org/pypi/PyGObject")
+ (synopsis "Python bindings for GObject")
+ (description
+ "Python bindings for GLib, GObject, and GIO.")
+ (license license:lgpl2.1+)))
diff --git a/gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch b/gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch
new file mode 100644
index 0000000..6a08e56
--- /dev/null
+++ b/gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch
@@ -0,0 +1,39 @@
+From e5df32ffbf37481dbb6a70c4d4e7b7b9778c5549 Mon Sep 17 00:00:00 2001
+From: "John (J5) Palmieri" <johnp@redhat.com>
+Date: Sat, 13 Aug 2011 04:13:28 -0400
+Subject: remove references to deprecated GI_INFO_TYPE_ERROR_DOMAIN
+
+
+diff --git a/gi/pygi-info.c b/gi/pygi-info.c
+index 8729e25..007b609 100644
+--- a/gi/pygi-info.c
++++ b/gi/pygi-info.c
+@@ -165,9 +165,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;
+@@ -484,7 +481,6 @@ _pygi_g_type_info_size (GITypeInfo *type_info)
+ 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:
+@@ -863,7 +859,6 @@ pygi_g_struct_info_is_simple (GIStructInfo *struct_info)
+ 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:
+--
+cgit v0.10.1
+
--
1.7.9.5
next prev parent reply other threads:[~2014-11-21 5:41 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-21 5:40 [PATCH 00/13] Add gourmet (and dependent python packages) Eric Bavier
2014-11-21 5:40 ` [PATCH 01/13] gnu: subversion: Propagate env variables to hooks Eric Bavier
2014-11-21 22:02 ` Ludovic Courtès
2014-11-21 22:24 ` Eric Bavier
2014-11-22 5:15 ` Eric Bavier
2014-11-22 11:02 ` Ludovic Courtès
2014-11-25 5:42 ` Eric Bavier
2014-11-25 8:03 ` Ludovic Courtès
2014-11-25 16:51 ` Eric Bavier
2014-11-25 17:09 ` Ludovic Courtès
2014-11-21 5:40 ` [PATCH 02/13] gnu: python: Add sqlite input Eric Bavier
2014-11-21 9:28 ` Ludovic Courtès
2014-11-21 13:11 ` Eric Bavier
2014-11-21 5:40 ` [PATCH 03/13] gnu: Add python-sqlalchemy Eric Bavier
2014-11-21 22:03 ` Ludovic Courtès
2014-11-21 5:40 ` [PATCH 04/13] gnu: Export symbols in (gnu packages image) upfront Eric Bavier
2014-11-21 5:41 ` [PATCH 05/13] gnu: Export ghostscript module symbols up-front Eric Bavier
2014-11-21 22:04 ` Ludovic Courtès
2014-11-21 22:27 ` Eric Bavier
2014-11-21 5:41 ` [PATCH 06/13] gnu: Add python-pillow Eric Bavier
2014-11-21 22:05 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 07/13] gnu: Add python-distutils-extra Eric Bavier
2014-11-21 22:07 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 08/13] gnu: Add python-elib.intl Eric Bavier
2014-11-21 22:06 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 09/13] guix: Add MPL1.1 license Eric Bavier
2014-11-21 22:08 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 10/13] gnu: Add python-pycairo Eric Bavier
2014-11-21 22:11 ` Ludovic Courtès
2014-11-21 5:41 ` Eric Bavier [this message]
2014-11-21 22:12 ` [PATCH 11/13] gnu: Add python-pygobject Ludovic Courtès
2014-11-21 5:41 ` [PATCH 12/13] gnu: Add python2-pygtk Eric Bavier
2014-11-21 22:10 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 13/13] gnu: Add gourmet Eric Bavier
2014-11-21 22:13 ` Ludovic Courtès
2014-11-21 9:21 ` [PATCH 00/13] Add gourmet (and dependent python packages) Andreas Enge
2014-11-21 21:27 ` Ludovic Courtès
2014-12-02 3:09 ` Eric Bavier
2014-12-02 8:33 ` Ludovic Courtès
2014-12-02 10:56 ` Andreas Enge
2014-12-02 12:49 ` Ludovic Courtès
2014-12-02 20:05 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1416548468-28421-12-git-send-email-bavier@member.fsf.org \
--to=ericbavier@gmail.com \
--cc=bavier@member.fsf.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).