Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1712014993265690"
MIME-Version: 1.0
Date: Mon, 1 Apr 2024 23:43:13 +0000
From: "Charlotte Koch" <charlotte@netbsd.org>
Subject: CVS commit: pkgsrc/devel/glib2
To: pkgsrc-changes@NetBSD.org
Reply-To: charlotte@netbsd.org
Message-Id: <20240401234313.A49D5FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1712014993265690
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	charlotte
Date:		Mon Apr  1 23:43:13 UTC 2024

Modified Files:
	pkgsrc/devel/glib2: distinfo
	pkgsrc/devel/glib2/patches: patch-glib_genviron.c patch-glib_gspawn.c

Log Message:
devel/glib2: Unbreak DragonFly build

The need for `environ` to be a weak symbol is true for DragonFly, too --
not just FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.320 -r1.321 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/glib2/patches/patch-glib_genviron.c \
    pkgsrc/devel/glib2/patches/patch-glib_gspawn.c

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


--_----------=_1712014993265690
Content-Disposition: inline
Content-Length: 3288
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.320 pkgsrc/devel/glib2/distinfo:1.321
--- pkgsrc/devel/glib2/distinfo:1.320	Fri Feb  9 09:31:45 2024
+++ pkgsrc/devel/glib2/distinfo	Mon Apr  1 23:43:13 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.320 2024/02/09 09:31:45 adam Exp $
+$NetBSD: distinfo,v 1.321 2024/04/01 23:43:13 charlotte Exp $
 
 BLAKE2s (glib-2.78.4.tar.xz) = 99e73c55068a1eb95703d3df83019a5bb6b5d22e7922f5230a56df5ed5194037
 SHA512 (glib-2.78.4.tar.xz) = 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6
@@ -15,8 +15,8 @@ SHA1 (patch-gio_meson.build) = 317da05e0
 SHA1 (patch-gio_tests_meson.build) = 9fa1bdc65768c288d273298a75280485b7bff350
 SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6
 SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
-SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97
-SHA1 (patch-glib_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294
+SHA1 (patch-glib_genviron.c) = 45e382a4b5412c69b310fd26482eff6faffa2c0d
+SHA1 (patch-glib_gspawn.c) = 77177c2575a205fde3f00d6773254ee017963d64
 SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a
 SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0
 SHA1 (patch-glib_tests_meson.build) = 40ce43a49ae7084116facac6b3926c5e545f6721

Index: pkgsrc/devel/glib2/patches/patch-glib_genviron.c
diff -u pkgsrc/devel/glib2/patches/patch-glib_genviron.c:1.2 pkgsrc/devel/glib2/patches/patch-glib_genviron.c:1.3
--- pkgsrc/devel/glib2/patches/patch-glib_genviron.c:1.2	Wed Mar  4 15:11:48 2020
+++ pkgsrc/devel/glib2/patches/patch-glib_genviron.c	Mon Apr  1 23:43:13 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-glib_genviron.c,v 1.2 2020/03/04 15:11:48 wiz Exp $
+$NetBSD: patch-glib_genviron.c,v 1.3 2024/04/01 23:43:13 charlotte Exp $
 
 Avoid the build failure with Clang on FreeBSD (see PR 54752).
 Set environ as a weak symbol (thanks to Joerg).
@@ -9,7 +9,7 @@ Set environ as a weak symbol (thanks to 
  /* According to the Single Unix Specification, environ is not
   * in any system header, although unistd.h often declares it.
   */
-+#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
 +extern __attribute__((__weak__)) char **environ;
 +#else
  extern char **environ;
Index: pkgsrc/devel/glib2/patches/patch-glib_gspawn.c
diff -u pkgsrc/devel/glib2/patches/patch-glib_gspawn.c:1.2 pkgsrc/devel/glib2/patches/patch-glib_gspawn.c:1.3
--- pkgsrc/devel/glib2/patches/patch-glib_gspawn.c:1.2	Wed Mar  4 15:11:48 2020
+++ pkgsrc/devel/glib2/patches/patch-glib_gspawn.c	Mon Apr  1 23:43:13 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-glib_gspawn.c,v 1.2 2020/03/04 15:11:48 wiz Exp $
+$NetBSD: patch-glib_gspawn.c,v 1.3 2024/04/01 23:43:13 charlotte Exp $
 
 Avoid the build failure with Clang on FreeBSD (see PR 54752).
 Set environ as a weak symbol (thanks to Joerg).
@@ -9,7 +9,7 @@ Set environ as a weak symbol (thanks to 
  #ifdef HAVE__NSGETENVIRON
  #define environ (*_NSGetEnviron())
  #else
-+#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
 +extern __attribute__((__weak__)) char **environ;
 +#else
  extern char **environ;


--_----------=_1712014993265690--