r54705 - in /desktop/unstable/pygobject/debian: changelog patches/01_cairo_region.patch patches/series

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Fri Nov  3 16:48:48 2017
New Revision: 54705

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54705
Log:
Revert to 3.24.1-3 packaging

Added:
    desktop/unstable/pygobject/debian/patches/01_cairo_region.patch
Modified:
    desktop/unstable/pygobject/debian/changelog
    desktop/unstable/pygobject/debian/patches/series

Modified: desktop/unstable/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/changelog?rev=54705&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog	[utf-8] (original)
+++ desktop/unstable/pygobject/debian/changelog	[utf-8] Fri Nov  3 16:48:48 2017
@@ -1,11 +1,3 @@
-pygobject (3.26.0-1) UNRELEASED; urgency=medium
-
-  * BLOCKED BY PYCAIRO #878080
-  * New upstream release (Closes: #879638)
-  * Drop 01_cairo_region.patch: Applied in new release
-
- -- Jeremy Bicha <jbicha at debian.org>  Thu, 14 Sep 2017 19:14:04 -0400
-
 pygobject (3.24.1-3) unstable; urgency=medium
 
   [ Jeremy Bicha ]

Added: desktop/unstable/pygobject/debian/patches/01_cairo_region.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/01_cairo_region.patch?rev=54705&op=file
==============================================================================
--- desktop/unstable/pygobject/debian/patches/01_cairo_region.patch	(added)
+++ desktop/unstable/pygobject/debian/patches/01_cairo_region.patch	[utf-8] Fri Nov  3 16:48:48 2017
@@ -0,0 +1,80 @@
+From 132daac42d49e14686b05e8dad64b3652084d240 Mon Sep 17 00:00:00 2001
+From: Shyouzou Sugitani <shy at users.sourceforge.jp>
+Date: Wed, 13 Jun 2012 23:44:11 +0900
+Subject: [PATCH] add a foreign type for cairo_region_t.
+
+* the patch in https://bugs.freedesktop.org/show_bug.cgi?id=44336
+  is required for pycairo
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=667959
+Bug-Ubuntu: https://launchpad.net/bugs/1028115
+---
+ gi/pygi-foreign-cairo.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 44 insertions(+)
+
+Index: pygobject/gi/pygi-foreign-cairo.c
+===================================================================
+--- pygobject.orig/gi/pygi-foreign-cairo.c
++++ pygobject/gi/pygi-foreign-cairo.c
+@@ -368,6 +368,46 @@ cairo_pattern_from_gvalue (const GValue
+ }
+ 
+ 
++#if PY_VERSION_HEX >= 0x03000000
++static PyObject *
++cairo_region_to_arg (PyObject        *value,
++                     GIInterfaceInfo *interface_info,
++                     GITransfer       transfer,
++                     GIArgument      *arg)
++{
++    cairo_region_t *region;
++
++    g_assert (transfer == GI_TRANSFER_NOTHING);
++
++    region = ( (PycairoRegion*) value)->region;
++    if (!region) {
++        PyErr_SetString (PyExc_ValueError, "Region instance wrapping a NULL region");
++        return NULL;
++    }
++
++    arg->v_pointer = region;
++    Py_RETURN_NONE;
++}
++
++static PyObject *
++cairo_region_from_arg (GIInterfaceInfo *interface_info, gpointer data)
++{
++    cairo_region_t *region = (cairo_region_t*) data;
++
++    cairo_region_reference (region);
++
++    return PycairoRegion_FromRegion (region);
++}
++
++static PyObject *
++cairo_region_release (GIBaseInfo *base_info,
++                      gpointer    struct_)
++{
++    cairo_region_destroy ( (cairo_region_t*) struct_);
++    Py_RETURN_NONE;
++}
++#endif
++
+ static PyMethodDef _gi_cairo_functions[] = { {0,} };
+ PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo")
+ {
+@@ -406,6 +446,14 @@ PYGLIB_MODULE_START(_gi_cairo, "_gi_cair
+                                   cairo_font_options_from_arg,
+                                   cairo_font_options_release);
+ 
++#if PY_VERSION_HEX >= 0x03000000
++    pygi_register_foreign_struct ("cairo",
++                                  "Region",
++                                  cairo_region_to_arg,
++                                  cairo_region_from_arg,
++                                  cairo_region_release);
++#endif
++
+     pyg_register_gtype_custom (CAIRO_GOBJECT_TYPE_CONTEXT,
+                                cairo_context_from_gvalue,
+                                cairo_context_to_gvalue);

Modified: desktop/unstable/pygobject/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/series?rev=54705&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/pygobject/debian/patches/series	[utf-8] Fri Nov  3 16:48:48 2017
@@ -0,0 +1 @@
+01_cairo_region.patch