View | Details | Raw Unified | Return to bug 256200 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/glib20/Makefile (-2 / +2 lines)
Lines 1-7 Link Here
1
# Created by: Vanilla I. Shu <vanilla@FreeBSD.org>
1
# Created by: Vanilla I. Shu <vanilla@FreeBSD.org>
2
2
3
PORTNAME=	glib
3
PORTNAME=	glib
4
DISTVERSION=	2.66.8
4
DISTVERSION=	2.68.3
5
PORTREVISION=	0
5
PORTREVISION=	0
6
PORTEPOCH=	2
6
PORTEPOCH=	2
7
CATEGORIES=	devel
7
CATEGORIES=	devel
Lines 32-38 MESON_ARGS= -Db_lundef=false \ Link Here
32
BINARY_ALIAS=	python3=${PYTHON_CMD}
32
BINARY_ALIAS=	python3=${PYTHON_CMD}
33
PORTSCOUT=	limitw:1,even
33
PORTSCOUT=	limitw:1,even
34
34
35
_LIBVERSION=	0.6600.8
35
_LIBVERSION=	0.6800.3
36
PLIST_SUB=	LIBVERSION=${_LIBVERSION}
36
PLIST_SUB=	LIBVERSION=${_LIBVERSION}
37
37
38
OPTIONS_DEFINE=	DEBUG FAM_ALTBACKEND MANPAGES NLS
38
OPTIONS_DEFINE=	DEBUG FAM_ALTBACKEND MANPAGES NLS
(-)b/devel/glib20/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1622115958
1
TIMESTAMP = 1626547415
2
SHA256 (gnome/glib-2.66.8.tar.xz) = 97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b
2
SHA256 (gnome/glib-2.68.3.tar.xz) = e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138
3
SIZE (gnome/glib-2.66.8.tar.xz) = 4845548
3
SIZE (gnome/glib-2.68.3.tar.xz) = 4945236
(-)a/devel/glib20/files/patch-gio_glib-compile-schemas.c (-18 lines)
Removed Link Here
1
--- gio/glib-compile-schemas.c.orig	2017-08-07 16:58:31.000000000 +0200
2
+++ gio/glib-compile-schemas.c	2017-09-15 09:25:19.746310000 +0200
3
@@ -1219,6 +1219,7 @@ parse_state_start_schema (ParseState  *state,
4
       return;
5
     }
6
 
7
+#if 0
8
   if (path && (g_str_has_prefix (path, "/apps/") ||
9
                g_str_has_prefix (path, "/desktop/") ||
10
                g_str_has_prefix (path, "/system/")))
11
@@ -1231,6 +1232,7 @@ parse_state_start_schema (ParseState  *state,
12
       g_printerr ("%s\n", message);
13
       g_free (message);
14
     }
15
+#endif
16
 
17
   state->schema_state = schema_state_new (path, gettext_domain,
18
                                           extends, extends_name, list_of);
(-)a/devel/glib20/files/patch-gio_gunixmount.c (-20 lines)
Removed Link Here
1
--- gio/gunixmount.c.orig	2014-09-21 13:00:08.875162804 +0200
2
+++ gio/gunixmount.c	2014-09-21 13:00:14.327163623 +0200
3
@@ -353,12 +353,17 @@
4
                     gpointer             user_data)
5
 {
6
   GUnixMount *unix_mount = G_UNIX_MOUNT (mount);
7
+#ifndef __FreeBSD__
8
   char *argv[] = {"eject", NULL, NULL};
9
 
10
   if (unix_mount->mount_path != NULL)
11
     argv[1] = unix_mount->mount_path;
12
   else
13
     argv[1] = unix_mount->device_path;
14
+#else
15
+   char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL};
16
+   argv[2] = unix_mount->device_path;
17
+#endif
18
 
19
   eject_unmount_do (mount, cancellable, callback, user_data, argv);
20
 }
(-)a/devel/glib20/files/patch-gio_gunixmounts.c (-41 lines)
Removed Link Here
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
 }
(-)a/devel/glib20/files/patch-gio_gunixvolume.c (-17 lines)
Removed Link Here
1
--- gio/gunixvolume.c.orig	2014-03-20 04:50:45.000000000 +0100
2
+++ gio/gunixvolume.c	2014-03-24 20:44:40.000000000 +0100
3
@@ -356,9 +356,14 @@
4
                      gpointer             user_data)
5
 {
6
   GUnixVolume *unix_volume = G_UNIX_VOLUME (volume);
7
+#ifdef __FreeBSD__
8
+  const gchar *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL};
9
+  argv[2] = unix_volume->device_path;
10
+#else
11
   const gchar *argv[] = { "eject", NULL, NULL };
12
 
13
   argv[1] = unix_volume->device_path;
14
+#endif
15
 
16
   eject_mount_do (volume, cancellable, callback, user_data, argv);
17
 }
(-)a/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h (-12 lines)
Removed Link Here
1
--- gio/xdgmime/xdgmimecache.h.orig	2008-06-12 10:25:40.000000000 -0400
2
+++ gio/xdgmime/xdgmimecache.h	2008-06-14 00:49:59.000000000 -0400
3
@@ -46,6 +46,9 @@ typedef struct _XdgMimeCache XdgMimeCach
4
 #define _xdg_mime_cache_get_icon                      XDG_RESERVED_ENTRY(cache_get_icon)
5
 #define _xdg_mime_cache_get_generic_icon              XDG_RESERVED_ENTRY(cache_get_generic_icon)
6
 #define _xdg_mime_cache_glob_dump                     XDG_RESERVED_ENTRY(cache_glob_dump)
7
+#define _xdg_mime_cache_is_valid_mime_type            XDG_RESERVED_ENTRY(cache_is_valid_mime_type)
8
+#define _xdg_mime_cache_mime_type_equal               XDG_RESERVED_ENTRY(cache_mime_type_equal)
9
+#define _xdg_mime_cache_media_type_equal              XDG_RESERVED_ENTRY(cache_media_type_equal)
10
 #endif
11
 
12
 extern XdgMimeCache **_caches;
(-)a/devel/glib20/files/patch-glib_gfileutils.c (-14 lines)
Removed Link Here
1
https://gitlab.gnome.org/GNOME/glib/merge_requests/832
2
3
Index: glib/gfileutils.c
4
--- glib/gfileutils.c.orig
5
+++ glib/gfileutils.c
6
@@ -259,7 +259,7 @@ g_mkdir_with_parents (const gchar *pathname,
7
       
8
       if (!g_file_test (fn, G_FILE_TEST_EXISTS))
9
 	{
10
-	  if (g_mkdir (fn, mode) == -1 && errno != EEXIST)
11
+	  if (g_mkdir (fn, mode) == -1 && errno != EEXIST && (p ? (errno != ENOENT) : (-1)))
12
 	    {
13
 	      int errno_save = errno;
14
 	      if (errno != ENOENT || !p)
(-)a/devel/glib20/files/patch-glib_gspawn.c (-62 lines)
Removed Link Here
1
--- glib/gspawn.c.orig	2020-12-17 03:47:11.474608400 -0800
2
+++ glib/gspawn.c	2021-02-17 13:58:15.271434000 -0800
3
@@ -51,6 +51,12 @@
4
 #include <sys/syscall.h>  /* for syscall and SYS_getdents64 */
5
 #endif
6
 
7
+#ifdef __FreeBSD__
8
+#include <sys/types.h>
9
+#include <sys/user.h>
10
+#include <libutil.h>
11
+#endif
12
+
13
 #include "gspawn.h"
14
 #include "gspawn-private.h"
15
 #include "gthread.h"
16
@@ -1204,6 +1210,33 @@ filename_to_fd (const char *p)
17
 }
18
 #endif
19
 
20
+#ifdef __FreeBSD__
21
+static int
22
+fdwalk2(int (*func)(void *, int), void *udata, gint *ret)
23
+{
24
+  struct kinfo_file *kf;
25
+  int i, cnt;
26
+
27
+  if (NULL == func)
28
+    return EINVAL;
29
+
30
+  kf = kinfo_getfile(getpid(), &cnt);
31
+  if (kf == NULL)
32
+    return ENOMEM;
33
+
34
+  for (i = 0; i < cnt; i++) {
35
+    if (0 > kf[i].kf_fd)
36
+      continue;
37
+    *ret = func (udata, kf[i].kf_fd);
38
+    if (*ret != 0)
39
+      break;
40
+  }
41
+
42
+  free(kf);
43
+  return 0;
44
+}
45
+#endif
46
+
47
 /* This function is called between fork() and exec() and hence must be
48
  * async-signal-safe (see signal-safety(7)). */
49
 static int
50
@@ -1228,6 +1261,12 @@ safe_fdwalk (int (*cb)(void *data, int fd), void *data
51
   
52
 #if 0 && defined(HAVE_SYS_RESOURCE_H)
53
   struct rlimit rl;
54
+#endif
55
+
56
+#ifdef __FreeBSD__
57
+  if (fdwalk2(cb, data, &res) == 0)
58
+      return res;
59
+  /* If any sysctl/malloc call fails continue with the fall back method */
60
 #endif
61
 
62
 #ifdef __linux__
(-)a/devel/glib20/files/patch-glib_gutils.c (-20 lines)
Removed Link Here
1
--- glib/gutils.c.orig	2020-12-17 11:47:11 UTC
2
+++ glib/gutils.c
3
@@ -2500,7 +2500,7 @@ g_build_system_data_dirs (void)
4
    */
5
 #ifndef G_OS_WIN32
6
   if (!data_dirs || !data_dirs[0])
7
-    data_dirs = "/usr/local/share/:/usr/share/";
8
+    data_dirs = "%%LOCALBASE%%/share/:/usr/share/";
9
 
10
   data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
11
 #else
12
@@ -2594,7 +2594,7 @@ g_build_system_config_dirs (void)
13
     }
14
 #else
15
   if (!conf_dirs || !conf_dirs[0])
16
-    conf_dirs = "/etc/xdg";
17
+    conf_dirs = "%%LOCALBASE%%/etc/xdg:/etc/xdg";
18
 
19
   conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
20
 #endif
(-)a/devel/glib20/files/patch-glib_meson.build (-11 lines)
Removed Link Here
1
--- glib/meson.build.orig	2021-02-18 15:31:48.638470000 -0800
2
+++ glib/meson.build	2021-02-18 15:32:08.983695000 -0800
3
@@ -376,7 +376,7 @@
4
   # intl.lib is not compatible with SAFESEH
5
   link_args : [noseh_link_args, glib_link_flags, win32_ldflags],
6
   include_directories : configinc,
7
-  dependencies : pcre_deps + [thread_dep, librt] + libintl_deps + libiconv + platform_deps + gnulib_libm_dependency + [libsysprof_capture_dep],
8
+  dependencies : pcre_deps + [thread_dep, librt] + libintl_deps + libiconv + platform_deps + gnulib_libm_dependency + [libsysprof_capture_dep] + libutil,
9
   c_args : glib_c_args,
10
   objc_args : glib_c_args,
11
 )
(-)b/devel/glib20/pkg-plist (+1 lines)
Lines 242-247 include/glib-2.0/glib/gstdio.h Link Here
242
include/glib-2.0/glib/gstrfuncs.h
242
include/glib-2.0/glib/gstrfuncs.h
243
include/glib-2.0/glib/gstring.h
243
include/glib-2.0/glib/gstring.h
244
include/glib-2.0/glib/gstringchunk.h
244
include/glib-2.0/glib/gstringchunk.h
245
include/glib-2.0/glib/gstrvbuilder.h
245
include/glib-2.0/glib/gtestutils.h
246
include/glib-2.0/glib/gtestutils.h
246
include/glib-2.0/glib/gthread.h
247
include/glib-2.0/glib/gthread.h
247
include/glib-2.0/glib/gthreadpool.h
248
include/glib-2.0/glib/gthreadpool.h

Return to bug 256200