python3.pkgs.pygobject2: 2.28.6 -> 2.28.7
https://download.gnome.org/sources/pygobject/2.28/pygobject-2.28.7.news
This commit is contained in:
parent
1c329c9561
commit
4b8db0506f
|
@ -2,21 +2,17 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pygobject";
|
pname = "pygobject";
|
||||||
version = "2.28.6";
|
version = "2.28.7";
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz";
|
||||||
sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv";
|
sha256 = "0nkam61rsn7y3wik3vw46wk5q2cjfh2iph57hl9m39rc8jijb7dv";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "devdoc" ];
|
outputs = [ "out" "devdoc" ];
|
||||||
|
|
||||||
patches = [
|
patches = stdenv.lib.optionals stdenv.isDarwin [
|
||||||
# Fix warning spam
|
|
||||||
./pygobject-2.28.6-set_qdata.patch
|
|
||||||
./pygobject-2.28.6-gio-types-2.32.patch
|
|
||||||
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
|
||||||
./pygobject-2.0-fix-darwin.patch
|
./pygobject-2.0-fix-darwin.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -38,8 +34,8 @@ buildPythonPackage rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://live.gnome.org/PyGObject;
|
homepage = "https://pygobject.readthedocs.io/";
|
||||||
description = "Python bindings for Glib";
|
description = "Python bindings for GLib";
|
||||||
platforms = stdenv.lib.platforms.unix;
|
platforms = stdenv.lib.platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,50 +0,0 @@
|
||||||
From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ryan Lortie <desrt@desrt.ca>
|
|
||||||
Date: Mon, 12 Mar 2012 16:44:14 -0400
|
|
||||||
Subject: [PATCH] gio-types.defs: change some enums to flags
|
|
||||||
|
|
||||||
These flags types were originally incorrectly handled in glib as being
|
|
||||||
enums. That bug was fixed, but they're still enums here, leading to
|
|
||||||
warnings about the mismatch.
|
|
||||||
|
|
||||||
Change them to flags.
|
|
||||||
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=668522
|
|
||||||
---
|
|
||||||
gio/gio-types.defs | 6 +++---
|
|
||||||
1 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/gio/gio-types.defs b/gio/gio-types.defs
|
|
||||||
index 331e0bc..7eee5c8 100644
|
|
||||||
--- a/gio/gio-types.defs
|
|
||||||
+++ b/gio/gio-types.defs
|
|
||||||
@@ -526,7 +526,7 @@
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
-(define-enum MountMountFlags
|
|
||||||
+(define-flags MountMountFlags
|
|
||||||
(in-module "gio")
|
|
||||||
(c-name "GMountMountFlags")
|
|
||||||
(gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
|
|
||||||
@@ -545,7 +545,7 @@
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
-(define-enum DriveStartFlags
|
|
||||||
+(define-flags DriveStartFlags
|
|
||||||
(in-module "gio")
|
|
||||||
(c-name "GDriveStartFlags")
|
|
||||||
(gtype-id "G_TYPE_DRIVE_START_FLAGS")
|
|
||||||
@@ -770,7 +770,7 @@
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
-(define-enum SocketMsgFlags
|
|
||||||
+(define-flags SocketMsgFlags
|
|
||||||
(in-module "gio")
|
|
||||||
(c-name "GSocketMsgFlags")
|
|
||||||
(gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
|
|
||||||
--
|
|
||||||
1.7.8.5
|
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
From 42d871eb0b08ee6d55e95cc7e4b90844919555b9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ivan Stankovic <ivan.stankovic@avl.com>
|
|
||||||
Date: Tue, 21 Feb 2012 12:24:58 +0100
|
|
||||||
Subject: [PATCH] Fix set_qdata warning on accessing NULL gobject property
|
|
||||||
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=661155
|
|
||||||
---
|
|
||||||
gobject/pygobject.c | 4 +++-
|
|
||||||
1 files changed, 3 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/gobject/pygobject.c b/gobject/pygobject.c
|
|
||||||
index 6c2f06c..70dc89a 100644
|
|
||||||
--- a/gobject/pygobject.c
|
|
||||||
+++ b/gobject/pygobject.c
|
|
||||||
@@ -991,7 +991,9 @@ pygobject_new(GObject *obj)
|
|
||||||
PyObject *
|
|
||||||
pygobject_new_sunk(GObject *obj)
|
|
||||||
{
|
|
||||||
- g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1));
|
|
||||||
+ if (obj)
|
|
||||||
+ g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1));
|
|
||||||
+
|
|
||||||
return pygobject_new_full(obj, TRUE, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
1.7.8.5
|
|
||||||
|
|
Loading…
Reference in New Issue