CVS commit: pkgsrc/lang/smalltalk

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Jan 24 16:48:59 UTC 2025

Modified Files:
        pkgsrc/lang/smalltalk: Makefile distinfo
Added Files:
        pkgsrc/lang/smalltalk/patches: patch-packages_gtk_mkorder.awk

Log Message:
lang/smalltalk: Patch around glib/gwin32.h confusion.

Resolves:

===> Building for smalltalk-3.2.5nb39
...
chmod +x cpp
/pkg/2024Q4/bin/gawk \
  -vPKG_CONFIG='/tmp/pkgbuild/2024Q4/lang/smalltalk/work/.tools/bin/pkg-config' \
  -v_prefixes='g atk pango' \
  -v_libs="gobject-2.0 gdk-2.0 gdk-pixbuf-2.0 pango gtk+-2.0 atk" \
  -v_files="glib-object.h gdk/gdk.h gdk-pixbuf/gdk-pixbuf.h gtk/gtk.h atk/atk.h pango/pango.h ./placer.h" -f ./mkorder.awk \
...
error: cannot find glib/gwin32.h
gawk: ./mkorder.awk:70: fatal: print to "standard output" failed: reason unknown


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 pkgsrc/lang/smalltalk/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/smalltalk/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/smalltalk/patches/patch-packages_gtk_mkorder.awk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/smalltalk/Makefile
diff -u pkgsrc/lang/smalltalk/Makefile:1.145 pkgsrc/lang/smalltalk/Makefile:1.146
--- pkgsrc/lang/smalltalk/Makefile:1.145        Mon Jan  6 21:49:22 2025
+++ pkgsrc/lang/smalltalk/Makefile      Fri Jan 24 16:48:59 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.145 2025/01/06 21:49:22 ktnb Exp $
+# $NetBSD: Makefile,v 1.146 2025/01/24 16:48:59 riastradh Exp $
 
 DISTNAME=      smalltalk-3.2.5
-PKGREVISION=   41
+PKGREVISION=   42
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=smalltalk/}
 

Index: pkgsrc/lang/smalltalk/distinfo
diff -u pkgsrc/lang/smalltalk/distinfo:1.31 pkgsrc/lang/smalltalk/distinfo:1.32
--- pkgsrc/lang/smalltalk/distinfo:1.31 Tue Oct 26 10:51:55 2021
+++ pkgsrc/lang/smalltalk/distinfo      Fri Jan 24 16:48:59 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2021/10/26 10:51:55 nia Exp $
+$NetBSD: distinfo,v 1.32 2025/01/24 16:48:59 riastradh Exp $
 
 BLAKE2s (smalltalk-3.2.5.tar.gz) = c30aa57428542161a24a886d937abebe0c0c8da27f3b143f5f2c5e6f7ab712ad
 SHA512 (smalltalk-3.2.5.tar.gz) = 385e5fba2acb8870759e5178282210c09c45685d0cf776bc50f4ed10c9afacf9164547ba8099ea3ed9a92a2a253aa9c2b011a7a9f2dff47ea9cfdf3b42029ebc
@@ -7,4 +7,5 @@ SHA1 (patch-ae) = 0de0e6bed47d32e1c30881
 SHA1 (patch-ah) = 76366578593fd7afbf34d8215c1f3692e610f661
 SHA1 (patch-libgst_cint.c) = 51354b41f8edde0e42abcd5f8d0246d4f1025c6e
 SHA1 (patch-libgst_input.c) = 06168ed6decd6d42838e76ada81717e3f599d733
+SHA1 (patch-packages_gtk_mkorder.awk) = d3f4308abd6aaee3316dcc6a39632b1b2e49aa92
 SHA1 (patch-snprintfv_snprintfv_format.c) = 03eed55ade8f78ae1cf73b82df9d18629314945b

Added files:

Index: pkgsrc/lang/smalltalk/patches/patch-packages_gtk_mkorder.awk
diff -u /dev/null pkgsrc/lang/smalltalk/patches/patch-packages_gtk_mkorder.awk:1.1
--- /dev/null   Fri Jan 24 16:48:59 2025
+++ pkgsrc/lang/smalltalk/patches/patch-packages_gtk_mkorder.awk        Fri Jan 24 16:48:59 2025
@@ -0,0 +1,20 @@
+$NetBSD: patch-packages_gtk_mkorder.awk,v 1.1 2025/01/24 16:48:59 riastradh Exp $
+
+Don't examine glib/gwin32.h.  This script assumes all #includes in
+the glib, gtk2, pango, &c., header files exist, but glib-2.0/glib.h
+conditionally includes glib/gwin32.h under G_PLATFORM_WIN32.
+
+If we extend this to work on Windows then this script will have to be
+made cleverer.
+
+--- packages/gtk/mkorder.awk.orig      2013-03-23 19:56:26.000000000 +0000
++++ packages/gtk/mkorder.awk
+@@ -100,7 +100,7 @@ function scan(file, dir, incfile) {
+       else if ($2 ~ /^"/)
+           match ($0, /"[^>]*"/)
+       incfile = substr($0, RSTART + 1, RLENGTH - 2)
+-      if (!has_prefix(incfile))
++      if (!has_prefix(incfile) || incfile == "glib/gwin32.h")
+           continue
+       if ($2 ~ /^"/ && check_file(dir "/" incfile))
+           process_file(dir "/" incfile)