pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/py-gtk2
Module Name: pkgsrc
Committed By: wiz
Date: Thu Aug 29 10:33:59 UTC 2019
Modified Files:
pkgsrc/x11/py-gtk2: Makefile distinfo
pkgsrc/x11/py-gtk2/patches: patch-aa patch-configure
Added Files:
pkgsrc/x11/py-gtk2/patches: patch-pango-types.defs patch-pango.defs
patch-pango.override
Log Message:
py-gtk2: fix build
pango deprecated some symbols; remove them from the mapping files.
While here, add comments to patches.
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 pkgsrc/x11/py-gtk2/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/py-gtk2/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/py-gtk2/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/py-gtk2/patches/patch-configure
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/py-gtk2/patches/patch-pango-types.defs \
pkgsrc/x11/py-gtk2/patches/patch-pango.defs \
pkgsrc/x11/py-gtk2/patches/patch-pango.override
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/py-gtk2/Makefile
diff -u pkgsrc/x11/py-gtk2/Makefile:1.118 pkgsrc/x11/py-gtk2/Makefile:1.119
--- pkgsrc/x11/py-gtk2/Makefile:1.118 Sun Jul 21 22:24:19 2019
+++ pkgsrc/x11/py-gtk2/Makefile Thu Aug 29 10:33:59 2019
@@ -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
Index: pkgsrc/x11/py-gtk2/distinfo
diff -u pkgsrc/x11/py-gtk2/distinfo:1.30 pkgsrc/x11/py-gtk2/distinfo:1.31
--- pkgsrc/x11/py-gtk2/distinfo:1.30 Mon Apr 11 07:50:32 2016
+++ pkgsrc/x11/py-gtk2/distinfo Thu Aug 29 10:33:59 2019
@@ -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
Index: pkgsrc/x11/py-gtk2/patches/patch-aa
diff -u pkgsrc/x11/py-gtk2/patches/patch-aa:1.3 pkgsrc/x11/py-gtk2/patches/patch-aa:1.4
--- pkgsrc/x11/py-gtk2/patches/patch-aa:1.3 Thu Sep 10 19:03:48 2009
+++ pkgsrc/x11/py-gtk2/patches/patch-aa Thu Aug 29 10:33:59 2019
@@ -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
Index: pkgsrc/x11/py-gtk2/patches/patch-configure
diff -u pkgsrc/x11/py-gtk2/patches/patch-configure:1.1 pkgsrc/x11/py-gtk2/patches/patch-configure:1.2
--- pkgsrc/x11/py-gtk2/patches/patch-configure:1.1 Mon Apr 11 07:50:32 2016
+++ pkgsrc/x11/py-gtk2/patches/patch-configure Thu Aug 29 10:33:59 2019
@@ -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
Added files:
Index: pkgsrc/x11/py-gtk2/patches/patch-pango-types.defs
diff -u /dev/null pkgsrc/x11/py-gtk2/patches/patch-pango-types.defs:1.1
--- /dev/null Thu Aug 29 10:33:59 2019
+++ pkgsrc/x11/py-gtk2/patches/patch-pango-types.defs Thu Aug 29 10:33:59 2019
@@ -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")
Index: pkgsrc/x11/py-gtk2/patches/patch-pango.defs
diff -u /dev/null pkgsrc/x11/py-gtk2/patches/patch-pango.defs:1.1
--- /dev/null Thu Aug 29 10:33:59 2019
+++ pkgsrc/x11/py-gtk2/patches/patch-pango.defs Thu Aug 29 10:33:59 2019
@@ -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
+- (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
+- (of-object "PangoFont")
+- (return-type "PangoFontMap*")
+-)
+
+
+
+@@ -1467,12 +1283,6 @@
+ )
+ )
+
+-(define-method get_shape_engine_type
+- (of-object "PangoFontMap")
+- (c-name "pango_font_map_get_shape_engine_type")
+- (return-type "const-char*")
+-)
+-
+ (define-method create_context
+ (of-object "PangoFontMap")
+ (c-name "pango_font_map_create_context")
+@@ -1517,23 +1327,6 @@
+ (return-type "GType")
+ )
+
+-(define-method get_font
+- (of-object "PangoFontset")
+- (c-name "pango_fontset_get_font")
+- (return-type "PangoFont*")
+- (caller-owns-return #t)
+- (parameters
+- '("guint" "wc")
+- )
+-)
+-
+-(define-method get_metrics
+- (of-object "PangoFontset")
+- (c-name "pango_fontset_get_metrics")
+- (return-type "PangoFontMetrics*")
+- (caller-owns-return #t)
+-)
+-
+ (define-method foreach
+ (of-object "PangoFontset")
+ (c-name "pango_fontset_foreach")
+@@ -1544,52 +1337,6 @@
+ )
+ )
+
+-(define-function fontset_simple_get_type
+- (c-name "pango_fontset_simple_get_type")
+- (return-type "GType")
+-)
+-
+-(define-function pango_fontset_simple_new
+- (c-name "pango_fontset_simple_new")
+- (is-constructor-of "PangoFontsetSimple")
+- (return-type "PangoFontsetSimple*")
+- (parameters
+- '("PangoLanguage*" "language")
+- )
+-)
+-
+-(define-method append
+- (of-object "PangoFontsetSimple")
+- (c-name "pango_fontset_simple_append")
+- (return-type "none")
+- (parameters
+- '("PangoFont*" "font")
+- )
+-)
+-
+-(define-method size
+- (of-object "PangoFontsetSimple")
+- (c-name "pango_fontset_simple_size")
+- (return-type "int")
+-)
+-
+-(define-virtual get_font
+- (of-object "PangoFontset")
+- (return-type "PangoFont*")
+- (parameters
+- '("guint" "wc")
+- )
+-)
+-
+-(define-virtual get_metrics
+- (of-object "PangoFontset")
+- (return-type "PangoFontMetrics*")
+-)
+-
+-(define-virtual get_language
+- (of-object "PangoFontset")
+- (return-type "PangoLanguage*")
+-)
+
+ (define-virtual foreach
+ (of-object "PangoFontset")
+@@ -2454,50 +2201,6 @@
+
+
+
+-;; From pango-modules.h
+-
+-(ifdef PANGO_ENABLE_BACKEND
+-
+-(define-function find_map
+- (c-name "pango_find_map")
+- (return-type "PangoMap*")
+- (parameters
+- '("PangoLanguage*" "language")
+- '("guint" "engine_type_id")
+- '("guint" "render_type_id")
+- )
+-)
+-
+-(define-method get_engine
+- (of-object "PangoMap")
+- (c-name "pango_map_get_engine")
+- (return-type "PangoEngine*")
+- (parameters
+- '("PangoScript" "script")
+- )
+-)
+-
+-(define-method get_engines
+- (of-object "PangoMap")
+- (c-name "pango_map_get_engines")
+- (return-type "none")
+- (parameters
+- '("PangoScript" "script")
+- '("GSList**" "exact_engines")
+- '("GSList**" "fallback_engines")
+- )
+-)
+-
+-(define-function module_register
+- (c-name "pango_module_register")
+- (return-type "none")
+- (parameters
+- '("PangoIncludedModule*" "module")
+- )
+-)
+-) ;; PANGO_ENABLE_BACKEND
+-
+-
+ ;; From /home/jdahlin/dev/gtk-2.8/pango/pango/pango-renderer.h
+
+ (define-function pango_renderer_get_type
+@@ -2743,14 +2446,6 @@
+
+ ;; From pango-script.h
+
+-(define-function script_for_unichar
+- (c-name "pango_script_for_unichar")
+- (return-type "PangoScript")
+- (parameters
+- '("gunichar" "ch")
+- )
+-)
+-
+ (define-function script_iter_new
+ (c-name "pango_script_iter_new")
+ (is-constructor-of "PangoScriptIter")
+@@ -3055,22 +2750,6 @@
+ (deprecated "deprecated")
+ )
+
+-(define-function unichar_direction
+- (c-name "pango_unichar_direction")
+- (return-type "PangoDirection")
+- (parameters
+- '("gunichar" "ch")
+- )
+-)
+-
+-(define-function find_base_dir
+- (c-name "pango_find_base_dir")
+- (return-type "PangoDirection")
+- (parameters
+- '("const-gchar*" "text")
+- '("gint" "length")
+- )
+-)
+
+ (define-function extents_to_pixels
+ (c-name "pango_extents_to_pixels")
+@@ -3205,24 +2884,6 @@
+ )
+ )
+
+-(define-function config_key_get
+- (c-name "pango_config_key_get")
+- (return-type "char*")
+- (parameters
+- '("const-char*" "key")
+- )
+-)
+-
+-(define-function lookup_aliases
+- (c-name "pango_lookup_aliases")
+- (return-type "none")
+- (parameters
+- '("const-char*" "fontname")
+- '("char***" "families")
+- '("int*" "n_families")
+- )
+-)
+-
+ (define-function parse_enum
+ (c-name "pango_parse_enum")
+ (return-type "gboolean")
+@@ -3275,16 +2936,6 @@
+ )
+ )
+
+-(define-function get_sysconf_subdirectory
+- (c-name "pango_get_sysconf_subdirectory")
+- (return-type "const-char*")
+-)
+-
+-(define-function get_lib_subdirectory
+- (c-name "pango_get_lib_subdirectory")
+- (return-type "const-char*")
+-)
+-
+ (define-function log2vis_get_embedding_levels
+ (c-name "pango_log2vis_get_embedding_levels")
+ (return-type "guint8*")
Index: pkgsrc/x11/py-gtk2/patches/patch-pango.override
diff -u /dev/null pkgsrc/x11/py-gtk2/patches/patch-pango.override:1.1
--- /dev/null Thu Aug 29 10:33:59 2019
+++ pkgsrc/x11/py-gtk2/patches/patch-pango.override Thu Aug 29 10:33:59 2019
@@ -0,0 +1,42 @@
+$NetBSD: patch-pango.override,v 1.1 2019/08/29 10:33:59 wiz Exp $
+
+pango deprecated some symbols
+
+--- pango.override.orig 2011-04-01 10:37:25.000000000 +0000
++++ pango.override
+@@ -22,8 +22,6 @@
+ %%
+ headers
+ #define NO_IMPORT_PYGOBJECT
+-#define PANGO_ENABLE_BACKEND
+-#define PANGO_ENABLE_ENGINE
+ #include <pygobject.h>
+ #include <pango/pango.h>
+
+@@ -540,6 +538,7 @@ ignore
+ pango_layout_get_log_attrs
+ %%
+ ignore
++ pango_engine_get_type
+ pango_glyph_string_index_to_x
+ pango_glyph_string_x_to_index
+ pango_break
+@@ -1325,7 +1324,6 @@ _wrap_pango_parse_markup(PyObject *self,
+ gunichar accel_marker, accel_char = 0;
+ PangoAttrList *attr_list = NULL;
+ GError *error = NULL;
+- gboolean ret;
+ PyObject *py_ret;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s#|u#:pango.parse_markup",
+@@ -1341,8 +1339,8 @@ _wrap_pango_parse_markup(PyObject *self,
+ } else
+ accel_marker = 0;
+
+- ret = pango_parse_markup(markup_text, length, accel_marker,
+- &attr_list, &text, &accel_char, &error);
++ pango_parse_markup(markup_text, length, accel_marker,
++ &attr_list, &text, &accel_char, &error);
+ if (pyg_error_check(&error))
+ return NULL;
+
Home |
Main Index |
Thread Index |
Old Index