Attachment #236642 for bug #266466

View | Details | Raw Unified | Return to bug 266466
Collapse All | Expand All




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

LICENSE=	LGPL20

LIB_DEPENDS=	libffi.so:devel/libffi \
		libpcre2-8.so:devel/pcre2

# iconv:wchar_t - our iconv in base doesn't support utf-8 -> wchar_t (boooo)
# (wchar_t is used by glibmm, rawtherapee triggered this)


CONFLICTS_INSTALL=	p5-Giovanni

_LIBVERSION=	0.7400.0
PLIST_SUB=	LIBVERSION=${_LIBVERSION}

OPTIONS_DEFINE=		DEBUG DOCS FAM_ALTBACKEND MANPAGES NLS TEST

# doesn't build yet
MESON_ARGS+=	-Ddtrace=false

.if empty(ICONV_LIB)
# native?
MESON_ARGS+=	-Diconv=libc
.else
MESON_ARGS+=	-Diconv=external
.endif

pre-configure-FAM_ALTBACKEND-on:
	@${REINPLACE_CMD} -e 's|kqueue-helper.c|kqueue_fnm.c|g ; \
		s|.*kqueue-missing.c.*||g ; \

Lines 1-3 Link Here

(-)b/devel/glib20/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1657912876	1	TIMESTAMP = 1663439897
2	SHA256 (gnome/glib-2.72.3.tar.xz) = 4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0	2	SHA256 (gnome/glib-2.74.0.tar.xz) = 3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
3	SIZE (gnome/glib-2.72.3.tar.xz) = 4893484	3	SIZE (gnome/glib-2.74.0.tar.xz) = 5183072




--- gio/gunixmounts.c.orig	2020-10-01 09:17:53.138733000 -0400
+++ gio/gunixmounts.c	2020-10-15 13:05:40.628175000 -0400
@@ -1389,6 +1389,8 @@
 
 #elif (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
 
+G_LOCK_DEFINE_STATIC(getfsent);
+
 static GList *
 _g_get_unix_mount_points (void)
 {
@@ -1400,9 +1402,6 @@
   struct stat sb;
 #endif
   
-  if (!setfsent ())
-    return NULL;
-
   return_list = NULL;
   
 #ifdef HAVE_SYS_SYSCTL_H
@@ -1433,6 +1432,11 @@
 #endif
 #endif
   
+  G_LOCK (getfsent);
+  if (!setfsent ()) {
+    G_UNLOCK (getfsent);
+    return NULL;
+  }
   while ((fstab = getfsent ()) != NULL)
     {
       gboolean is_read_only = FALSE;
@@ -1468,6 +1472,7 @@
     }
   
   endfsent ();
+  G_UNLOCK (getfsent);
   
   return g_list_reverse (return_list);
 }

Lines 1-11 Link Here

(-)b/devel/glib20/files/patch-glib_meson.build (-4 / +4 lines)
1	--- glib/meson.build.orig 2022-03-17 15:01:31 UTC	1	--- glib/meson.build.orig 2022-09-17 18:38:17 UTC
2	+++ glib/meson.build	2	+++ glib/meson.build
3	@@ -375,7 +375,7 @@ libglib = library('glib-2.0',	3	@@ -379,7 +379,7 @@ libglib = library('glib-2.0',
4	link_args : [noseh_link_args, glib_link_flags, win32_ldflags],	4	link_args : [noseh_link_args, glib_link_flags, win32_ldflags],
5	include_directories : configinc,	5	include_directories : configinc,
6	link_with: [charset_lib, gnulib_lib],	6	link_with: [charset_lib, gnulib_lib],
7	- dependencies : [pcre, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep],	7	- dependencies : [pcre2, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep],
8	+ dependencies : [pcre, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep] + libutil,	8	+ dependencies : [pcre2, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep] + libutil,
9	c_args : glib_c_args,	9	c_args : glib_c_args,
10	objc_args : glib_c_args,	10	objc_args : glib_c_args,
11	)	11	)




bin/gtester-report
include/gio-unix-2.0/gio/gdesktopappinfo.h
include/gio-unix-2.0/gio/gfiledescriptorbased.h
include/gio-unix-2.0/gio/gunixfdlist.h
include/gio-unix-2.0/gio/gunixfdmessage.h
include/gio-unix-2.0/gio/gunixinputstream.h
include/gio-unix-2.0/gio/gunixmounts.h

include/glib-2.0/gio/gtlsserverconnection.h
include/glib-2.0/gio/gunixconnection.h
include/glib-2.0/gio/gunixcredentialsmessage.h
include/glib-2.0/gio/gunixfdlist.h
include/glib-2.0/gio/gunixsocketaddress.h
include/glib-2.0/gio/gvfs.h
include/glib-2.0/gio/gvolume.h

libdata/pkgconfig/gmodule-no-export-2.0.pc
libdata/pkgconfig/gobject-2.0.pc
libdata/pkgconfig/gthread-2.0.pc
libexec/gio-launch-desktop
%%MANPAGES%%man/man1/gapplication.1.gz
%%MANPAGES%%man/man1/gdbus-codegen.1.gz
%%MANPAGES%%man/man1/gdbus.1.gz

%%DOCS%%share/gtk-doc/html/gio/api-index-2-68.html
%%DOCS%%share/gtk-doc/html/gio/api-index-2-70.html
%%DOCS%%share/gtk-doc/html/gio/api-index-2-72.html
%%DOCS%%share/gtk-doc/html/gio/api-index-2-74.html
%%DOCS%%share/gtk-doc/html/gio/api-index-deprecated.html
%%DOCS%%share/gtk-doc/html/gio/api-index-full.html
%%DOCS%%share/gtk-doc/html/gio/application.html

%%DOCS%%share/gtk-doc/html/glib/api-index-2-68.html
%%DOCS%%share/gtk-doc/html/glib/api-index-2-70.html
%%DOCS%%share/gtk-doc/html/glib/api-index-2-72.html
%%DOCS%%share/gtk-doc/html/glib/api-index-2-74.html
%%DOCS%%share/gtk-doc/html/glib/api-index-2-8.html
%%DOCS%%share/gtk-doc/html/glib/api-index-deprecated.html
%%DOCS%%share/gtk-doc/html/glib/api-index-full.html

%%DOCS%%share/gtk-doc/html/gobject/api-index-2-68.html
%%DOCS%%share/gtk-doc/html/gobject/api-index-2-70.html
%%DOCS%%share/gtk-doc/html/gobject/api-index-2-72.html
%%DOCS%%share/gtk-doc/html/gobject/api-index-2-74.html
%%DOCS%%share/gtk-doc/html/gobject/api-index-2-8.html
%%DOCS%%share/gtk-doc/html/gobject/api-index-deprecated.html
%%DOCS%%share/gtk-doc/html/gobject/api-index-full.html

%%DOCS%%share/gtk-doc/html/gobject/tools-vala.html
%%DOCS%%share/gtk-doc/html/gobject/up-insensitive.png
%%DOCS%%share/gtk-doc/html/gobject/up.png
%%NLS%%share/locale/ab/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/af/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/am/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/an/LC_MESSAGES/glib20.mo

Return to bug 266466

Lines 1-5 Link Here

(-)b/devel/glib20/Makefile (-10 / +3 lines)
1	PORTNAME= glib	1	PORTNAME= glib
2	DISTVERSION= 2.72.3	2	DISTVERSION= 2.74.0
3	PORTEPOCH= 2	3	PORTEPOCH= 2
4	CATEGORIES= devel	4	CATEGORIES= devel
5	MASTER_SITES= GNOME	5	MASTER_SITES= GNOME
Lines 12-18 WWW= https://www.gtk.org/ Link Here
12	LICENSE= LGPL20	12	LICENSE= LGPL20
13		13
14	LIB_DEPENDS= libffi.so:devel/libffi \	14	LIB_DEPENDS= libffi.so:devel/libffi \
15	libpcre.so:devel/pcre	15	libpcre2-8.so:devel/pcre2
16		16
17	# iconv:wchar_t - our iconv in base doesn't support utf-8 -> wchar_t (boooo)	17	# iconv:wchar_t - our iconv in base doesn't support utf-8 -> wchar_t (boooo)
18	# (wchar_t is used by glibmm, rawtherapee triggered this)	18	# (wchar_t is used by glibmm, rawtherapee triggered this)
Lines 35-41 CPE_VENDOR= gnome Link Here
35		35
36	CONFLICTS_INSTALL= p5-Giovanni	36	CONFLICTS_INSTALL= p5-Giovanni
37		37
38	_LIBVERSION= 0.7200.3	38	_LIBVERSION= 0.7400.0
39	PLIST_SUB= LIBVERSION=${_LIBVERSION}	39	PLIST_SUB= LIBVERSION=${_LIBVERSION}
40		40
41	OPTIONS_DEFINE= DEBUG DOCS FAM_ALTBACKEND MANPAGES NLS TEST	41	OPTIONS_DEFINE= DEBUG DOCS FAM_ALTBACKEND MANPAGES NLS TEST
Lines 61-73 TEST_MESON_TRUE= tests Link Here
61	# doesn't build yet	61	# doesn't build yet
62	MESON_ARGS+= -Ddtrace=false	62	MESON_ARGS+= -Ddtrace=false
63		63
64	.if empty(ICONV_LIB)
65	# native?
66	MESON_ARGS+= -Diconv=libc
67	.else
68	MESON_ARGS+= -Diconv=external
69	.endif
70
71	pre-configure-FAM_ALTBACKEND-on:	64	pre-configure-FAM_ALTBACKEND-on:
72	@${REINPLACE_CMD} -e 's\|kqueue-helper.c\|kqueue_fnm.c\|g ; \	65	@${REINPLACE_CMD} -e 's\|kqueue-helper.c\|kqueue_fnm.c\|g ; \
73	s\|.kqueue-missing.c.\|\|g ; \	66	s\|.kqueue-missing.c.\|\|g ; \

Removed Link Here

(-)a/devel/glib20/files/patch-gio_gunixmounts.c (-41 lines)
1	--- gio/gunixmounts.c.orig 2020-10-01 09:17:53.138733000 -0400
2	+++ gio/gunixmounts.c 2020-10-15 13:05:40.628175000 -0400
3	@@ -1389,6 +1389,8 @@
4
5	#elif (defined(HAVE_GETVFSSTAT) \|\| defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
6
7	+G_LOCK_DEFINE_STATIC(getfsent);
8	+
9	static GList *
10	_g_get_unix_mount_points (void)
11	{
12	@@ -1400,9 +1402,6 @@
13	struct stat sb;
14	#endif
15
16	- if (!setfsent ())
17	- return NULL;
18	-
19	return_list = NULL;
20
21	#ifdef HAVE_SYS_SYSCTL_H
22	@@ -1433,6 +1432,11 @@
23	#endif
24	#endif
25
26	+ G_LOCK (getfsent);
27	+ if (!setfsent ()) {
28	+ G_UNLOCK (getfsent);
29	+ return NULL;
30	+ }
31	while ((fstab = getfsent ()) != NULL)
32	{
33	gboolean is_read_only = FALSE;
34	@@ -1468,6 +1472,7 @@
35	}
36
37	endfsent ();
38	+ G_UNLOCK (getfsent);
39
40	return g_list_reverse (return_list);
41	}

Lines 15-21 bin/gtester Link Here

(-)b/devel/glib20/pkg-plist (-1 / +6 lines)
15	bin/gtester-report	15	bin/gtester-report
16	include/gio-unix-2.0/gio/gdesktopappinfo.h	16	include/gio-unix-2.0/gio/gdesktopappinfo.h
17	include/gio-unix-2.0/gio/gfiledescriptorbased.h	17	include/gio-unix-2.0/gio/gfiledescriptorbased.h
18	include/gio-unix-2.0/gio/gunixfdlist.h
19	include/gio-unix-2.0/gio/gunixfdmessage.h	18	include/gio-unix-2.0/gio/gunixfdmessage.h
20	include/gio-unix-2.0/gio/gunixinputstream.h	19	include/gio-unix-2.0/gio/gunixinputstream.h
21	include/gio-unix-2.0/gio/gunixmounts.h	20	include/gio-unix-2.0/gio/gunixmounts.h
Lines 170-175 include/glib-2.0/gio/gtlspassword.h Link Here
170	include/glib-2.0/gio/gtlsserverconnection.h	169	include/glib-2.0/gio/gtlsserverconnection.h
171	include/glib-2.0/gio/gunixconnection.h	170	include/glib-2.0/gio/gunixconnection.h
172	include/glib-2.0/gio/gunixcredentialsmessage.h	171	include/glib-2.0/gio/gunixcredentialsmessage.h
		172	include/glib-2.0/gio/gunixfdlist.h
173	include/glib-2.0/gio/gunixsocketaddress.h	173	include/glib-2.0/gio/gunixsocketaddress.h
174	include/glib-2.0/gio/gvfs.h	174	include/glib-2.0/gio/gvfs.h
175	include/glib-2.0/gio/gvolume.h	175	include/glib-2.0/gio/gvolume.h
Lines 317-322 libdata/pkgconfig/gmodule-export-2.0.pc Link Here
317	libdata/pkgconfig/gmodule-no-export-2.0.pc	317	libdata/pkgconfig/gmodule-no-export-2.0.pc
318	libdata/pkgconfig/gobject-2.0.pc	318	libdata/pkgconfig/gobject-2.0.pc
319	libdata/pkgconfig/gthread-2.0.pc	319	libdata/pkgconfig/gthread-2.0.pc
		320	libexec/gio-launch-desktop
320	%%MANPAGES%%man/man1/gapplication.1.gz	321	%%MANPAGES%%man/man1/gapplication.1.gz
321	%%MANPAGES%%man/man1/gdbus-codegen.1.gz	322	%%MANPAGES%%man/man1/gdbus-codegen.1.gz
322	%%MANPAGES%%man/man1/gdbus.1.gz	323	%%MANPAGES%%man/man1/gdbus.1.gz
Lines 550-555 share/gettext/its/gschema.loc Link Here
550	%%DOCS%%share/gtk-doc/html/gio/api-index-2-68.html	551	%%DOCS%%share/gtk-doc/html/gio/api-index-2-68.html
551	%%DOCS%%share/gtk-doc/html/gio/api-index-2-70.html	552	%%DOCS%%share/gtk-doc/html/gio/api-index-2-70.html
552	%%DOCS%%share/gtk-doc/html/gio/api-index-2-72.html	553	%%DOCS%%share/gtk-doc/html/gio/api-index-2-72.html
		554	%%DOCS%%share/gtk-doc/html/gio/api-index-2-74.html
553	%%DOCS%%share/gtk-doc/html/gio/api-index-deprecated.html	555	%%DOCS%%share/gtk-doc/html/gio/api-index-deprecated.html
554	%%DOCS%%share/gtk-doc/html/gio/api-index-full.html	556	%%DOCS%%share/gtk-doc/html/gio/api-index-full.html
555	%%DOCS%%share/gtk-doc/html/gio/application.html	557	%%DOCS%%share/gtk-doc/html/gio/application.html
Lines 686-691 share/gettext/its/gschema.loc Link Here
686	%%DOCS%%share/gtk-doc/html/glib/api-index-2-68.html	688	%%DOCS%%share/gtk-doc/html/glib/api-index-2-68.html
687	%%DOCS%%share/gtk-doc/html/glib/api-index-2-70.html	689	%%DOCS%%share/gtk-doc/html/glib/api-index-2-70.html
688	%%DOCS%%share/gtk-doc/html/glib/api-index-2-72.html	690	%%DOCS%%share/gtk-doc/html/glib/api-index-2-72.html
		691	%%DOCS%%share/gtk-doc/html/glib/api-index-2-74.html
689	%%DOCS%%share/gtk-doc/html/glib/api-index-2-8.html	692	%%DOCS%%share/gtk-doc/html/glib/api-index-2-8.html
690	%%DOCS%%share/gtk-doc/html/glib/api-index-deprecated.html	693	%%DOCS%%share/gtk-doc/html/glib/api-index-deprecated.html
691	%%DOCS%%share/gtk-doc/html/glib/api-index-full.html	694	%%DOCS%%share/gtk-doc/html/glib/api-index-full.html
Lines 831-836 share/gettext/its/gschema.loc Link Here
831	%%DOCS%%share/gtk-doc/html/gobject/api-index-2-68.html	834	%%DOCS%%share/gtk-doc/html/gobject/api-index-2-68.html
832	%%DOCS%%share/gtk-doc/html/gobject/api-index-2-70.html	835	%%DOCS%%share/gtk-doc/html/gobject/api-index-2-70.html
833	%%DOCS%%share/gtk-doc/html/gobject/api-index-2-72.html	836	%%DOCS%%share/gtk-doc/html/gobject/api-index-2-72.html
		837	%%DOCS%%share/gtk-doc/html/gobject/api-index-2-74.html
834	%%DOCS%%share/gtk-doc/html/gobject/api-index-2-8.html	838	%%DOCS%%share/gtk-doc/html/gobject/api-index-2-8.html
835	%%DOCS%%share/gtk-doc/html/gobject/api-index-deprecated.html	839	%%DOCS%%share/gtk-doc/html/gobject/api-index-deprecated.html
836	%%DOCS%%share/gtk-doc/html/gobject/api-index-full.html	840	%%DOCS%%share/gtk-doc/html/gobject/api-index-full.html
Lines 894-899 share/gettext/its/gschema.loc Link Here
894	%%DOCS%%share/gtk-doc/html/gobject/tools-vala.html	898	%%DOCS%%share/gtk-doc/html/gobject/tools-vala.html
895	%%DOCS%%share/gtk-doc/html/gobject/up-insensitive.png	899	%%DOCS%%share/gtk-doc/html/gobject/up-insensitive.png
896	%%DOCS%%share/gtk-doc/html/gobject/up.png	900	%%DOCS%%share/gtk-doc/html/gobject/up.png
		901	%%NLS%%share/locale/ab/LC_MESSAGES/glib20.mo
897	%%NLS%%share/locale/af/LC_MESSAGES/glib20.mo	902	%%NLS%%share/locale/af/LC_MESSAGES/glib20.mo
898	%%NLS%%share/locale/am/LC_MESSAGES/glib20.mo	903	%%NLS%%share/locale/am/LC_MESSAGES/glib20.mo
899	%%NLS%%share/locale/an/LC_MESSAGES/glib20.mo	904	%%NLS%%share/locale/an/LC_MESSAGES/glib20.mo