Attachment #228336 for bug #257623

Lines 2-7 Link Here

(-)b/devel/glib20/Makefile (-1 / +5 lines)
2		2
3	PORTNAME= glib	3	PORTNAME= glib
4	DISTVERSION= 2.70.0	4	DISTVERSION= 2.70.0
		5	PORTREVISION= 1
5	PORTEPOCH= 2	6	PORTEPOCH= 2
6	CATEGORIES= devel	7	CATEGORIES= devel
7	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
Lines 36-42 CPE_VENDOR= gnome Link Here
36	_LIBVERSION= 0.7000.0	37	_LIBVERSION= 0.7000.0
37	PLIST_SUB= LIBVERSION=${_LIBVERSION}	38	PLIST_SUB= LIBVERSION=${_LIBVERSION}
38		39
39	OPTIONS_DEFINE= DEBUG FAM_ALTBACKEND MANPAGES NLS	40	OPTIONS_DEFINE= DEBUG FAM_ALTBACKEND MANPAGES NLS TEST
40	OPTIONS_DEFAULT= MANPAGES	41	OPTIONS_DEFAULT= MANPAGES
41	OPTIONS_SUB= yes	42	OPTIONS_SUB= yes
42		43
Lines 47-52 MANPAGES_BUILD_DEPENDS= docbook-xml>4.1.2:textproc/docbook-xml \ Link Here
47	MANPAGES_USE= GNOME=libxslt:build	48	MANPAGES_USE= GNOME=libxslt:build
48	MANPAGES_MESON_TRUE= man	49	MANPAGES_MESON_TRUE= man
49		50
		51	TEST_DEPENDS= dbus-daemon:devel/dbus
		52	TEST_MESON_TRUE= tests
		53
50	.include <bsd.port.pre.mk>	54	.include <bsd.port.pre.mk>
51		55
52	# doesn't build yet	56	# doesn't build yet




--- gio/tests/meson.build.orig	2021-06-10 18:57:57 UTC
+++ gio/tests/meson.build
@@ -49,7 +49,6 @@ gio_tests = {
   'buffered-output-stream' : {},
   'cancellable' : {},
   'contexts' : {},
-  'contenttype' : {},
   'converter-stream' : {},
   'credentials' : {},
   'data-input-stream' : {},
@@ -94,7 +93,6 @@ gio_tests = {
   'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
   'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']},
   'tls-bindings' : {'extra_sources' : ['gtesttlsbackend.c']},
-  'gdbus-address-get-session' : {},
   'win32-appinfo' : {},
 }
 
@@ -151,10 +149,6 @@ endif
 if host_machine.system() != 'windows'
   gio_tests += {
     'file' : {},
-    'gdbus-peer' : {
-      'dependencies' : [libgdbus_example_objectmanager_dep],
-      'install_rpath' : installed_tests_execdir
-    },
     'gdbus-peer-object-manager' : {},
     'live-g-file' : {},
     'socket-address' : {},
@@ -190,31 +184,14 @@ if host_machine.system() != 'windows'
     }
   endif
 
-  # Uninstalled because of the check-for-executable logic in DesktopAppInfo
-  # unable to find the installed executable
-  if not glib_have_cocoa
-    gio_tests += {
-      'appinfo' : {
-        'install' : false,
-      },
-      'desktop-app-info' : {
-        'install' : false,
-      },
-    }
-  endif
-
   test_extra_programs += {
     'basic-application' : {},
     'dbus-launch' : {},
-    'appinfo-test' : {},
   }
 
   if not glib_have_cocoa
     test_extra_programs += {
       'apps' : {},
-    }
-    gio_tests += {
-      'mimeapps' : {},
     }
   endif
 




--- glib/glib-unix.c.orig	2021-09-17 10:17:56 UTC
+++ glib/glib-unix.c
@@ -463,7 +463,6 @@ g_unix_get_passwd_entry (const gchar  *user_name,
     } *buffer = NULL;
   gsize string_buffer_size = 0;
   GError *local_error = NULL;
-  int errsv = 0;
 
   g_return_val_if_fail (user_name != NULL, NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
@@ -493,10 +492,8 @@ g_unix_get_passwd_entry (const gchar  *user_name,
        */
       buffer = g_malloc0 (sizeof (*buffer) + string_buffer_size + 6);
 
-      errno = 0;
       retval = getpwnam_r (user_name, &buffer->pwd, buffer->string_buffer,
                            string_buffer_size, &passwd_file_entry);
-      errsv = errno;
 
       /* Bail out if: the lookup was successful, or if the user id can't be
        * found (should be pretty rare case actually), or if the buffer should be
@@ -508,19 +505,19 @@ g_unix_get_passwd_entry (const gchar  *user_name,
           break;
         }
       else if (retval == 0 ||
-          errsv == ENOENT || errsv == ESRCH ||
-          errsv == EBADF || errsv == EPERM)
+          retval == ENOENT || retval == ESRCH ||
+          retval == EBADF || retval == EPERM)
         {
           /* Username not found. */
-          g_unix_set_error_from_errno (&local_error, errsv);
+          g_unix_set_error_from_errno (&local_error, retval);
           break;
         }
-      else if (errsv == ERANGE)
+      else if (retval == ERANGE)
         {
           /* Can’t allocate enough string buffer space. */
           if (string_buffer_size > 32 * 1024)
             {
-              g_unix_set_error_from_errno (&local_error, errsv);
+              g_unix_set_error_from_errno (&local_error, retval);
               break;
             }
 
@@ -529,7 +526,7 @@ g_unix_get_passwd_entry (const gchar  *user_name,
         }
       else
         {
-          g_unix_set_error_from_errno (&local_error, errsv);
+          g_unix_set_error_from_errno (&local_error, retval);
           break;
         }
     }
@@ -543,7 +540,6 @@ g_unix_get_passwd_entry (const gchar  *user_name,
     {
       g_clear_pointer (&buffer, g_free);
       g_propagate_error (error, g_steal_pointer (&local_error));
-      errno = errsv;
     }
 
   return (struct passwd *) g_steal_pointer (&buffer);

Return to bug 257623

Added Link Here

(-)b/devel/glib20/files/patch-gio_tests_meson.build (+61 lines)
1	--- gio/tests/meson.build.orig 2021-06-10 18:57:57 UTC
2	+++ gio/tests/meson.build
3	@@ -49,7 +49,6 @@ gio_tests = {
4	'buffered-output-stream' : {},
5	'cancellable' : {},
6	'contexts' : {},
7	- 'contenttype' : {},
8	'converter-stream' : {},
9	'credentials' : {},
10	'data-input-stream' : {},
11	@@ -94,7 +93,6 @@ gio_tests = {
12	'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
13	'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']},
14	'tls-bindings' : {'extra_sources' : ['gtesttlsbackend.c']},
15	- 'gdbus-address-get-session' : {},
16	'win32-appinfo' : {},
17	}
18
19	@@ -151,10 +149,6 @@ endif
20	if host_machine.system() != 'windows'
21	gio_tests += {
22	'file' : {},
23	- 'gdbus-peer' : {
24	- 'dependencies' : [libgdbus_example_objectmanager_dep],
25	- 'install_rpath' : installed_tests_execdir
26	- },
27	'gdbus-peer-object-manager' : {},
28	'live-g-file' : {},
29	'socket-address' : {},
30	@@ -190,31 +184,14 @@ if host_machine.system() != 'windows'
31	}
32	endif
33
34	- # Uninstalled because of the check-for-executable logic in DesktopAppInfo
35	- # unable to find the installed executable
36	- if not glib_have_cocoa
37	- gio_tests += {
38	- 'appinfo' : {
39	- 'install' : false,
40	- },
41	- 'desktop-app-info' : {
42	- 'install' : false,
43	- },
44	- }
45	- endif
46	-
47	test_extra_programs += {
48	'basic-application' : {},
49	'dbus-launch' : {},
50	- 'appinfo-test' : {},
51	}
52
53	if not glib_have_cocoa
54	test_extra_programs += {
55	'apps' : {},
56	- }
57	- gio_tests += {
58	- 'mimeapps' : {},
59	}
60	endif
61

Added Link Here

(-)b/devel/glib20/files/patch-glib_glib-unix.c (+63 lines)
1	--- glib/glib-unix.c.orig 2021-09-17 10:17:56 UTC
2	+++ glib/glib-unix.c
3	@@ -463,7 +463,6 @@ g_unix_get_passwd_entry (const gchar *user_name,
4	} *buffer = NULL;
5	gsize string_buffer_size = 0;
6	GError *local_error = NULL;
7	- int errsv = 0;
8
9	g_return_val_if_fail (user_name != NULL, NULL);
10	g_return_val_if_fail (error == NULL \|\| *error == NULL, NULL);
11	@@ -493,10 +492,8 @@ g_unix_get_passwd_entry (const gchar *user_name,
12	*/
13	buffer = g_malloc0 (sizeof (*buffer) + string_buffer_size + 6);
14
15	- errno = 0;
16	retval = getpwnam_r (user_name, &buffer->pwd, buffer->string_buffer,
17	string_buffer_size, &passwd_file_entry);
18	- errsv = errno;
19
20	/* Bail out if: the lookup was successful, or if the user id can't be
21	* found (should be pretty rare case actually), or if the buffer should be
22	@@ -508,19 +505,19 @@ g_unix_get_passwd_entry (const gchar *user_name,
23	break;
24	}
25	else if (retval == 0 \|\|
26	- errsv == ENOENT \|\| errsv == ESRCH \|\|
27	- errsv == EBADF \|\| errsv == EPERM)
28	+ retval == ENOENT \|\| retval == ESRCH \|\|
29	+ retval == EBADF \|\| retval == EPERM)
30	{
31	/* Username not found. */
32	- g_unix_set_error_from_errno (&local_error, errsv);
33	+ g_unix_set_error_from_errno (&local_error, retval);
34	break;
35	}
36	- else if (errsv == ERANGE)
37	+ else if (retval == ERANGE)
38	{
39	/* Can’t allocate enough string buffer space. */
40	if (string_buffer_size > 32 * 1024)
41	{
42	- g_unix_set_error_from_errno (&local_error, errsv);
43	+ g_unix_set_error_from_errno (&local_error, retval);
44	break;
45	}
46
47	@@ -529,7 +526,7 @@ g_unix_get_passwd_entry (const gchar *user_name,
48	}
49	else
50	{
51	- g_unix_set_error_from_errno (&local_error, errsv);
52	+ g_unix_set_error_from_errno (&local_error, retval);
53	break;
54	}
55	}
56	@@ -543,7 +540,6 @@ g_unix_get_passwd_entry (const gchar *user_name,
57	{
58	g_clear_pointer (&buffer, g_free);
59	g_propagate_error (error, g_steal_pointer (&local_error));
60	- errno = errsv;
61	}
62
63	return (struct passwd *) g_steal_pointer (&buffer);