Attachment 226518 Details for Bug 256200 – Patch (Revision 2)

[patch] Patch (Revision 2)

glib-2.68.3.patch (text/plain), 10.33 KB, created by Neel Chauhan on 2021-07-17 18:59:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neel Chauhan

Created: 2021-07-17 18:59:21 UTC

Size: 10.33 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 256200: 225319 | 226518 | 226520