CVS commit: pkgsrc/x11/py-gtk2

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu May  1 14:29:34 UTC 2025

Modified Files:
        pkgsrc/x11/py-gtk2: Makefile distinfo
        pkgsrc/x11/py-gtk2/patches: patch-pango.override

Log Message:
py-gtk2: suppress clang errors


To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 pkgsrc/x11/py-gtk2/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/x11/py-gtk2/distinfo
cvs rdiff -u -r1.1 -r1.2 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.154 pkgsrc/x11/py-gtk2/Makefile:1.155
--- pkgsrc/x11/py-gtk2/Makefile:1.154   Thu Apr 24 14:16:24 2025
+++ pkgsrc/x11/py-gtk2/Makefile Thu May  1 14:29:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.154 2025/04/24 14:16:24 wiz Exp $
+# $NetBSD: Makefile,v 1.155 2025/05/01 14:29:34 tnn Exp $
 
 DISTNAME=      pygtk-2.24.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
@@ -23,6 +23,11 @@ GNU_CONFIGURE=               YES
 CONFIGURE_ENV+=                PYTHON=${PYTHONBIN:Q}
 USE_TOOLS+=            gmake pkg-config
 
+# clang complains:
+# error: incompatible integer to pointer conversion passing 'unsigned long' to parameter of type 'GdkNativeWindow' (aka 'void *') [-Wint-conversion]
+# ret = gtk_plug_new_for_display(GDK_DISPLAY(display->obj), socket_id);
+CFLAGS+=       -Wno-error=int-conversion
+
 PY_PATCHPLIST= YES
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 2.24.0
 

Index: pkgsrc/x11/py-gtk2/distinfo
diff -u pkgsrc/x11/py-gtk2/distinfo:1.35 pkgsrc/x11/py-gtk2/distinfo:1.36
--- pkgsrc/x11/py-gtk2/distinfo:1.35    Tue Oct 26 11:34:19 2021
+++ pkgsrc/x11/py-gtk2/distinfo Thu May  1 14:29:34 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2021/10/26 11:34:19 nia Exp $
+$NetBSD: distinfo,v 1.36 2025/05/01 14:29:34 tnn Exp $
 
 BLAKE2s (pygtk-2.24.0.tar.bz2) = 4269d735e747147ad33f6b7f028638ec741fb48d1e45aef546e98d47fc8eac93
 SHA512 (pygtk-2.24.0.tar.bz2) = 64f4344fcf7636e0b2016ffd5310250b5c02a1bf87e44aef39b5d4cf4a5fc50d27cb4f030d4c6802cff61fffb88dee7752821e3d8a4cd1c34dc3745d9ff2f0da
@@ -10,5 +10,5 @@ SHA1 (patch-gtk_Makefile.am) = 50556ac70
 SHA1 (patch-gtk_Makefile.in) = 4fed9e802bd0e306e5070cf2ac7e44c86715a3e7
 SHA1 (patch-gtk_gtk-2.10.defs) = f944ab3f2304d11503dee628547ffd677531530f
 SHA1 (patch-pango-types.defs) = 386bd3b60595a6741dcae15b35977f5a3e6b3342
-SHA1 (patch-pango.override) = d7e5919d3e7c753900a15c63e9e8354c9d03a8c2
+SHA1 (patch-pango.override) = c2010b9f819dff01d908d4995b9584d33e455c09
 SHA1 (patch-pangocairo.override) = 53eeba8c1c66e07d64c109ab0fd304e5f03d0eb3

Index: pkgsrc/x11/py-gtk2/patches/patch-pango.override
diff -u pkgsrc/x11/py-gtk2/patches/patch-pango.override:1.1 pkgsrc/x11/py-gtk2/patches/patch-pango.override:1.2
--- pkgsrc/x11/py-gtk2/patches/patch-pango.override:1.1 Thu Aug 29 10:33:59 2019
+++ pkgsrc/x11/py-gtk2/patches/patch-pango.override     Thu May  1 14:29:34 2025
@@ -1,10 +1,11 @@
-$NetBSD: patch-pango.override,v 1.1 2019/08/29 10:33:59 wiz Exp $
+$NetBSD: patch-pango.override,v 1.2 2025/05/01 14:29:34 tnn Exp $
 
-pango deprecated some symbols
+* pango deprecated some symbols
+* put back prototypes for deprecated symbols
 
 --- pango.override.orig        2011-04-01 10:37:25.000000000 +0000
 +++ pango.override
-@@ -22,8 +22,6 @@
+@@ -22,10 +22,10 @@
  %%
  headers
  #define NO_IMPORT_PYGOBJECT
@@ -12,8 +13,12 @@ pango deprecated some symbols
 -#define PANGO_ENABLE_ENGINE
  #include <pygobject.h>
  #include <pango/pango.h>
++PangoFontMetrics *pango_font_metrics_new(void);
++const char *pango_font_map_get_shape_engine_type (PangoFontMap *);
  
-@@ -540,6 +538,7 @@ ignore
+ typedef struct {
+     PyObject *func, *data;
+@@ -540,6 +540,7 @@ ignore
    pango_layout_get_log_attrs
  %%
  ignore
@@ -21,7 +26,7 @@ pango deprecated some symbols
    pango_glyph_string_index_to_x
    pango_glyph_string_x_to_index
    pango_break
-@@ -1325,7 +1324,6 @@ _wrap_pango_parse_markup(PyObject *self,
+@@ -1325,7 +1326,6 @@ _wrap_pango_parse_markup(PyObject *self,
      gunichar accel_marker, accel_char = 0;
      PangoAttrList *attr_list = NULL;
      GError *error = NULL;
@@ -29,7 +34,7 @@ pango deprecated some symbols
      PyObject *py_ret;
  
      if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s#|u#:pango.parse_markup",
-@@ -1341,8 +1339,8 @@ _wrap_pango_parse_markup(PyObject *self,
+@@ -1341,8 +1341,8 @@ _wrap_pango_parse_markup(PyObject *self,
      } else
        accel_marker = 0;