CVS commit: pkgsrc/devel/glib2

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jul 26 15:34:44 UTC 2024

Modified Files:
        pkgsrc/devel/glib2: Makefile distinfo
        pkgsrc/devel/glib2/patches: patch-meson.build

Log Message:
glib2: force usage of pkgsrc-selected Python binary

Fixes build in some cases when multiple versions of Python are
installed.

Based on PR 58469 by Phil Krylov.


To generate a diff of this commit:
cvs rdiff -u -r1.306 -r1.307 pkgsrc/devel/glib2/Makefile
cvs rdiff -u -r1.329 -r1.330 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/glib2/patches/patch-meson.build

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

Modified files:

Index: pkgsrc/devel/glib2/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.306 pkgsrc/devel/glib2/Makefile:1.307
--- pkgsrc/devel/glib2/Makefile:1.306   Tue Jul 23 05:25:16 2024
+++ pkgsrc/devel/glib2/Makefile Fri Jul 26 15:34:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.306 2024/07/23 05:25:16 wiz Exp $
+# $NetBSD: Makefile,v 1.307 2024/07/26 15:34:43 wiz Exp $
 
 .include "Makefile.common"
 
@@ -55,6 +55,12 @@ SUBST_FILES.python+= output/glib/gtester
 SUBST_MESSAGE.python=  Fixing path to Python.
 SUBST_SED.python+=     -e "s,^\(.*\)/usr/bin/env.*,\1${PYTHONBIN},"
 
+SUBST_CLASSES+=                meson
+SUBST_STAGE.meson=     pre-configure
+SUBST_FILES.meson+=    meson.build
+SUBST_MESSAGE.meson=   Forcing meson to find proper Python.
+SUBST_VARS.meson+=     PYTHONBIN
+
 GIO_MODULES_DIR=       ${PREFIX}/lib/gio/modules
 OWN_DIRS=              ${GIO_MODULES_DIR}
 
@@ -91,8 +97,8 @@ PYTHON_FOR_BUILD_ONLY=        yes
 
 # Work around GCC 4.x bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113
 # preventing a successful CentOS 7 build
-.if !empty(CC_VERSION:Mgcc-4.*)
-BUILDLINK_TRANSFORM+=   rm:-Werror=missing-prototypes
+.if ${CC_VERSION:Mgcc-4.*}
+BUILDLINK_TRANSFORM+=  rm:-Werror=missing-prototypes
 .endif
 
 post-extract:

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.329 pkgsrc/devel/glib2/distinfo:1.330
--- pkgsrc/devel/glib2/distinfo:1.329   Fri Jul 19 07:27:33 2024
+++ pkgsrc/devel/glib2/distinfo Fri Jul 26 15:34:43 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.329 2024/07/19 07:27:33 adam Exp $
+$NetBSD: distinfo,v 1.330 2024/07/26 15:34:43 wiz Exp $
 
 BLAKE2s (glib-2.80.4.tar.xz) = 6943db2a46b6f6c1786cedeef77f5d5573a683ed368a6a7a3ffa640beddd8840
 SHA512 (glib-2.80.4.tar.xz) = efdc7dd1e0609b0f2d988a8cc8fd4a3fda96e8450832f905f7686f9063b727cb996e0e4e638aca62f60b76f9f04be62e089a615413e64cf298c7eef26e074570
@@ -25,5 +25,5 @@ SHA1 (patch-glib_tests_thread.c) = 84f46
 SHA1 (patch-gmodule_gmodule.c) = a020920b8e5bad34550c9963eb2fc27bef24c5c9
 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
 SHA1 (patch-gobject_meson.build) = a3953d33ba7e906ff1df024221ac3ab32f6c0c66
-SHA1 (patch-meson.build) = ee33f8889bdc03e329a9f70d77a478ae365bfa55
+SHA1 (patch-meson.build) = 7a4ec80905eff073443250bca91cff0f6cf4c1f2
 SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54

Index: pkgsrc/devel/glib2/patches/patch-meson.build
diff -u pkgsrc/devel/glib2/patches/patch-meson.build:1.21 pkgsrc/devel/glib2/patches/patch-meson.build:1.22
--- pkgsrc/devel/glib2/patches/patch-meson.build:1.21   Tue Apr  9 16:57:18 2024
+++ pkgsrc/devel/glib2/patches/patch-meson.build        Fri Jul 26 15:34:43 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.21 2024/04/09 16:57:18 wiz Exp $
+$NetBSD: patch-meson.build,v 1.22 2024/07/26 15:34:43 wiz Exp $
 
 - On Darwin, optionally use Cocoa (needed for X11 users).
 
@@ -14,8 +14,8 @@ $NetBSD: patch-meson.build,v 1.21 2024/0
 
 - Check also for sys/ptrace.h header file.
 
---- meson.build.orig   2024-03-07 21:35:05.000000000 +0000
-+++ meson.build
+--- meson.build.orig   2024-07-08 14:03:15.000000000 +0000
++++ meson.build        2024-07-26 14:38:02.009750717 +0000
 @@ -412,6 +412,7 @@ headers = [
    'sys/mount.h',
    'sys/param.h',
@@ -54,9 +54,12 @@ $NetBSD: patch-meson.build,v 1.21 2024/0
    if cc.compiles(glib_conf_prefix + '''
                   #include <stdio.h>
                   #ifdef HAVE_SYS_TYPES_H
-@@ -2421,7 +2421,7 @@ glib_conf.set('HAVE_PROC_SELF_CMDLINE', 
+@@ -2419,9 +2419,9 @@ endif
  
- python = import('python').find_installation(modules: ['packaging'])
+ glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
+ 
+-python = import('python').find_installation(modules: ['packaging'])
++python = import('python').find_installation('@PYTHONBIN@', modules: ['packaging'])
  # used for '#!/usr/bin/env <name>'
 -python_name = 'python3'
 +python_name = python.path()