[pkgsrc/trunk]: pkgsrc/x11/py-gtk2 py-gtk2: fix build

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8e00aeae8c9f
branches:  trunk
changeset: 400496:8e00aeae8c9f
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Aug 29 10:33:59 2019 +0000

description:
py-gtk2: fix build

pango deprecated some symbols; remove them from the mapping files.
While here, add comments to patches.

Bump PKGREVISION.

diffstat:

 x11/py-gtk2/Makefile                       |    4 +-
 x11/py-gtk2/distinfo                       |    9 +-
 x11/py-gtk2/patches/patch-aa               |    6 +-
 x11/py-gtk2/patches/patch-configure        |    6 +-
 x11/py-gtk2/patches/patch-pango-types.defs |   48 ++
 x11/py-gtk2/patches/patch-pango.defs       |  509 +++++++++++++++++++++++++++++
 x11/py-gtk2/patches/patch-pango.override   |   42 ++
 7 files changed, 617 insertions(+), 7 deletions(-)

diffs (truncated from 672 to 300 lines):

diff -r 9934078d129f -r 8e00aeae8c9f x11/py-gtk2/Makefile
--- a/x11/py-gtk2/Makefile      Thu Aug 29 10:14:03 2019 +0000
+++ b/x11/py-gtk2/Makefile      Thu Aug 29 10:33:59 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.118 2019/07/21 22:24:19 wiz Exp $
+# $NetBSD: Makefile,v 1.119 2019/08/29 10:33:59 wiz Exp $
 
 DISTNAME=      pygtk-2.24.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
-PKGREVISION=   27
+PKGREVISION=   28
 CATEGORIES=    x11 python
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/pygtk/2.24/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 9934078d129f -r 8e00aeae8c9f x11/py-gtk2/distinfo
--- a/x11/py-gtk2/distinfo      Thu Aug 29 10:14:03 2019 +0000
+++ b/x11/py-gtk2/distinfo      Thu Aug 29 10:33:59 2019 +0000
@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.30 2016/04/11 07:50:32 dbj Exp $
+$NetBSD: distinfo,v 1.31 2019/08/29 10:33:59 wiz Exp $
 
 SHA1 (pygtk-2.24.0.tar.bz2) = 344e6a32a5e8c7e0aaeb807e0636a163095231c2
 RMD160 (pygtk-2.24.0.tar.bz2) = 33f597def646261483cbbf5491aeb27bf0d22ea6
 SHA512 (pygtk-2.24.0.tar.bz2) = 64f4344fcf7636e0b2016ffd5310250b5c02a1bf87e44aef39b5d4cf4a5fc50d27cb4f030d4c6802cff61fffb88dee7752821e3d8a4cd1c34dc3745d9ff2f0da
 Size (pygtk-2.24.0.tar.bz2) = 2361097 bytes
-SHA1 (patch-aa) = 5ea14628612cb204323ef6e169acb57a0887e737
-SHA1 (patch-configure) = 30ef4f05e737f7f29a841ebcff3595afb5a1dc2b
+SHA1 (patch-aa) = 51c8279969ccaa027019ac8f15191b29db851ba0
+SHA1 (patch-configure) = 6c3ea1881685b0d3be49c667054aecbf5ac05b0e
 SHA1 (patch-configure.ac) = f09ff6d8e2f8989a175b60ae288408a56d41f233
 SHA1 (patch-gtk_Makefile.am) = 50556ac7074c9156db574e4a60863ff00e638981
 SHA1 (patch-gtk_Makefile.in) = 4fed9e802bd0e306e5070cf2ac7e44c86715a3e7
+SHA1 (patch-pango-types.defs) = 386bd3b60595a6741dcae15b35977f5a3e6b3342
+SHA1 (patch-pango.defs) = e8ec316ddd635291ba958001b7cc729b14e9ec37
+SHA1 (patch-pango.override) = d7e5919d3e7c753900a15c63e9e8354c9d03a8c2
diff -r 9934078d129f -r 8e00aeae8c9f x11/py-gtk2/patches/patch-aa
--- a/x11/py-gtk2/patches/patch-aa      Thu Aug 29 10:14:03 2019 +0000
+++ b/x11/py-gtk2/patches/patch-aa      Thu Aug 29 10:33:59 2019 +0000
@@ -1,4 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2009/09/10 19:03:48 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2019/08/29 10:33:59 wiz Exp $
+
+revision 1.1
+date: 2008-03-14 15:20:22 +0100;  author: drochner;  state: Exp;
+fix locking around gtk mainloop, bump PKGREVISION
 
 --- gtk/gtk.override.orig      2009-08-12 22:55:36.000000000 +0000
 +++ gtk/gtk.override
diff -r 9934078d129f -r 8e00aeae8c9f x11/py-gtk2/patches/patch-configure
--- a/x11/py-gtk2/patches/patch-configure       Thu Aug 29 10:14:03 2019 +0000
+++ b/x11/py-gtk2/patches/patch-configure       Thu Aug 29 10:33:59 2019 +0000
@@ -1,4 +1,8 @@
-$NetBSD: patch-configure,v 1.1 2016/04/11 07:50:32 dbj Exp $
+$NetBSD: patch-configure,v 1.2 2019/08/29 10:33:59 wiz Exp $
+
+revision 1.1
+date: 2016-04-11 09:50:32 +0200;  author: dbj;  state: Exp;  commitid: fyA5JcCRzWk9jb2z;
+fix support for gtk2 built for quartz instead of x11
 
 --- configure.orig     2011-04-01 10:41:02.000000000 +0000
 +++ configure
diff -r 9934078d129f -r 8e00aeae8c9f x11/py-gtk2/patches/patch-pango-types.defs
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/py-gtk2/patches/patch-pango-types.defs        Thu Aug 29 10:33:59 2019 +0000
@@ -0,0 +1,48 @@
+$NetBSD: patch-pango-types.defs,v 1.1 2019/08/29 10:33:59 wiz Exp $
+
+pango deprecated some symbols
+
+--- pango-types.defs.orig      2011-04-01 10:37:25.000000000 +0000
++++ pango-types.defs
+@@ -120,27 +120,6 @@
+   (gtype-id "PANGO_TYPE_CONTEXT")
+ )
+ 
+-(define-object Engine
+-  (in-module "Pango")
+-  (parent "GObject")
+-  (c-name "PangoEngine")
+-  (gtype-id "PANGO_TYPE_ENGINE")
+-)
+-
+-(define-object EngineLang
+-  (in-module "Pango")
+-  (parent "PangoEngine")
+-  (c-name "PangoEngineLang")
+-  (gtype-id "PANGO_TYPE_ENGINE_LANG")
+-)
+-
+-(define-object EngineShape
+-  (in-module "Pango")
+-  (parent "PangoEngine")
+-  (c-name "PangoEngineShape")
+-  (gtype-id "PANGO_TYPE_ENGINE_SHAPE")
+-)
+-
+ (define-object Font
+   (in-module "Pango")
+   (parent "GObject")
+@@ -176,13 +155,6 @@
+   (gtype-id "PANGO_TYPE_FONTSET")
+ )
+ 
+-(define-object FontsetSimple
+-  (in-module "Pango")
+-  (parent "PangoFontset")
+-  (c-name "PangoFontsetSimple")
+-  (gtype-id "PANGO_TYPE_FONTSET_SIMPLE")
+-)
+-
+ (define-object Layout
+   (in-module "Pango")
+   (parent "GObject")
diff -r 9934078d129f -r 8e00aeae8c9f x11/py-gtk2/patches/patch-pango.defs
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/py-gtk2/patches/patch-pango.defs      Thu Aug 29 10:33:59 2019 +0000
@@ -0,0 +1,509 @@
+$NetBSD: patch-pango.defs,v 1.1 2019/08/29 10:33:59 wiz Exp $
+
+pango deprecated some symbols
+
+--- pango.defs.orig    2011-04-01 10:37:25.000000000 +0000
++++ pango.defs
+@@ -390,16 +390,6 @@
+   )
+ )
+ 
+-(define-method get_font
+-  (of-object "PangoAttrIterator")
+-  (c-name "pango_attr_iterator_get_font")
+-  (return-type "none")
+-  (parameters
+-    '("PangoFontDescription*" "desc")
+-    '("PangoLanguage**" "language")
+-    '("GSList**" "extra_attrs")
+-  )
+-)
+ 
+ (define-method get_attrs
+   (of-object "PangoAttrIterator")
+@@ -513,11 +503,6 @@
+   )
+ )
+ 
+-(define-method get_font_map
+-  (of-object "PangoContext")
+-  (c-name "pango_context_get_font_map")
+-  (return-type "PangoFontMap*")
+-)
+ 
+ (define-method list_families
+   (of-object "PangoContext")
+@@ -550,17 +535,6 @@
+   )
+ )
+ 
+-(define-method get_metrics
+-  (of-object "PangoContext")
+-  (c-name "pango_context_get_metrics")
+-  (return-type "PangoFontMetrics*")
+-  (caller-owns-return #t)
+-  (parameters
+-    '("const-PangoFontDescription*" "desc")
+-    '("PangoLanguage*" "language" (null-ok) (default "NULL"))
+-  )
+-)
+-
+ (define-method set_font_description
+   (of-object "PangoContext")
+   (c-name "pango_context_set_font_description")
+@@ -576,12 +550,6 @@
+   (return-type "PangoFontDescription*")
+ )
+ 
+-(define-method get_language
+-  (of-object "PangoContext")
+-  (c-name "pango_context_get_language")
+-  (return-type "PangoLanguage*")
+-)
+-
+ (define-method set_language
+   (of-object "PangoContext")
+   (c-name "pango_context_set_language")
+@@ -763,61 +731,6 @@
+ 
+ 
+ 
+-;; From pango-engine.h
+-
+-(ifdef PANGO_ENABLE_ENGINE
+-
+-(define-function engine_get_type
+-  (c-name "pango_engine_get_type")
+-  (return-type "GType")
+-)
+-
+-(define-function engine_lang_get_type
+-  (c-name "pango_engine_lang_get_type")
+-  (return-type "GType")
+-)
+-
+-(define-function engine_shape_get_type
+-  (c-name "pango_engine_shape_get_type")
+-  (return-type "GType")
+-)
+-
+-(define-virtual script_break
+-  (of-object "PangoEngineLang")
+-  (return-type "none")
+-  (parameters
+-    '("const-char*" "text")
+-    '("int" "len")
+-    '("PangoAnalysis*" "analysis")
+-    '("PangoLogAttr*" "attrs")
+-    '("int" "attrs_len")
+-  )
+-)
+-
+-(define-virtual script_shape
+-  (of-object "PangoEngineShape")
+-  (return-type "none")
+-  (parameters
+-    '("PangoFont*" "font")
+-    '("const-char*" "text")
+-    '("int" "length")
+-    '("PangoAnalysis*" "analysis")
+-    '("PangoGlyphString*" "glyphs")
+-  )
+-)
+-
+-(define-virtual covers
+-  (of-object "PangoEngineShape")
+-  (return-type "PangoCoverageLevel")
+-  (parameters
+-    '("PangoFont*" "font")
+-    '("PangoLanguage*" "language")
+-    '("gunichar" "wc")
+-  )
+-)
+-) ;; PANGO_ENABLE_ENGINE
+-
+-
+ ;; From pango-enum-types.h
+ 
+ (define-function attr_type_get_type
+@@ -1241,35 +1154,11 @@
+   )
+ )
+ 
+-(define-method get_name
+-  (of-object "PangoFontFamily")
+-  (c-name "pango_font_family_get_name")
+-  (return-type "const-char*")
+-)
+-
+-(define-method is_monospace
+-  (of-object "PangoFontFamily")
+-  (c-name "pango_font_family_is_monospace")
+-  (return-type "gboolean")
+-)
+-
+ (define-function pango_font_face_get_type
+   (c-name "pango_font_face_get_type")
+   (return-type "GType")
+ )
+ 
+-(define-method describe
+-  (of-object "PangoFontFace")
+-  (c-name "pango_font_face_describe")
+-  (return-type "PangoFontDescription*")
+-  (caller-owns-return #t)
+-)
+-
+-(define-method get_face_name
+-  (of-object "PangoFontFace")
+-  (c-name "pango_font_face_get_face_name")
+-  (return-type "const-char*")
+-)
+ 
+ (define-method list_sizes
+   (of-object "PangoFontFace")
+@@ -1286,13 +1175,6 @@
+   (return-type "GType")
+ )
+ 
+-(define-method describe
+-  (of-object "PangoFont")
+-  (c-name "pango_font_describe")
+-  (return-type "PangoFontDescription*")
+-  (caller-owns-return #t)
+-)
+-
+ (define-method get_coverage
+   (of-object "PangoFont")
+   (c-name "pango_font_get_coverage")
+@@ -1303,25 +1185,6 @@
+   )
+ )
+ 
+-(define-method find_shaper