Attachment #249030 for bug #277581




PORTNAME=	glib
DISTVERSION=	2.80.0
PORTEPOCH=	2
CATEGORIES=	devel
MASTER_SITES=	GNOME


LICENSE=	LGPL20

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
LIB_DEPENDS=	libffi.so:devel/libffi \
		libpcre2-8.so:devel/pcre2


MESON_ARGS=	-Db_lundef=false \
		-Ddefault_library=both \
		-Dinstalled_tests=false \
		-Dintrospection=disabled \
		-Dlibmount=disabled \
		-Dlocalstatedir=/var \
		-Druntime_dir=/var/run \


CONFLICTS_INSTALL=	p5-Giovanni

_LIBVERSION=	0.8000.0
PLIST_SUB=	LIBVERSION=${_LIBVERSION}

OPTIONS_DEFINE=		DEBUG GTKDOC FAM_ALTBACKEND MANPAGES NLS TEST


GTKDOC_BUILD_DEPENDS=	gtk-doc>0:textproc/gtk-doc
GTKDOC_IMPLIES=		TEST
GTKDOC_MESON_TRUE=	documentation

FAM_ALTBACKEND_DESC=	Alternate file monitor backend

MANPAGES_BUILD_DEPENDS=	rst2man:textproc/py-docutils
MANPAGES_MESON_ENABLED=	man-pages
MANPAGES_USE=		GNOME=libxslt:build
MANPAGES_MESON_TRUE=	man

TEST_BUILD_DEPENDS=	dbus-daemon:devel/dbus
TEST_MESON_TRUE=	tests

Lines 1-3 Link Here

(-)b/devel/glib20/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1705866500	1	TIMESTAMP = 1709847305
2	SHA256 (gnome/glib-2.78.4.tar.xz) = 24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63	2	SHA256 (gnome/glib-2.80.0.tar.xz) = 8228a92f92a412160b139ae68b6345bd28f24434a7b5af150ebe21ff587a561d
3	SIZE (gnome/glib-2.78.4.tar.xz) = 5331892	3	SIZE (gnome/glib-2.80.0.tar.xz) = 5510536




--- glib/glib-unix.c.orig	2024-03-07 21:35:05 UTC
+++ glib/glib-unix.c
@@ -55,6 +55,11 @@
 #include <sys/syscall.h>  /* for syscall and SYS_getdents64 */
 #endif
 
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#include <sys/user.h>
+#include <libutil.h>
+#endif
+
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif /* HAVE_SYS_RESOURCE_H */
@@ -620,6 +625,33 @@ filename_to_fd (const char *p)
   return g_spawn_check_wait_status (wait_status, error);
 }
 #endif
 
+#ifdef __FreeBSD__
+static int

+}
+#endif
+
 static int safe_fdwalk_with_invalid_fds (int (*cb)(void *data, int fd), void *data);
 
 /* This function is called between fork() and exec() and hence must be
@@ -640,6 +672,13 @@ safe_fdwalk (int (*cb)(void *data, int fd), void *data
 static gssize
@@ -1432,6 +1465,13 @@ safe_fdwalk (int (*cb)(void *data, int fd), void *data
    * may fail on non-Linux operating systems. See safe_fdwalk_with_invalid_fds
    * for a slower alternative.
    */

Lines 1-6 Link Here

(-)b/devel/glib20/pkg-plist (-1 / +37 lines)
1	bin/gapplication	1	bin/gapplication
2	bin/gdbus	2	bin/gdbus
3	bin/gdbus-codegen	3	bin/gdbus-codegen
		4	bin/gi-compile-repository
		5	bin/gi-decompile-typelib
		6	bin/gi-inspect-typelib
4	bin/gio	7	bin/gio
5	bin/gio-querymodules	8	bin/gio-querymodules
6	bin/glib-compile-resources	9	bin/glib-compile-resources
Lines 177-182 include/glib-2.0/gio/gvolume.h Link Here
177	include/glib-2.0/gio/gvolumemonitor.h	180	include/glib-2.0/gio/gvolumemonitor.h
178	include/glib-2.0/gio/gzlibcompressor.h	181	include/glib-2.0/gio/gzlibcompressor.h
179	include/glib-2.0/gio/gzlibdecompressor.h	182	include/glib-2.0/gio/gzlibdecompressor.h
		183	include/glib-2.0/girepository/gi-visibility.h
		184	include/glib-2.0/girepository/giarginfo.h
		185	include/glib-2.0/girepository/gibaseinfo.h
		186	include/glib-2.0/girepository/gicallableinfo.h
		187	include/glib-2.0/girepository/gicallbackinfo.h
		188	include/glib-2.0/girepository/giconstantinfo.h
		189	include/glib-2.0/girepository/gienuminfo.h
		190	include/glib-2.0/girepository/gifieldinfo.h
		191	include/glib-2.0/girepository/giflagsinfo.h
		192	include/glib-2.0/girepository/gifunctioninfo.h
		193	include/glib-2.0/girepository/giinterfaceinfo.h
		194	include/glib-2.0/girepository/giobjectinfo.h
		195	include/glib-2.0/girepository/gipropertyinfo.h
		196	include/glib-2.0/girepository/giregisteredtypeinfo.h
		197	include/glib-2.0/girepository/girepository-autocleanups.h
		198	include/glib-2.0/girepository/girepository.h
		199	include/glib-2.0/girepository/girffi.h
		200	include/glib-2.0/girepository/gisignalinfo.h
		201	include/glib-2.0/girepository/gistructinfo.h
		202	include/glib-2.0/girepository/gitypeinfo.h
		203	include/glib-2.0/girepository/gitypelib.h
		204	include/glib-2.0/girepository/gitypes.h
		205	include/glib-2.0/girepository/giunioninfo.h
		206	include/glib-2.0/girepository/giunresolvedinfo.h
		207	include/glib-2.0/girepository/givalueinfo.h
		208	include/glib-2.0/girepository/givfuncinfo.h
180	include/glib-2.0/glib-object.h	209	include/glib-2.0/glib-object.h
181	include/glib-2.0/glib-unix.h	210	include/glib-2.0/glib-unix.h
182	include/glib-2.0/glib.h	211	include/glib-2.0/glib.h
Lines 266-272 include/glib-2.0/glib/gvariant.h Link Here
266	include/glib-2.0/glib/gvarianttype.h	295	include/glib-2.0/glib/gvarianttype.h
267	include/glib-2.0/glib/gversion.h	296	include/glib-2.0/glib/gversion.h
268	include/glib-2.0/glib/gversionmacros.h	297	include/glib-2.0/glib/gversionmacros.h
269	include/glib-2.0/glib/gwin32.h
270	include/glib-2.0/gmodule.h	298	include/glib-2.0/gmodule.h
271	include/glib-2.0/gmodule/gmodule-visibility.h	299	include/glib-2.0/gmodule/gmodule-visibility.h
272	include/glib-2.0/gobject/gbinding.h	300	include/glib-2.0/gobject/gbinding.h
Lines 298-303 lib/libgio-2.0.a Link Here
298	lib/libgio-2.0.so	326	lib/libgio-2.0.so
299	lib/libgio-2.0.so.0	327	lib/libgio-2.0.so.0
300	lib/libgio-2.0.so.%%LIBVERSION%%	328	lib/libgio-2.0.so.%%LIBVERSION%%
		329	lib/libgirepository-2.0.a
		330	lib/libgirepository-2.0.so
		331	lib/libgirepository-2.0.so.0
		332	lib/libgirepository-2.0.so.%%LIBVERSION%%
301	lib/libglib-2.0.a	333	lib/libglib-2.0.a
302	lib/libglib-2.0.so	334	lib/libglib-2.0.so
303	lib/libglib-2.0.so.0	335	lib/libglib-2.0.so.0
Lines 316-321 lib/libgthread-2.0.so.0 Link Here
316	lib/libgthread-2.0.so.%%LIBVERSION%%	348	lib/libgthread-2.0.so.%%LIBVERSION%%
317	libdata/pkgconfig/gio-2.0.pc	349	libdata/pkgconfig/gio-2.0.pc
318	libdata/pkgconfig/gio-unix-2.0.pc	350	libdata/pkgconfig/gio-unix-2.0.pc
		351	libdata/pkgconfig/girepository-2.0.pc
319	libdata/pkgconfig/glib-2.0.pc	352	libdata/pkgconfig/glib-2.0.pc
320	libdata/pkgconfig/gmodule-2.0.pc	353	libdata/pkgconfig/gmodule-2.0.pc
321	libdata/pkgconfig/gmodule-export-2.0.pc	354	libdata/pkgconfig/gmodule-export-2.0.pc
Lines 326-331 libexec/gio-launch-desktop Link Here
326	%%MANPAGES%%share/man/man1/gapplication.1.gz	359	%%MANPAGES%%share/man/man1/gapplication.1.gz
327	%%MANPAGES%%share/man/man1/gdbus-codegen.1.gz	360	%%MANPAGES%%share/man/man1/gdbus-codegen.1.gz
328	%%MANPAGES%%share/man/man1/gdbus.1.gz	361	%%MANPAGES%%share/man/man1/gdbus.1.gz
		362	%%MANPAGES%%share/man/man1/gi-compile-repository.1.gz
		363	%%MANPAGES%%share/man/man1/gi-decompile-typelib.1.gz
		364	%%MANPAGES%%share/man/man1/gi-inspect-typelib.1.gz
329	%%MANPAGES%%share/man/man1/gio-querymodules.1.gz	365	%%MANPAGES%%share/man/man1/gio-querymodules.1.gz
330	%%MANPAGES%%share/man/man1/gio.1.gz	366	%%MANPAGES%%share/man/man1/gio.1.gz
331	%%MANPAGES%%share/man/man1/glib-compile-resources.1.gz	367	%%MANPAGES%%share/man/man1/glib-compile-resources.1.gz

Return to bug 277581

Lines 1-5 Link Here

(-)b/devel/glib20/Makefile (-7 / +7 lines)
1	PORTNAME= glib	1	PORTNAME= glib
2	DISTVERSION= 2.78.4	2	DISTVERSION= 2.80.0
3	PORTEPOCH= 2	3	PORTEPOCH= 2
4	CATEGORIES= devel	4	CATEGORIES= devel
5	MASTER_SITES= GNOME	5	MASTER_SITES= GNOME
Lines 11-16 WWW= https://www.gtk.org/ Link Here
11		11
12	LICENSE= LGPL20	12	LICENSE= LGPL20
13		13
		14	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
14	LIB_DEPENDS= libffi.so:devel/libffi \	15	LIB_DEPENDS= libffi.so:devel/libffi \
15	libpcre2-8.so:devel/pcre2	16	libpcre2-8.so:devel/pcre2
16		17
Lines 25-30 USE_PYTHON= py3kplist Link Here
25	MESON_ARGS= -Db_lundef=false \	26	MESON_ARGS= -Db_lundef=false \
26	-Ddefault_library=both \	27	-Ddefault_library=both \
27	-Dinstalled_tests=false \	28	-Dinstalled_tests=false \
		29	-Dintrospection=disabled \
28	-Dlibmount=disabled \	30	-Dlibmount=disabled \
29	-Dlocalstatedir=/var \	31	-Dlocalstatedir=/var \
30	-Druntime_dir=/var/run \	32	-Druntime_dir=/var/run \
Lines 36-42 CPE_VENDOR= gnome Link Here
36		38
37	CONFLICTS_INSTALL= p5-Giovanni	39	CONFLICTS_INSTALL= p5-Giovanni
38		40
39	_LIBVERSION= 0.7800.4	41	_LIBVERSION= 0.8000.0
40	PLIST_SUB= LIBVERSION=${_LIBVERSION}	42	PLIST_SUB= LIBVERSION=${_LIBVERSION}
41		43
42	OPTIONS_DEFINE= DEBUG GTKDOC FAM_ALTBACKEND MANPAGES NLS TEST	44	OPTIONS_DEFINE= DEBUG GTKDOC FAM_ALTBACKEND MANPAGES NLS TEST
Lines 45-58 OPTIONS_SUB= yes Link Here
45		47
46	GTKDOC_BUILD_DEPENDS= gtk-doc>0:textproc/gtk-doc	48	GTKDOC_BUILD_DEPENDS= gtk-doc>0:textproc/gtk-doc
47	GTKDOC_IMPLIES= TEST	49	GTKDOC_IMPLIES= TEST
48	GTKDOC_MESON_TRUE= gtk_doc	50	GTKDOC_MESON_TRUE= documentation
49		51
50	FAM_ALTBACKEND_DESC= Alternate file monitor backend	52	FAM_ALTBACKEND_DESC= Alternate file monitor backend
51		53
52	MANPAGES_BUILD_DEPENDS= docbook-xml>4.1.2:textproc/docbook-xml \	54	MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils
53	docbook-xsl>0:textproc/docbook-xsl	55	MANPAGES_MESON_ENABLED= man-pages
54	MANPAGES_USE= GNOME=libxslt:build
55	MANPAGES_MESON_TRUE= man
56		56
57	TEST_BUILD_DEPENDS= dbus-daemon:devel/dbus	57	TEST_BUILD_DEPENDS= dbus-daemon:devel/dbus
58	TEST_MESON_TRUE= tests	58	TEST_MESON_TRUE= tests

Lines 1-21 Link Here

(-)b/devel/glib20/files/patch-glib_glib-unix.c (-12 / +11 lines)
1	--- glib/gspawn.c.orig 2023-03-10 14:33:15 UTC	1	--- glib/glib-unix.c.orig 2024-03-07 21:35:05 UTC
2	+++ glib/gspawn.c	2	+++ glib/glib-unix.c
3	@@ -54,6 +54,12 @@	3	@@ -55,6 +55,11 @@
4	#include <sys/syscall.h> /* for syscall and SYS_getdents64 */	4	#include <sys/syscall.h> /* for syscall and SYS_getdents64 */
5	#endif	5	#endif
6		6
7	+#ifdef __FreeBSD__	7	+#ifdef __FreeBSD__
8	+#include <sys/types.h>
9	+#include <sys/user.h>	8	+#include <sys/user.h>
10	+#include <libutil.h>	9	+#include <libutil.h>
11	+#endif	10	+#endif
12	+	11	+
13	#include "gspawn.h"	12	#ifdef HAVE_SYS_RESOURCE_H
14	#include "gspawn-private.h"	13	#include <sys/resource.h>
15	#include "gthread.h"	14	#endif /* HAVE_SYS_RESOURCE_H */
16	@@ -1231,6 +1237,33 @@ g_spawn_check_exit_status (gint wait_status,	15	@@ -620,6 +625,33 @@ filename_to_fd (const char *p)
17	return g_spawn_check_wait_status (wait_status, error);
18	}	16	}
		17	#endif
19		18
20	+#ifdef __FreeBSD__	19	+#ifdef __FreeBSD__
21	+static int	20	+static int
Lines 44-53 Link Here
44	+}	43	+}
45	+#endif	44	+#endif
46	+	45	+
		46	static int safe_fdwalk_with_invalid_fds (int (cb)(void data, int fd), void *data);
		47
47	/* This function is called between fork() and exec() and hence must be	48	/* This function is called between fork() and exec() and hence must be
48	* async-signal-safe (see signal-safety(7)). */	49	@@ -640,6 +672,13 @@ safe_fdwalk (int (cb)(void data, int fd), void *data
49	static gssize
50	@@ -1432,6 +1465,13 @@ safe_fdwalk (int (cb)(void data, int fd), void *data
51	* may fail on non-Linux operating systems. See safe_fdwalk_with_invalid_fds	50	* may fail on non-Linux operating systems. See safe_fdwalk_with_invalid_fds
52	* for a slower alternative.	51	* for a slower alternative.
53	*/	52	*/