mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 22:03:54 +03:00
pygobject: fix some warnings
This commit is contained in:
parent
16e2dd9a72
commit
9f44ad975b
@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
outputs = [ "out" "docdev" ];
|
outputs = [ "out" "docdev" ];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Fix warning spam
|
||||||
|
./pygobject-2.28.6-set_qdata.patch
|
||||||
|
./pygobject-2.28.6-gio-types-2.32.patch
|
||||||
|
];
|
||||||
|
|
||||||
configureFlags = "--disable-introspection";
|
configureFlags = "--disable-introspection";
|
||||||
|
|
||||||
buildInputs = [ python pkgconfig glib ];
|
buildInputs = [ python pkgconfig glib ];
|
||||||
|
@ -0,0 +1,50 @@
|
|||||||
|
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
|
||||||
|
|
@ -0,0 +1,28 @@
|
|||||||
|
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
Block a user