[pkgsrc/trunk]: pkgsrc/x11/py-gtk2 remove again patches/patch-pango.defs, it ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ef221275cafb
branches:  trunk
changeset: 423063:ef221275cafb
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sun Feb 09 17:15:08 2020 +0000

description:
remove again patches/patch-pango.defs, it doesn't appear to actually
prevent the build, and the removed interfaces such as PangoFcFamily->get_name()
are used by applications (encountered with gramps3)

bump PKGREVISION so that packages can depend on updated version

discussed with wiz*

diffstat:

 x11/py-gtk2/Makefile                 |    4 +-
 x11/py-gtk2/patches/patch-pango.defs |  509 -----------------------------------
 2 files changed, 2 insertions(+), 511 deletions(-)

diffs (truncated from 527 to 300 lines):

diff -r 39a821adba9c -r ef221275cafb x11/py-gtk2/Makefile
--- a/x11/py-gtk2/Makefile      Sun Feb 09 15:37:12 2020 +0000
+++ b/x11/py-gtk2/Makefile      Sun Feb 09 17:15:08 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.122 2019/11/03 09:14:14 rillig Exp $
+# $NetBSD: Makefile,v 1.123 2020/02/09 17:15:08 jdolecek Exp $
 
 DISTNAME=      pygtk-2.24.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
-PKGREVISION=   29
+PKGREVISION=   30
 CATEGORIES=    x11 python
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/pygtk/2.24/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 39a821adba9c -r ef221275cafb x11/py-gtk2/patches/patch-pango.defs
--- a/x11/py-gtk2/patches/patch-pango.defs      Sun Feb 09 15:37:12 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,509 +0,0 @@
-$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
--  (of-object "PangoFont")
--  (c-name "pango_font_find_shaper")
--  (return-type "PangoEngineShape*")
--  (parameters
--    '("PangoLanguage*" "language")
--    '("guint32" "ch")
--  )
--)
--
--(define-method get_metrics
--  (of-object "PangoFont")
--  (c-name "pango_font_get_metrics")
--  (return-type "PangoFontMetrics*")
--  (caller-owns-return #t)
--  (parameters
--    '("PangoLanguage*" "language" (null-ok) (default "NULL"))
--  )
--)
- 
- (define-method get_glyph_extents
-   (of-object "PangoFont")
-@@ -1334,11 +1197,6 @@
-   )
- )
- 
--(define-method get_font_map
--  (of-object "PangoFont")
--  (c-name "pango_font_get_font_map")
--  (return-type "PangoFontMap*")
--)
-  
- (define-virtual list_faces
-   (of-object "PangoFontFamily")
-@@ -1349,25 +1207,7 @@
-   )
- )
- 
--(define-virtual get_name
--  (of-object "PangoFontFamily")
--  (return-type "const-char*")
--)
--
--(define-virtual is_monospace
--  (of-object "PangoFontFamily")
--  (return-type "gboolean")
--)
--
--(define-virtual get_face_name
--  (of-object "PangoFontFace")
--  (return-type "const-char*")
--)
- 
--(define-virtual describe
--  (of-object "PangoFontFace")
--  (return-type "PangoFontDescription*")
--)
- 
- (define-virtual list_sizes
-   (of-object "PangoFontFace")
-@@ -1378,11 +1218,6 @@
-   )
- )
- 
--(define-virtual describe
--  (of-object "PangoFont")
--  (return-type "PangoFontDescription*")
--)
--
- (define-virtual get_coverage
-   (of-object "PangoFont")
-   (return-type "PangoCoverage*")
-@@ -1391,14 +1226,6 @@
-   )
- )
- 
--(define-virtual find_shaper
--  (of-object "PangoFont")
--  (return-type "PangoEngineShape*")
--  (parameters
--    '("PangoLanguage*" "lang")
--    '("guint32" "ch")
--  )
--)
- 
- (define-virtual get_glyph_extents
-   (of-object "PangoFont")
-@@ -1410,18 +1237,7 @@
-   )
- )
- 
--(define-virtual get_metrics
--  (of-object "PangoFont")
--  (return-type "PangoFontMetrics*")
--  (parameters
--    '("PangoLanguage*" "language")
--  )
--)
- 
--(define-virtual get_font_map