python-gtk:dep fixed
This commit is contained in:
@@ -0,0 +1,59 @@
|
|||||||
|
From eca72baa5616fbe4dbebea43c7e5940847dc5ab8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Owen W. Taylor" <otaylor@fishsoup.net>
|
||||||
|
Date: Tue, 27 Sep 2011 00:17:52 -0400
|
||||||
|
Subject: Fix leaks of Pango objects
|
||||||
|
|
||||||
|
Gtk.PrintContext.create_pango_context()
|
||||||
|
Gtk.PrintContext.create_pango_layout()
|
||||||
|
pangocairo.CairoContext.create_layout()
|
||||||
|
|
||||||
|
were leaking the objects they returned.
|
||||||
|
|
||||||
|
https://bugzilla.gnome.org/show_bug.cgi?id=660216
|
||||||
|
|
||||||
|
diff --git a/gtk/gtk-2.10.defs b/gtk/gtk-2.10.defs
|
||||||
|
index 69c7e0c..faa45e1 100644
|
||||||
|
--- a/gtk/gtk-2.10.defs
|
||||||
|
+++ b/gtk/gtk-2.10.defs
|
||||||
|
@@ -1388,12 +1388,14 @@
|
||||||
|
(define-method create_pango_context
|
||||||
|
(of-object "GtkPrintContext")
|
||||||
|
(c-name "gtk_print_context_create_pango_context")
|
||||||
|
+ (caller-owns-return #t)
|
||||||
|
(return-type "PangoContext*")
|
||||||
|
)
|
||||||
|
|
||||||
|
(define-method create_pango_layout
|
||||||
|
(of-object "GtkPrintContext")
|
||||||
|
(c-name "gtk_print_context_create_pango_layout")
|
||||||
|
+ (caller-owns-return #t)
|
||||||
|
(return-type "PangoLayout*")
|
||||||
|
)
|
||||||
|
|
||||||
|
diff --git a/pangocairo.override b/pangocairo.override
|
||||||
|
index bb923e6..5101107 100644
|
||||||
|
--- a/pangocairo.override
|
||||||
|
+++ b/pangocairo.override
|
||||||
|
@@ -118,11 +118,16 @@ _wrap_pango_cairo_update_context(PyGObject *self, PyObject *args, PyObject *kwar
|
||||||
|
static PyObject *
|
||||||
|
_wrap_pango_cairo_create_layout(PyGObject *self)
|
||||||
|
{
|
||||||
|
- PangoLayout *ret;
|
||||||
|
+ PangoLayout *layout;
|
||||||
|
+ PyObject *ret;
|
||||||
|
|
||||||
|
- ret = pango_cairo_create_layout(PycairoContext_GET(self));
|
||||||
|
+ layout = pango_cairo_create_layout(PycairoContext_GET(self));
|
||||||
|
/* pygobject_new handles NULL checking */
|
||||||
|
- return pygobject_new((GObject *)ret);
|
||||||
|
+ ret = pygobject_new((GObject *)layout);
|
||||||
|
+ if (layout)
|
||||||
|
+ g_object_unref(layout);
|
||||||
|
+
|
||||||
|
+ return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
--
|
||||||
|
cgit v0.10.2
|
||||||
|
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
diff --git a/gtk/gtkmodule.c b/gtk/gtkmodule.c
|
||||||
|
index c0e1493..aa8cf10 100644
|
||||||
|
--- a/gtk/gtkmodule.c
|
||||||
|
+++ b/gtk/gtkmodule.c
|
||||||
|
@@ -227,8 +227,12 @@ init_gtk(void)
|
||||||
|
pygtk_add_stock_items(d);
|
||||||
|
|
||||||
|
/* extension API */
|
||||||
|
- PyDict_SetItemString(d, "_PyGtk_API",
|
||||||
|
- o=PyCObject_FromVoidPtr(&functions, NULL));
|
||||||
|
+#if PY_VERSION_HEX >= 0x02070000
|
||||||
|
+ o = PyCapsule_New(&functions, "gtk._gtk._PyGtk_API", NULL);
|
||||||
|
+#else
|
||||||
|
+ o = PyCObject_FromVoidPtr(&functions, NULL);
|
||||||
|
+#endif
|
||||||
|
+ PyDict_SetItemString(d, "_PyGtk_API", o);
|
||||||
|
Py_DECREF(o);
|
||||||
|
|
||||||
|
PyGtkDeprecationWarning = PyErr_NewException("gtk.GtkDeprecationWarning",
|
||||||
|
diff --git a/gtk/pygtk.h b/gtk/pygtk.h
|
||||||
|
index 573c3b9..e4c680f 100644
|
||||||
|
--- a/gtk/pygtk.h
|
||||||
|
+++ b/gtk/pygtk.h
|
||||||
|
@@ -60,6 +60,18 @@ struct _PyGtk_FunctionStruct *_PyGtk_API;
|
||||||
|
|
||||||
|
|
||||||
|
/* a function to initialise the pygtk functions */
|
||||||
|
+
|
||||||
|
+/* Python 2.7 introduced the PyCapsule API and deprecated the CObject API */
|
||||||
|
+#if PY_VERSION_HEX >= 0x02070000
|
||||||
|
+#define init_pygtk() G_STMT_START { \
|
||||||
|
+ void *capsule = PyCapsule_Import("gtk._gtk._PyGtk_API", 0); \
|
||||||
|
+ if (!capsule) { \
|
||||||
|
+ return; \
|
||||||
|
+ } \
|
||||||
|
+ _PyGtk_API = (struct _PyGtk_FunctionStruct*)capsule; \
|
||||||
|
+} G_STMT_END
|
||||||
|
+#else /* PY_VERSION_HEX */
|
||||||
|
+/* Python 2.6 and earlier use the CObject API */
|
||||||
|
#define init_pygtk() G_STMT_START { \
|
||||||
|
PyObject *pygtk = PyImport_ImportModule("gtk"); \
|
||||||
|
if (pygtk != NULL) { \
|
||||||
|
@@ -79,6 +91,7 @@ struct _PyGtk_FunctionStruct *_PyGtk_API;
|
||||||
|
return; \
|
||||||
|
} \
|
||||||
|
} G_STMT_END
|
||||||
|
+#endif /* PY_VERSION_HEX */
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
@@ -22,17 +22,23 @@
|
|||||||
<Dependency>libglade-devel</Dependency>
|
<Dependency>libglade-devel</Dependency>
|
||||||
<Dependency>python-pygobject-devel</Dependency>
|
<Dependency>python-pygobject-devel</Dependency>
|
||||||
<Dependency>python-numpy</Dependency>
|
<Dependency>python-numpy</Dependency>
|
||||||
<Dependency>python-cairo</Dependency>
|
<Dependency>python-cairo-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
|
<Patches>
|
||||||
|
<Patch level="1">fix-leaks-of-pango-objects.patch</Patch>
|
||||||
|
<Patch level="1">python27.patch</Patch>
|
||||||
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
<Package>
|
<Package>
|
||||||
<Name>python-gtk</Name>
|
<Name>python-gtk</Name>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency>pango</Dependency>
|
|
||||||
<Dependency>atk</Dependency>
|
<Dependency>atk</Dependency>
|
||||||
<Dependency>gtk2</Dependency>
|
<Dependency>gtk2</Dependency>
|
||||||
<Dependency>cairo</Dependency>
|
<Dependency>cairo</Dependency>
|
||||||
|
<Dependency>glib2</Dependency>
|
||||||
|
<Dependency>pango</Dependency>
|
||||||
|
<Dependency>libglade</Dependency>
|
||||||
<Dependency>gdk-pixbuf</Dependency>
|
<Dependency>gdk-pixbuf</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
@@ -84,6 +90,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="4">
|
||||||
|
<Date>2016-03-05</Date>
|
||||||
|
<Version>2.24.0</Version>
|
||||||
|
<Comment>Dep Fixed</Comment>
|
||||||
|
<Name>Alihan Öztürk</Name>
|
||||||
|
<Email>alihan@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
<Update release="3">
|
<Update release="3">
|
||||||
<Date>2013-08-17</Date>
|
<Date>2013-08-17</Date>
|
||||||
<Version>2.24.0</Version>
|
<Version>2.24.0</Version>
|
||||||
@@ -106,4 +119,4 @@
|
|||||||
<Email>admins@pisilinux.org</Email>
|
<Email>admins@pisilinux.org</Email>
|
||||||
</Update>
|
</Update>
|
||||||
</History>
|
</History>
|
||||||
</PISI>
|
</PISI>
|
||||||
|
|||||||
Reference in New Issue
Block a user