diff options
-rw-r--r-- | devel/glib20/Makefile | 4 | ||||
-rw-r--r-- | devel/glib20/distinfo | 6 | ||||
-rw-r--r-- | devel/glib20/files/patch-gio_gunixmounts.c | 41 |
3 files changed, 5 insertions, 46 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 418ecdaa2f7c..5ffee25b32ee 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -1,5 +1,5 @@ PORTNAME= glib -DISTVERSION= 2.72.3 +DISTVERSION= 2.72.4 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= GNOME @@ -35,7 +35,7 @@ CPE_VENDOR= gnome CONFLICTS_INSTALL= p5-Giovanni -_LIBVERSION= 0.7200.3 +_LIBVERSION= 0.7200.4 PLIST_SUB= LIBVERSION=${_LIBVERSION} OPTIONS_DEFINE= DEBUG DOCS FAM_ALTBACKEND MANPAGES NLS TEST diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index af404ff5730e..ac83c9910d5c 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1657912876 -SHA256 (gnome/glib-2.72.3.tar.xz) = 4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0 -SIZE (gnome/glib-2.72.3.tar.xz) = 4893484 +TIMESTAMP = 1663758356 +SHA256 (gnome/glib-2.72.4.tar.xz) = 8848aba518ba2f4217d144307a1d6cb9afcc92b54e5c13ac1f8c4d4608e96f0e +SIZE (gnome/glib-2.72.4.tar.xz) = 4884256 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); - } |