[Midnightbsd-cvs] mports [24521] trunk/devel/glib20: glib 2.56.1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Oct 15 23:42:11 EDT 2018
Revision: 24521
http://svnweb.midnightbsd.org/mports/?rev=24521
Author: laffer1
Date: 2018-10-15 23:42:09 -0400 (Mon, 15 Oct 2018)
Log Message:
-----------
glib 2.56.1
Modified Paths:
--------------
trunk/devel/glib20/Makefile
trunk/devel/glib20/distinfo
trunk/devel/glib20/files/patch-gio_glib-compile-schemas.c
trunk/devel/glib20/pkg-plist
Added Paths:
-----------
trunk/devel/glib20/files/extra-arch-powerpc64
trunk/devel/glib20/files/patch-gio_kqueue-kqueue-missing.c
trunk/devel/glib20/files/patch-gio_kqueue_Makefile.in
trunk/devel/glib20/files/patch-gio_kqueue_gkqueuefilemonitor.c
trunk/devel/glib20/files/patch-gio_kqueue_kqueue-helper.c
trunk/devel/glib20/files/patch-gio_kqueue_kqueue-helper.h
Removed Paths:
-------------
trunk/devel/glib20/files/patch-gio_glocalfileoutputstream.c
Modified: trunk/devel/glib20/Makefile
===================================================================
--- trunk/devel/glib20/Makefile 2018-10-16 03:27:16 UTC (rev 24520)
+++ trunk/devel/glib20/Makefile 2018-10-16 03:42:09 UTC (rev 24521)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= glib
-PORTVERSION= 2.50.3
+PORTVERSION= 2.56.1
PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= GNOME
@@ -36,11 +36,11 @@
LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
-LIBVERSION= 0.5000.3
+LIBVERSION= 0.5600.1
PLIST_SUB+= LIBVERSION=${LIBVERSION}
glib_MAN= gtester.1 gtester-report.1 glib-gettextize.1
-gio_MAN= gdbus.1 gsettings.1 gio-querymodules.1 \
+gio_MAN= gdbus.1 gsettings.1 gio-querymodules.1 gio.1 \
glib-compile-schemas.1 gapplication.1 \
glib-compile-resources.1 gresource.1 gdbus-codegen.1
gobject_MAN= glib-genmarshal.1 glib-mkenums.1 gobject-query.1
Modified: trunk/devel/glib20/distinfo
===================================================================
--- trunk/devel/glib20/distinfo 2018-10-16 03:27:16 UTC (rev 24520)
+++ trunk/devel/glib20/distinfo 2018-10-16 03:42:09 UTC (rev 24521)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539655072
-SHA256 (gnome2/glib-2.50.3.tar.xz) = 82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999
-SIZE (gnome2/glib-2.50.3.tar.xz) = 7589284
+TIMESTAMP = 1525371429
+SHA256 (gnome2/glib-2.56.1.tar.xz) = 40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d
+SIZE (gnome2/glib-2.56.1.tar.xz) = 8028716
Added: trunk/devel/glib20/files/extra-arch-powerpc64
===================================================================
--- trunk/devel/glib20/files/extra-arch-powerpc64 (rev 0)
+++ trunk/devel/glib20/files/extra-arch-powerpc64 2018-10-16 03:42:09 UTC (rev 24521)
@@ -0,0 +1,23 @@
+
+--- gio/glib-compile-schemas.c.orig 2010-11-24 21:32:15.000000000 +0100
++++ gio/glib-compile-schemas.c 2010-11-24 21:33:42.000000000 +0100
+@@ -1458,7 +1458,7 @@
+ }
+ /* Text {{{2 */
+ static void
+-text (GMarkupParseContext *context,
++XXXtext (GMarkupParseContext *context,
+ const gchar *text,
+ gsize text_len,
+ gpointer user_data,
+@@ -1590,7 +1590,7 @@
+ parse_gschema_files (gchar **files,
+ gboolean strict)
+ {
+- GMarkupParser parser = { start_element, end_element, text };
++ GMarkupParser parser = { start_element, end_element, XXXtext };
+ ParseState state = { 0, };
+ const gchar *filename;
+ GError *error = NULL;
+
+
Property changes on: trunk/devel/glib20/files/extra-arch-powerpc64
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/devel/glib20/files/patch-gio_glib-compile-schemas.c
===================================================================
--- trunk/devel/glib20/files/patch-gio_glib-compile-schemas.c 2018-10-16 03:27:16 UTC (rev 24520)
+++ trunk/devel/glib20/files/patch-gio_glib-compile-schemas.c 2018-10-16 03:42:09 UTC (rev 24521)
@@ -1,6 +1,6 @@
---- gio/glib-compile-schemas.c.orig 2012-06-14 16:39:22.000000000 +0200
-+++ gio/glib-compile-schemas.c 2012-06-14 16:39:55.000000000 +0200
-@@ -1204,11 +1204,13 @@
+--- 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;
}
@@ -8,8 +8,10 @@
if (path && (g_str_has_prefix (path, "/apps/") ||
g_str_has_prefix (path, "/desktop/") ||
g_str_has_prefix (path, "/system/")))
- g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with "
- "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
+@@ -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,
Deleted: trunk/devel/glib20/files/patch-gio_glocalfileoutputstream.c
===================================================================
--- trunk/devel/glib20/files/patch-gio_glocalfileoutputstream.c 2018-10-16 03:27:16 UTC (rev 24520)
+++ trunk/devel/glib20/files/patch-gio_glocalfileoutputstream.c 2018-10-16 03:42:09 UTC (rev 24521)
@@ -1,38 +0,0 @@
-From 45d4b59e3f7ef7b41db08f0c11ee5000126cfedb Mon Sep 17 00:00:00 2001
-From: Ting-Wei Lan <lantw at src.gnome.org>
-Date: Sun, 4 Dec 2016 15:02:54 +0800
-Subject: [PATCH] glocalfileoutputstream: Fix symlink writing on FreeBSD and
- NetBSD
-
-FreeBSD, DragonflyBSD and NetBSD support O_NOFOLLOW, but they use error
-numbers that are different from what POSIX standard specifies. They are
-not going to change the behavior, and existing programs on these systems
-already take advantage of this difference. To support them, we have to
-add a check in GIO to use different error numbers on these systems.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=775593
----
- gio/glocalfileoutputstream.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c
-index 81184a671..4b3733cce 100644
---- gio/glocalfileoutputstream.c
-+++ gio/glocalfileoutputstream.c
-@@ -763,7 +763,13 @@ handle_overwrite_open (const char *filename,
- #ifdef O_NOFOLLOW
- is_symlink = FALSE;
- fd = g_open (filename, open_flags | O_NOFOLLOW, mode);
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-+ if (fd == -1 && errno == EMLINK)
-+#elif defined(__NetBSD__)
-+ if (fd == -1 && errno == EFTYPE)
-+#else
- if (fd == -1 && errno == ELOOP)
-+#endif
- {
- /* Could be a symlink, or it could be a regular ELOOP error,
- * but then the next open will fail too. */
---
-2.13.0
-
Added: trunk/devel/glib20/files/patch-gio_kqueue-kqueue-missing.c
===================================================================
--- trunk/devel/glib20/files/patch-gio_kqueue-kqueue-missing.c (rev 0)
+++ trunk/devel/glib20/files/patch-gio_kqueue-kqueue-missing.c 2018-10-16 03:42:09 UTC (rev 24521)
@@ -0,0 +1,93 @@
+--- gio/kqueue/kqueue-missing.c.orig 2018-04-09 22:48:45.637366000 +0200
++++ gio/kqueue/kqueue-missing.c 2018-04-09 22:48:55.840341000 +0200
+@@ -23,12 +23,12 @@
+ #include <glib.h>
+
+ #include "kqueue-helper.h"
+-#include "kqueue-sub.h"
+-#include "kqueue-missing.h"
+
+
+ #define SCAN_MISSING_TIME 4 /* 1/4 Hz */
+
++void _kh_file_appeared_cb (kqueue_sub *sub);
++
+ static gboolean km_scan_missing (gpointer user_data);
+
+ static gboolean km_debug_enabled = FALSE;
+@@ -38,24 +38,9 @@ static GSList *missing_subs_list = NULL;
+ G_LOCK_DEFINE_STATIC (missing_lock);
+
+ static volatile gboolean scan_missing_running = FALSE;
+-static on_create_cb file_appeared_callback;
+
+
+ /**
+- * _km_init:
+- * @cb: a callback function. It will be called when a watched file
+- * will appear.
+- *
+- * Initialize the kqueue-missing module (optional).
+- **/
+-void
+-_km_init (on_create_cb cb)
+-{
+- file_appeared_callback = cb;
+-}
+-
+-
+-/**
+ * _km_add_missing:
+ * @sub: a #kqueue_sub
+ *
+@@ -83,7 +68,36 @@ _km_add_missing (kqueue_sub *sub)
+ }
+ }
+
++/**
++ * _kh_file_appeared_cb:
++ * @sub: a #kqueue_sub
++ *
++ * A callback function for kqueue-missing subsystem.
++ *
++ * Signals that a missing file has finally appeared in the filesystem.
++ * Emits %G_FILE_MONITOR_EVENT_CREATED.
++ **/
++void
++_kh_file_appeared_cb (kqueue_sub *sub)
++{
++ GFile *child;
+
++ g_assert (sub != NULL);
++ g_assert (sub->filename);
++
++ if (!g_file_test (sub->filename, G_FILE_TEST_EXISTS))
++ return;
++
++ child = g_file_new_for_path (sub->filename);
++
++ g_file_monitor_emit_event (G_FILE_MONITOR (sub->mon),
++ child,
++ NULL,
++ G_FILE_MONITOR_EVENT_CREATED);
++
++ g_object_unref (child);
++}
++
+ /**
+ * km_scan_missing:
+ * @user_data: unused
+@@ -114,11 +128,10 @@ km_scan_missing (gpointer user_data)
+ g_assert (sub != NULL);
+ g_assert (sub->filename != NULL);
+
+- if (_kh_start_watching (sub))
++ if (_kqsub_start_watching (sub))
+ {
+ KM_W ("file %s now exists, starting watching", sub->filename);
+- if (file_appeared_callback)
+- file_appeared_callback (sub);
++ _kh_file_appeared_cb (sub);
+ not_missing = g_slist_prepend (not_missing, head);
+ }
+ }
Property changes on: trunk/devel/glib20/files/patch-gio_kqueue-kqueue-missing.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/glib20/files/patch-gio_kqueue_Makefile.in
===================================================================
--- trunk/devel/glib20/files/patch-gio_kqueue_Makefile.in (rev 0)
+++ trunk/devel/glib20/files/patch-gio_kqueue_Makefile.in 2018-10-16 03:42:09 UTC (rev 24521)
@@ -0,0 +1,87 @@
+--- gio/kqueue/Makefile.in.orig 2018-04-09 23:09:21.018712000 +0200
++++ gio/kqueue/Makefile.in 2018-04-09 23:09:38.517739000 +0200
+@@ -183,9 +183,7 @@ LTLIBRARIES = $(installed_test_LTLIBRARIES) $(noinst_L
+ libkqueue_la_LIBADD =
+ am__objects_1 =
+ am_libkqueue_la_OBJECTS = libkqueue_la-gkqueuefilemonitor.lo \
+- libkqueue_la-kqueue-helper.lo libkqueue_la-kqueue-thread.lo \
+- libkqueue_la-kqueue-sub.lo libkqueue_la-kqueue-missing.lo \
+- libkqueue_la-kqueue-utils.lo libkqueue_la-kqueue-exclusions.lo \
++ libkqueue_la-kqueue-helper.lo libkqueue_la-kqueue-missing.lo \
+ libkqueue_la-dep-list.lo $(am__objects_1)
+ libkqueue_la_OBJECTS = $(am_libkqueue_la_OBJECTS)
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+@@ -777,19 +775,9 @@ all_test_ltlibs = $(test_ltlibraries) $(uninstalled_te
+ @ENABLE_INSTALLED_TESTS_TRUE at installed_test_meta_DATA = $(installed_testcases:=.test)
+ libkqueue_la_SOURCES = \
+ gkqueuefilemonitor.c \
+- gkqueuefilemonitor.h \
+ kqueue-helper.c \
+ kqueue-helper.h \
+- kqueue-thread.c \
+- kqueue-thread.h \
+- kqueue-sub.c \
+- kqueue-sub.h \
+ kqueue-missing.c \
+- kqueue-missing.h \
+- kqueue-utils.c \
+- kqueue-utils.h \
+- kqueue-exclusions.c \
+- kqueue-exclusions.h \
+ dep-list.c \
+ dep-list.h \
+ $(NULL)
+@@ -1009,12 +997,8 @@ distclean-compile:
+
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-dep-list.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-gkqueuefilemonitor.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-exclusions.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-helper.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-missing.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-sub.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-thread.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkqueue_la-kqueue-utils.Plo at am__quote@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@@ -1054,40 +1038,12 @@ libkqueue_la-kqueue-helper.lo: kqueue-helper.c
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-helper.lo `test -f 'kqueue-helper.c' || echo '$(srcdir)/'`kqueue-helper.c
+
+-libkqueue_la-kqueue-thread.lo: kqueue-thread.c
+- at am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-kqueue-thread.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-kqueue-thread.Tpo -c -o libkqueue_la-kqueue-thread.lo `test -f 'kqueue-thread.c' || echo '$(srcdir)/'`kqueue-thread.c
+- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkqueue_la-kqueue-thread.Tpo $(DEPDIR)/libkqueue_la-kqueue-thread.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kqueue-thread.c' object='libkqueue_la-kqueue-thread.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-thread.lo `test -f 'kqueue-thread.c' || echo '$(srcdir)/'`kqueue-thread.c
+-
+-libkqueue_la-kqueue-sub.lo: kqueue-sub.c
+- at am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-kqueue-sub.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-kqueue-sub.Tpo -c -o libkqueue_la-kqueue-sub.lo `test -f 'kqueue-sub.c' || echo '$(srcdir)/'`kqueue-sub.c
+- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkqueue_la-kqueue-sub.Tpo $(DEPDIR)/libkqueue_la-kqueue-sub.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kqueue-sub.c' object='libkqueue_la-kqueue-sub.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-sub.lo `test -f 'kqueue-sub.c' || echo '$(srcdir)/'`kqueue-sub.c
+-
+ libkqueue_la-kqueue-missing.lo: kqueue-missing.c
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-kqueue-missing.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-kqueue-missing.Tpo -c -o libkqueue_la-kqueue-missing.lo `test -f 'kqueue-missing.c' || echo '$(srcdir)/'`kqueue-missing.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkqueue_la-kqueue-missing.Tpo $(DEPDIR)/libkqueue_la-kqueue-missing.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kqueue-missing.c' object='libkqueue_la-kqueue-missing.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-missing.lo `test -f 'kqueue-missing.c' || echo '$(srcdir)/'`kqueue-missing.c
+-
+-libkqueue_la-kqueue-utils.lo: kqueue-utils.c
+- at am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-kqueue-utils.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-kqueue-utils.Tpo -c -o libkqueue_la-kqueue-utils.lo `test -f 'kqueue-utils.c' || echo '$(srcdir)/'`kqueue-utils.c
+- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkqueue_la-kqueue-utils.Tpo $(DEPDIR)/libkqueue_la-kqueue-utils.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kqueue-utils.c' object='libkqueue_la-kqueue-utils.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-utils.lo `test -f 'kqueue-utils.c' || echo '$(srcdir)/'`kqueue-utils.c
+-
+-libkqueue_la-kqueue-exclusions.lo: kqueue-exclusions.c
+- at am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-kqueue-exclusions.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-kqueue-exclusions.Tpo -c -o libkqueue_la-kqueue-exclusions.lo `test -f 'kqueue-exclusions.c' || echo '$(srcdir)/'`kqueue-exclusions.c
+- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkqueue_la-kqueue-exclusions.Tpo $(DEPDIR)/libkqueue_la-kqueue-exclusions.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kqueue-exclusions.c' object='libkqueue_la-kqueue-exclusions.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -c -o libkqueue_la-kqueue-exclusions.lo `test -f 'kqueue-exclusions.c' || echo '$(srcdir)/'`kqueue-exclusions.c
+
+ libkqueue_la-dep-list.lo: dep-list.c
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkqueue_la_CFLAGS) $(CFLAGS) -MT libkqueue_la-dep-list.lo -MD -MP -MF $(DEPDIR)/libkqueue_la-dep-list.Tpo -c -o libkqueue_la-dep-list.lo `test -f 'dep-list.c' || echo '$(srcdir)/'`dep-list.c
Property changes on: trunk/devel/glib20/files/patch-gio_kqueue_Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/glib20/files/patch-gio_kqueue_gkqueuefilemonitor.c
===================================================================
--- trunk/devel/glib20/files/patch-gio_kqueue_gkqueuefilemonitor.c (rev 0)
+++ trunk/devel/glib20/files/patch-gio_kqueue_gkqueuefilemonitor.c 2018-10-16 03:42:09 UTC (rev 24521)
@@ -0,0 +1,463 @@
+--- gio/kqueue/gkqueuefilemonitor.c.orig 2018-04-07 04:10:22.000000000 +0200
++++ gio/kqueue/gkqueuefilemonitor.c 2018-05-03 20:21:55.830634000 +0200
+@@ -22,33 +22,73 @@
+
+ #include "config.h"
+
+-#include "gkqueuefilemonitor.h"
+-#include "kqueue-helper.h"
+-#include "kqueue-exclusions.h"
++#include <sys/types.h>
++#include <sys/event.h>
++#include <sys/time.h>
++#include <sys/socket.h>
++#include <sys/stat.h>
++
++#include <errno.h>
++#include <fcntl.h>
++#include <string.h>
++
++#include <glib-object.h>
++#include <gio/gfilemonitor.h>
++#include <gio/glocalfilemonitor.h>
++#include <gio/giomodule.h>
+ #include <gio/gpollfilemonitor.h>
+ #include <gio/gfile.h>
+-#include <gio/giomodule.h>
++#include <glib-unix.h>
++#include "glib-private.h"
+
++#include "kqueue-helper.h"
++#include "dep-list.h"
+
+-struct _GKqueueFileMonitor
++G_LOCK_DEFINE_STATIC (kq_lock);
++static GSource *kq_source;
++static int kq_queue = -1;
++
++#define G_TYPE_KQUEUE_FILE_MONITOR (g_kqueue_file_monitor_get_type ())
++#define G_KQUEUE_FILE_MONITOR(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
++ G_TYPE_KQUEUE_FILE_MONITOR, GKqueueFileMonitor))
++
++typedef GLocalFileMonitorClass GKqueueFileMonitorClass;
++
++typedef struct
+ {
+ GLocalFileMonitor parent_instance;
+
+ kqueue_sub *sub;
+-
++#ifndef O_EVTONLY
+ GFileMonitor *fallback;
+ GFile *fbfile;
+-};
++#endif
++} GKqueueFileMonitor;
+
++GType g_kqueue_file_monitor_get_type (void);
++G_DEFINE_TYPE_WITH_CODE (GKqueueFileMonitor, g_kqueue_file_monitor, G_TYPE_LOCAL_FILE_MONITOR,
++ g_io_extension_point_implement (G_LOCAL_FILE_MONITOR_EXTENSION_POINT_NAME,
++ g_define_type_id,
++ "kqueue",
++ 20))
++
++#ifndef O_EVTONLY
++#define O_KQFLAG O_RDONLY
++#else
++#define O_KQFLAG O_EVTONLY
++#endif
++
++#define NOTE_ALL (NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_RENAME)
++
+ static gboolean g_kqueue_file_monitor_cancel (GFileMonitor* monitor);
++static gboolean g_kqueue_file_monitor_is_supported (void);
+
+-G_DEFINE_TYPE_WITH_CODE (GKqueueFileMonitor, g_kqueue_file_monitor, G_TYPE_LOCAL_FILE_MONITOR,
+- g_io_extension_point_implement (G_LOCAL_FILE_MONITOR_EXTENSION_POINT_NAME,
+- g_define_type_id,
+- "kqueue",
+- 20))
++static kqueue_sub *_kqsub_new (const gchar *, GLocalFileMonitor *, GFileMonitorSource *);
++static void _kqsub_free (kqueue_sub *);
++static gboolean _kqsub_cancel (kqueue_sub *);
+
+
++#ifndef O_EVTONLY
+ static void
+ _fallback_callback (GFileMonitor *unused,
+ GFile *first,
+@@ -57,22 +97,42 @@ _fallback_callback (GFileMonitor *unused,
+ gpointer udata)
+ {
+ GKqueueFileMonitor *kq_mon = G_KQUEUE_FILE_MONITOR (udata);
+- GFileMonitor *mon = G_FILE_MONITOR (kq_mon);
+- g_assert (kq_mon != NULL);
+- g_assert (mon != NULL);
+- (void) unused;
+
+- if (event == G_FILE_MONITOR_EVENT_CHANGED)
+- {
+- GLocalFileMonitor *local_monitor = G_LOCAL_FILE_MONITOR (kq_mon);
+-
+- _kh_dir_diff (kq_mon->sub, local_monitor->source);
+- }
+- else
+- g_file_monitor_emit_event (mon, first, second, event);
++ g_file_monitor_emit_event (G_FILE_MONITOR (kq_mon), first, second, event);
+ }
+
++/*
++ * _ke_is_excluded:
++ * @full_path - a path to file to check.
++ *
++ * Returns: TRUE if the file should be excluded from the kqueue-powered
++ * monitoring, FALSE otherwise.
++ **/
++gboolean
++_ke_is_excluded (const char *full_path)
++{
++ GFile *f = NULL;
++ GMount *mount = NULL;
+
++ f = g_file_new_for_path (full_path);
++
++ if (f != NULL) {
++ mount = g_file_find_enclosing_mount (f, NULL, NULL);
++ g_object_unref (f);
++ }
++
++ if ((mount != NULL && (g_mount_can_unmount (mount))) || g_str_has_prefix (full_path, "/mnt/"))
++ {
++ g_warning ("Excluding %s from kernel notification, falling back to poll", full_path);
++ if (mount)
++ g_object_unref (mount);
++ return TRUE;
++ }
++
++ return FALSE;
++}
++#endif /* !O_EVTONLY */
++
+ static void
+ g_kqueue_file_monitor_finalize (GObject *object)
+ {
+@@ -80,16 +140,18 @@ g_kqueue_file_monitor_finalize (GObject *object)
+
+ if (kqueue_monitor->sub)
+ {
+- _kh_cancel_sub (kqueue_monitor->sub);
+- _kh_sub_free (kqueue_monitor->sub);
++ _kqsub_cancel (kqueue_monitor->sub);
++ _kqsub_free (kqueue_monitor->sub);
+ kqueue_monitor->sub = NULL;
+ }
+
++#ifndef O_EVTONLY
+ if (kqueue_monitor->fallback)
+ g_object_unref (kqueue_monitor->fallback);
+
+ if (kqueue_monitor->fbfile)
+ g_object_unref (kqueue_monitor->fbfile);
++#endif
+
+ if (G_OBJECT_CLASS (g_kqueue_file_monitor_parent_class)->finalize)
+ (*G_OBJECT_CLASS (g_kqueue_file_monitor_parent_class)->finalize) (object);
+@@ -103,21 +165,25 @@ g_kqueue_file_monitor_start (GLocalFileMonitor *local_
+ GFileMonitorSource *source)
+ {
+ GKqueueFileMonitor *kqueue_monitor = G_KQUEUE_FILE_MONITOR (local_monitor);
+- GObject *obj;
+- GKqueueFileMonitorClass *klass;
+- GObjectClass *parent_class;
+- kqueue_sub *sub = NULL;
+- gboolean ret_kh_startup = FALSE;
+- const gchar *path = NULL;
++ kqueue_sub *sub;
++ const gchar *path;
+
+-
+- ret_kh_startup = _kh_startup ();
+- g_assert (ret_kh_startup);
+-
+ path = filename;
+- if (!path)
++ if (path == NULL)
+ path = dirname;
+
++#ifndef O_EVTONLY
++ if (_ke_is_excluded (path))
++ {
++ GFile *file = g_file_new_for_path (path);
++ kqueue_monitor->fbfile = file;
++ kqueue_monitor->fallback = _g_poll_file_monitor_new (file);
++ g_signal_connect (kqueue_monitor->fallback, "changed",
++ G_CALLBACK (_fallback_callback), kqueue_monitor);
++ return;
++ }
++#endif
++
+ /* For a directory monitor, create a subscription object anyway.
+ * It will be used for directory diff calculation routines.
+ * Wait, directory diff in a GKqueueFileMonitor?
+@@ -125,35 +191,15 @@ g_kqueue_file_monitor_start (GLocalFileMonitor *local_
+ * file, GIO uses a GKqueueFileMonitor object for that. If a directory
+ * will be created under that path, GKqueueFileMonitor will have to
+ * handle the directory notifications. */
++ sub = _kqsub_new (path, local_monitor, source);
++ if (sub == NULL)
++ return;
+
+- sub = _kh_sub_new (path, TRUE, source);
+-
+- /* FIXME: what to do about errors here? we can't return NULL or another
+- * kind of error and an assertion is probably too hard (same issue as in
+- * the inotify backend) */
+- g_assert (sub != NULL);
+ kqueue_monitor->sub = sub;
+-
+- if (!_ke_is_excluded (path))
+- _kh_add_sub (sub);
+- else
+- {
+- GFile *file = g_file_new_for_path (path);
+- kqueue_monitor->fbfile = file;
+- kqueue_monitor->fallback = _g_poll_file_monitor_new (file);
+- g_signal_connect (kqueue_monitor->fallback,
+- "changed",
+- G_CALLBACK (_fallback_callback),
+- kqueue_monitor);
+- }
++ if (!_kqsub_start_watching (sub))
++ _km_add_missing (sub);
+ }
+
+-static gboolean
+-g_kqueue_file_monitor_is_supported (void)
+-{
+- return _kh_startup ();
+-}
+-
+ static void
+ g_kqueue_file_monitor_class_init (GKqueueFileMonitorClass *klass)
+ {
+@@ -175,24 +221,218 @@ g_kqueue_file_monitor_init (GKqueueFileMonitor *monito
+ }
+
+ static gboolean
++g_kqueue_file_monitor_callback (gint fd, GIOCondition condition, gpointer user_data)
++{
++ gint64 now = g_source_get_time (kq_source);
++ kqueue_sub *sub;
++ GFileMonitorSource *source;
++ struct kevent ev;
++ struct timespec ts;
++
++ memset (&ts, 0, sizeof(ts));
++ while (kevent(fd, NULL, 0, &ev, 1, &ts) > 0)
++ {
++ GFileMonitorEvent mask = 0;
++
++ if (ev.filter != EVFILT_VNODE || ev.udata == NULL)
++ continue;
++
++ sub = ev.udata;
++ source = sub->source;
++
++ if (ev.flags & EV_ERROR)
++ ev.fflags = NOTE_REVOKE;
++
++ if (ev.fflags & (NOTE_DELETE | NOTE_REVOKE))
++ {
++ _kqsub_cancel (sub);
++ _km_add_missing (sub);
++ }
++
++ if (sub->is_dir && ev.fflags & (NOTE_WRITE | NOTE_EXTEND))
++ {
++ _kh_dir_diff (sub);
++ ev.fflags &= ~(NOTE_WRITE | NOTE_EXTEND);
++ }
++
++ if (ev.fflags & NOTE_DELETE)
++ {
++ mask = G_FILE_MONITOR_EVENT_DELETED;
++ }
++ else if (ev.fflags & NOTE_ATTRIB)
++ {
++ mask = G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED;
++ }
++ else if (ev.fflags & (NOTE_WRITE | NOTE_EXTEND))
++ {
++ mask = G_FILE_MONITOR_EVENT_CHANGED;
++ }
++ else if (ev.fflags & NOTE_RENAME)
++ {
++ /* Since there’s apparently no way to get the new name of the
++ * file out of kqueue(), all we can do is say that this one has
++ * been deleted. */
++ mask = G_FILE_MONITOR_EVENT_DELETED;
++ }
++ else if (ev.fflags & NOTE_REVOKE)
++ {
++ mask = G_FILE_MONITOR_EVENT_UNMOUNTED;
++ }
++
++ if (mask)
++ g_file_monitor_source_handle_event (source, mask, NULL, NULL, NULL, now);
++ }
++
++ return TRUE;
++}
++
++static gboolean
++g_kqueue_file_monitor_is_supported (void)
++{
++ int errsv;
++
++ G_LOCK (kq_lock);
++
++ if (kq_queue == -1)
++ {
++ kq_queue = kqueue ();
++ errsv = errno;
++
++ if (kq_queue == -1)
++ {
++ g_warning ("Unable to create a kqueue: %s", g_strerror (errsv));
++ G_UNLOCK (kq_lock);
++ return FALSE;
++ }
++
++ kq_source = g_unix_fd_source_new (kq_queue, G_IO_IN);
++ g_source_set_callback (kq_source, (GSourceFunc) g_kqueue_file_monitor_callback, NULL, NULL);
++ g_source_attach (kq_source, GLIB_PRIVATE_CALL (g_get_worker_context) ());
++ }
++
++ G_UNLOCK (kq_lock);
++
++ return TRUE;
++}
++
++static gboolean
+ g_kqueue_file_monitor_cancel (GFileMonitor *monitor)
+ {
+ GKqueueFileMonitor *kqueue_monitor = G_KQUEUE_FILE_MONITOR (monitor);
+
+ if (kqueue_monitor->sub)
+ {
+- _kh_cancel_sub (kqueue_monitor->sub);
+- _kh_sub_free (kqueue_monitor->sub);
++ _kqsub_cancel (kqueue_monitor->sub);
++ _kqsub_free (kqueue_monitor->sub);
+ kqueue_monitor->sub = NULL;
+ }
++#ifndef O_EVTONLY
+ else if (kqueue_monitor->fallback)
+ {
+ g_signal_handlers_disconnect_by_func (kqueue_monitor->fallback, _fallback_callback, kqueue_monitor);
+ g_file_monitor_cancel (kqueue_monitor->fallback);
+ }
++#endif
+
+ if (G_FILE_MONITOR_CLASS (g_kqueue_file_monitor_parent_class)->cancel)
+ (*G_FILE_MONITOR_CLASS (g_kqueue_file_monitor_parent_class)->cancel) (monitor);
++
++ return TRUE;
++}
++
++static kqueue_sub *
++_kqsub_new (const gchar *filename, GLocalFileMonitor *mon, GFileMonitorSource *source)
++{
++ kqueue_sub *sub;
++
++ sub = g_slice_new (kqueue_sub);
++ sub->filename = g_strdup (filename);
++ sub->mon = mon;
++ g_source_ref ((GSource *) source);
++ sub->source = source;
++ sub->fd = -1;
++ sub->deps = NULL;
++ sub->is_dir = 0;
++
++ return sub;
++}
++
++static void
++_kqsub_free (kqueue_sub *sub)
++{
++ g_assert (sub->deps == NULL);
++ g_assert (sub->fd == -1);
++
++ g_source_unref ((GSource *) sub->source);
++ g_free (sub->filename);
++ g_slice_free (kqueue_sub, sub);
++}
++
++static gboolean
++_kqsub_cancel (kqueue_sub *sub)
++{
++ struct kevent ev;
++
++ /* Remove the event and close the file descriptor to automatically
++ * delete pending events. */
++ if (sub->fd != -1)
++ {
++ EV_SET (&ev, sub->fd, EVFILT_VNODE, EV_DELETE, NOTE_ALL, 0, sub);
++ if (kevent (kq_queue, &ev, 1, NULL, 0, NULL) == -1)
++ {
++ g_warning ("Unable to remove event for %s: %s", sub->filename, g_strerror (errno));
++ return FALSE;
++ }
++ close (sub->fd);
++ sub->fd = -1;
++ }
++
++ _km_remove (sub);
++
++ if (sub->deps)
++ {
++ dl_free (sub->deps);
++ sub->deps = NULL;
++ }
++
++ return TRUE;
++}
++
++gboolean
++_kqsub_start_watching (kqueue_sub *sub)
++{
++ struct stat st;
++ struct kevent ev;
++
++ sub->fd = open (sub->filename, O_KQFLAG);
++ if (sub->fd == -1)
++ return FALSE;
++
++ if (fstat (sub->fd, &st) == -1)
++ {
++ g_warning ("fstat failed for %s: %s", sub->filename, g_strerror (errno));
++ close (sub->fd);
++ sub->fd = -1;
++ return FALSE;
++ }
++
++ sub->is_dir = (st.st_mode & S_IFDIR) ? 1 : 0;
++ if (sub->is_dir)
++ {
++ if (sub->deps)
++ dl_free (sub->deps);
++
++ sub->deps = dl_listing (sub->filename);
++ }
++
++ EV_SET (&ev, sub->fd, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_ALL, 0, sub);
++ if (kevent (kq_queue, &ev, 1, NULL, 0, NULL) == -1)
++ {
++ g_warning ("Unable to add event for %s: %s", sub->filename, g_strerror (errno));
++ close (sub->fd);
++ sub->fd = -1;
++ return FALSE;
++ }
+
+ return TRUE;
+ }
Property changes on: trunk/devel/glib20/files/patch-gio_kqueue_gkqueuefilemonitor.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/glib20/files/patch-gio_kqueue_kqueue-helper.c
===================================================================
--- trunk/devel/glib20/files/patch-gio_kqueue_kqueue-helper.c (rev 0)
+++ trunk/devel/glib20/files/patch-gio_kqueue_kqueue-helper.c 2018-10-16 03:42:09 UTC (rev 24521)
@@ -0,0 +1,409 @@
+--- gio/kqueue/kqueue-helper.c.orig 2018-01-08 21:00:49.000000000 +0100
++++ gio/kqueue/kqueue-helper.c 2018-04-09 22:46:58.181986000 +0200
+@@ -34,84 +34,7 @@
+ #include <errno.h>
+ #include <pthread.h>
+ #include "kqueue-helper.h"
+-#include "kqueue-utils.h"
+-#include "kqueue-thread.h"
+-#include "kqueue-missing.h"
+-#include "kqueue-exclusions.h"
+
+-static gboolean kh_debug_enabled = FALSE;
+-#define KH_W if (kh_debug_enabled) g_warning
+-
+-static GHashTable *subs_hash_table = NULL;
+-G_LOCK_DEFINE_STATIC (hash_lock);
+-
+-static int kqueue_descriptor = -1;
+-static int kqueue_socket_pair[] = {-1, -1};
+-static pthread_t kqueue_thread;
+-
+-
+-void _kh_file_appeared_cb (kqueue_sub *sub);
+-
+-/**
+- * accessor function for kqueue_descriptor
+- **/
+-int
+-get_kqueue_descriptor()
+-{
+- return kqueue_descriptor;
+-}
+-
+-/**
+- * convert_kqueue_events_to_gio:
+- * @flags: a set of kqueue filter flags
+- * @done: a pointer to #gboolean indicating that the
+- * conversion has been done (out)
+- *
+- * Translates kqueue filter flags into GIO event flags.
+- *
+- * Returns: a #GFileMonitorEvent
+- **/
+-static GFileMonitorEvent
+-convert_kqueue_events_to_gio (uint32_t flags, gboolean *done)
+-{
+- g_assert (done != NULL);
+- *done = FALSE;
+-
+- /* TODO: The following notifications should be emulated, if possible:
+- * - G_FILE_MONITOR_EVENT_PRE_UNMOUNT
+- */
+- if (flags & NOTE_DELETE)
+- {
+- *done = TRUE;
+- return G_FILE_MONITOR_EVENT_DELETED;
+- }
+- if (flags & NOTE_ATTRIB)
+- {
+- *done = TRUE;
+- return G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED;
+- }
+- if (flags & (NOTE_WRITE | NOTE_EXTEND))
+- {
+- *done = TRUE;
+- return G_FILE_MONITOR_EVENT_CHANGED;
+- }
+- if (flags & NOTE_RENAME)
+- {
+- /* Since there’s apparently no way to get the new name of the file out of
+- * kqueue(), all we can do is say that this one has been deleted. */
+- *done = TRUE;
+- return G_FILE_MONITOR_EVENT_DELETED;
+- }
+- if (flags & NOTE_REVOKE)
+- {
+- *done = TRUE;
+- return G_FILE_MONITOR_EVENT_UNMOUNTED;
+- }
+-
+- /* done is FALSE */
+- return 0;
+-}
+-
+ typedef struct {
+ kqueue_sub *sub;
+ GFileMonitorSource *source;
+@@ -238,318 +161,21 @@ static const traverse_cbs cbs = {
+
+
+ void
+-_kh_dir_diff (kqueue_sub *sub, GFileMonitorSource *source)
++_kh_dir_diff (kqueue_sub *sub)
+ {
+ dep_list *was;
+ handle_ctx ctx;
+
+- g_assert (sub != NULL);
+- g_assert (source != NULL);
+-
+ memset (&ctx, 0, sizeof (handle_ctx));
+ ctx.sub = sub;
+- ctx.source = source;
++ ctx.source = sub->source;
+
+ was = sub->deps;
+ sub->deps = dl_listing (sub->filename);
+-
++
+ dl_calculate (was, sub->deps, &cbs, &ctx);
+
+ dl_free (was);
+ }
+
+
+-/**
+- * process_kqueue_notifications:
+- * @gioc: unused.
+- * @cond: unused.
+- * @data: unused.
+- *
+- * Processes notifications, coming from the kqueue thread.
+- *
+- * Reads notifications from the command file descriptor, emits the
+- * "changed" event on the appropriate monitor.
+- *
+- * A typical GIO Channel callback function.
+- *
+- * Returns: %TRUE
+- **/
+-static gboolean
+-process_kqueue_notifications (GIOChannel *gioc,
+- GIOCondition cond,
+- gpointer data)
+-{
+- struct kqueue_notification n;
+- kqueue_sub *sub = NULL;
+- GFileMonitorSource *source = NULL;
+- GFileMonitorEvent mask = 0;
+-
+- g_assert (kqueue_socket_pair[0] != -1);
+- if (!_ku_read (kqueue_socket_pair[0], &n, sizeof (struct kqueue_notification)))
+- {
+- KH_W ("Failed to read a kqueue notification, error %d", errno);
+- return TRUE;
+- }
+-
+- G_LOCK (hash_lock);
+- sub = (kqueue_sub *) g_hash_table_lookup (subs_hash_table, GINT_TO_POINTER (n.fd));
+- G_UNLOCK (hash_lock);
+-
+- if (sub == NULL)
+- {
+- KH_W ("Got a notification for a deleted or non-existing subscription %d",
+- n.fd);
+- return TRUE;
+- }
+-
+- source = sub->user_data;
+- g_assert (source != NULL);
+-
+- if (n.flags & (NOTE_DELETE | NOTE_REVOKE))
+- {
+- if (sub->deps)
+- {
+- dl_free (sub->deps);
+- sub->deps = NULL;
+- }
+- _km_add_missing (sub);
+-
+- if (!(n.flags & NOTE_REVOKE))
+- {
+- /* Note that NOTE_REVOKE is issued by the kqueue thread
+- * on EV_ERROR kevent. In this case, a file descriptor is
+- * already closed from the kqueue thread, no need to close
+- * it manually */
+- _kh_cancel_sub (sub);
+- }
+- }
+-
+- if (sub->is_dir && n.flags & (NOTE_WRITE | NOTE_EXTEND))
+- {
+- _kh_dir_diff (sub, source);
+- n.flags &= ~(NOTE_WRITE | NOTE_EXTEND);
+- }
+-
+- if (n.flags)
+- {
+- gboolean done = FALSE;
+- mask = convert_kqueue_events_to_gio (n.flags, &done);
+- if (done == TRUE)
+- g_file_monitor_source_handle_event (source, mask, NULL, NULL, NULL, g_get_monotonic_time ());
+- }
+-
+- return TRUE;
+-}
+-
+-
+-/*
+- * _kh_startup_impl:
+- * @unused: unused
+- *
+- * Kqueue backend startup code. Should be called only once.
+- *
+- * Returns: %TRUE on success, %FALSE otherwise.
+- **/
+-static gpointer
+-_kh_startup_impl (gpointer unused)
+-{
+- GIOChannel *channel = NULL;
+- gboolean result = FALSE;
+-
+- kqueue_descriptor = kqueue ();
+- result = (kqueue_descriptor != -1);
+- if (!result)
+- {
+- KH_W ("Failed to initialize kqueue\n!");
+- return GINT_TO_POINTER (FALSE);
+- }
+-
+- result = socketpair (AF_UNIX, SOCK_STREAM, 0, kqueue_socket_pair);
+- if (result != 0)
+- {
+- KH_W ("Failed to create socket pair\n!");
+- return GINT_TO_POINTER (FALSE) ;
+- }
+-
+- result = pthread_create (&kqueue_thread,
+- NULL,
+- _kqueue_thread_func,
+- &kqueue_socket_pair[1]);
+- if (result != 0)
+- {
+- KH_W ("Failed to run kqueue thread\n!");
+- return GINT_TO_POINTER (FALSE);
+- }
+-
+- _km_init (_kh_file_appeared_cb);
+-
+- channel = g_io_channel_unix_new (kqueue_socket_pair[0]);
+- g_io_add_watch (channel, G_IO_IN, process_kqueue_notifications, NULL);
+-
+- subs_hash_table = g_hash_table_new (g_direct_hash, g_direct_equal);
+-
+- KH_W ("started gio kqueue backend\n");
+- return GINT_TO_POINTER (TRUE);
+-}
+-
+-
+-/*
+- * _kh_startup:
+- * Kqueue backend initialization.
+- *
+- * Returns: %TRUE on success, %FALSE otherwise.
+- **/
+-gboolean
+-_kh_startup (void)
+-{
+- static GOnce init_once = G_ONCE_INIT;
+- g_once (&init_once, _kh_startup_impl, NULL);
+- return GPOINTER_TO_INT (init_once.retval);
+-}
+-
+-
+-/**
+- * _kh_start_watching:
+- * @sub: a #kqueue_sub
+- *
+- * Starts watching on a subscription.
+- *
+- * Returns: %TRUE on success, %FALSE otherwise.
+- **/
+-gboolean
+-_kh_start_watching (kqueue_sub *sub)
+-{
+- g_assert (kqueue_socket_pair[0] != -1);
+- g_assert (sub != NULL);
+- g_assert (sub->filename != NULL);
+-
+- /* kqueue requires a file descriptor to monitor. Sad but true */
+-#if defined (O_EVTONLY)
+- sub->fd = open (sub->filename, O_EVTONLY);
+-#else
+- sub->fd = open (sub->filename, O_RDONLY);
+-#endif
+-
+- if (sub->fd == -1)
+- {
+- KH_W ("failed to open file %s (error %d)", sub->filename, errno);
+- return FALSE;
+- }
+-
+- _ku_file_information (sub->fd, &sub->is_dir, NULL);
+- if (sub->is_dir)
+- {
+- /* I know, it is very bad to make such decisions in this way and here.
+- * We already do have an user_data at the #kqueue_sub, and it may point to
+- * GKqueueFileMonitor or GKqueueDirectoryMonitor. For a directory case,
+- * we need to scan in contents for the further diffs. Ideally this process
+- * should be delegated to the GKqueueDirectoryMonitor, but for now I will
+- * do it in a dirty way right here. */
+- if (sub->deps)
+- dl_free (sub->deps);
+-
+- sub->deps = dl_listing (sub->filename);
+- }
+-
+- G_LOCK (hash_lock);
+- g_hash_table_insert (subs_hash_table, GINT_TO_POINTER (sub->fd), sub);
+- G_UNLOCK (hash_lock);
+-
+- _kqueue_thread_push_fd (sub->fd);
+-
+- /* Bump the kqueue thread. It will pick up a new sub entry to monitor */
+- if (!_ku_write (kqueue_socket_pair[0], "A", 1))
+- KH_W ("Failed to bump the kqueue thread (add fd, error %d)", errno);
+- return TRUE;
+-}
+-
+-
+-/**
+- * _kh_add_sub:
+- * @sub: a #kqueue_sub
+- *
+- * Adds a subscription for monitoring.
+- *
+- * This funciton tries to start watching a subscription with
+- * _kh_start_watching(). On failure, i.e. when a file does not exist yet,
+- * the subscription will be added to a list of missing files to continue
+- * watching when the file will appear.
+- *
+- * Returns: %TRUE
+- **/
+-gboolean
+-_kh_add_sub (kqueue_sub *sub)
+-{
+- g_assert (sub != NULL);
+-
+- if (!_kh_start_watching (sub))
+- _km_add_missing (sub);
+-
+- return TRUE;
+-}
+-
+-
+-/**
+- * _kh_cancel_sub:
+- * @sub a #kqueue_sub
+- *
+- * Stops monitoring on a subscription.
+- *
+- * Returns: %TRUE
+- **/
+-gboolean
+-_kh_cancel_sub (kqueue_sub *sub)
+-{
+- gboolean removed = FALSE;
+- g_assert (kqueue_socket_pair[0] != -1);
+- g_assert (sub != NULL);
+-
+- _km_remove (sub);
+-
+- G_LOCK (hash_lock);
+- removed = g_hash_table_remove (subs_hash_table, GINT_TO_POINTER (sub->fd));
+- G_UNLOCK (hash_lock);
+-
+- if (removed)
+- {
+- /* fd will be closed in the kqueue thread */
+- _kqueue_thread_remove_fd (sub->fd);
+-
+- /* Bump the kqueue thread. It will pick up a new sub entry to remove*/
+- if (!_ku_write (kqueue_socket_pair[0], "R", 1))
+- KH_W ("Failed to bump the kqueue thread (remove fd, error %d)", errno);
+- }
+-
+- return TRUE;
+-}
+-
+-
+-/**
+- * _kh_file_appeared_cb:
+- * @sub: a #kqueue_sub
+- *
+- * A callback function for kqueue-missing subsystem.
+- *
+- * Signals that a missing file has finally appeared in the filesystem.
+- * Emits %G_FILE_MONITOR_EVENT_CREATED.
+- **/
+-void
+-_kh_file_appeared_cb (kqueue_sub *sub)
+-{
+- GFile* child;
+-
+- g_assert (sub != NULL);
+- g_assert (sub->filename);
+-
+- if (!g_file_test (sub->filename, G_FILE_TEST_EXISTS))
+- return;
+-
+- child = g_file_new_for_path (sub->filename);
+-
+- g_file_monitor_emit_event (G_FILE_MONITOR (sub->user_data),
+- child,
+- NULL,
+- G_FILE_MONITOR_EVENT_CREATED);
+-
+- g_object_unref (child);
+-}
Property changes on: trunk/devel/glib20/files/patch-gio_kqueue_kqueue-helper.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/glib20/files/patch-gio_kqueue_kqueue-helper.h
===================================================================
--- trunk/devel/glib20/files/patch-gio_kqueue_kqueue-helper.h (rev 0)
+++ trunk/devel/glib20/files/patch-gio_kqueue_kqueue-helper.h 2018-10-16 03:42:09 UTC (rev 24521)
@@ -0,0 +1,40 @@
+--- gio/kqueue/kqueue-helper.h.orig 2018-04-09 22:47:22.070991000 +0200
++++ gio/kqueue/kqueue-helper.h 2018-04-09 22:47:44.329479000 +0200
+@@ -23,16 +23,31 @@
+ #ifndef __KQUEUE_HELPER_H
+ #define __KQUEUE_HELPER_H
+
+-#include "kqueue-sub.h"
+ #include <gio/glocalfilemonitor.h>
+ #include <gio/gfilemonitor.h>
+
+-gboolean _kh_startup (void);
+-gboolean _kh_add_sub (kqueue_sub *sub);
+-gboolean _kh_cancel_sub (kqueue_sub *sub);
++#include "dep-list.h"
+
+-gboolean _kh_start_watching (kqueue_sub *sub);
++/**
++ * kqueue_sub:
++ * @filename: a name of the file to monitor
++ * @fd: the associated file descriptor (used by kqueue)
++ *
++ * Represents a subscription on a file or directory.
++ */
++typedef struct
++{
++ GLocalFileMonitor *mon;
++ GFileMonitorSource *source;
++ gchar* filename;
++ int fd;
++ dep_list* deps;
++ int is_dir;
++} kqueue_sub;
+
+-void _kh_dir_diff (kqueue_sub *sub, GFileMonitorSource *source);
++gboolean _kqsub_start_watching (kqueue_sub *sub);
++void _kh_dir_diff (kqueue_sub *sub);
++void _km_add_missing (kqueue_sub *sub);
++void _km_remove (kqueue_sub *sub);
+
+ #endif /* __KQUEUE_HELPER_H */
Property changes on: trunk/devel/glib20/files/patch-gio_kqueue_kqueue-helper.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/devel/glib20/pkg-plist
===================================================================
--- trunk/devel/glib20/pkg-plist 2018-10-16 03:27:16 UTC (rev 24520)
+++ trunk/devel/glib20/pkg-plist 2018-10-16 03:42:09 UTC (rev 24521)
@@ -13,9 +13,6 @@
bin/gsettings
bin/gtester
bin/gtester-report
-share/bash-completion/completions/gdbus
-share/bash-completion/completions/gsettings
-share/bash-completion/completions/gresource
include/gio-unix-2.0/gio/gdesktopappinfo.h
include/gio-unix-2.0/gio/gfiledescriptorbased.h
include/gio-unix-2.0/gio/gunixconnection.h
@@ -251,6 +248,7 @@
include/glib-2.0/glib/gunicode.h
include/glib-2.0/glib/gurifuncs.h
include/glib-2.0/glib/gutils.h
+include/glib-2.0/glib/guuid.h
include/glib-2.0/glib/gvariant.h
include/glib-2.0/glib/gvarianttype.h
include/glib-2.0/glib/gversion.h
@@ -310,6 +308,7 @@
man/man1/gdbus-codegen.1.gz
man/man1/gdbus.1.gz
man/man1/gio-querymodules.1.gz
+man/man1/gio.1.gz
man/man1/glib-compile-resources.1.gz
man/man1/glib-compile-schemas.1.gz
man/man1/glib-genmarshal.1.gz
@@ -324,38 +323,42 @@
share/aclocal/glib-gettext.m4
share/aclocal/gsettings.m4
share/bash-completion/completions/gapplication
+share/bash-completion/completions/gdbus
+share/bash-completion/completions/gresource
+share/bash-completion/completions/gsettings
share/gdb/auto-load%%RESETPREFIX%%/lib/libglib-2.0.so.%%LIBVERSION%%-gdb.py
share/gdb/auto-load%%RESETPREFIX%%/lib/libgobject-2.0.so.%%LIBVERSION%%-gdb.py
share/gettext/its/gschema.its
share/gettext/its/gschema.loc
-share/glib-2.0/codegen/__init__.py
-share/glib-2.0/codegen/__init__.pyc
-share/glib-2.0/codegen/__init__.pyo
-share/glib-2.0/codegen/codegen.py
-share/glib-2.0/codegen/codegen.pyc
-share/glib-2.0/codegen/codegen.pyo
-share/glib-2.0/codegen/codegen_docbook.py
-share/glib-2.0/codegen/codegen_docbook.pyc
-share/glib-2.0/codegen/codegen_docbook.pyo
-share/glib-2.0/codegen/codegen_main.py
-share/glib-2.0/codegen/codegen_main.pyc
-share/glib-2.0/codegen/codegen_main.pyo
-share/glib-2.0/codegen/config.py
-share/glib-2.0/codegen/config.pyc
-share/glib-2.0/codegen/config.pyo
-share/glib-2.0/codegen/dbustypes.py
-share/glib-2.0/codegen/dbustypes.pyc
-share/glib-2.0/codegen/dbustypes.pyo
-share/glib-2.0/codegen/parser.py
-share/glib-2.0/codegen/parser.pyc
-share/glib-2.0/codegen/parser.pyo
-share/glib-2.0/codegen/utils.py
-share/glib-2.0/codegen/utils.pyc
-share/glib-2.0/codegen/utils.pyo
-share/glib-2.0/gdb/glib_gdb.py
-share/glib-2.0/gdb/gobject_gdb.py
-share/glib-2.0/gettext/po/Makefile.in.in
-share/glib-2.0/schemas/gschema.dtd
+%%DATADIR%%-2.0/codegen/__init__.py
+%%DATADIR%%-2.0/codegen/__init__.pyc
+%%DATADIR%%-2.0/codegen/__init__.pyo
+%%DATADIR%%-2.0/codegen/codegen.py
+%%DATADIR%%-2.0/codegen/codegen.pyc
+%%DATADIR%%-2.0/codegen/codegen.pyo
+%%DATADIR%%-2.0/codegen/codegen_docbook.py
+%%DATADIR%%-2.0/codegen/codegen_docbook.pyc
+%%DATADIR%%-2.0/codegen/codegen_docbook.pyo
+%%DATADIR%%-2.0/codegen/codegen_main.py
+%%DATADIR%%-2.0/codegen/codegen_main.pyc
+%%DATADIR%%-2.0/codegen/codegen_main.pyo
+%%DATADIR%%-2.0/codegen/config.py
+%%DATADIR%%-2.0/codegen/config.pyc
+%%DATADIR%%-2.0/codegen/config.pyo
+%%DATADIR%%-2.0/codegen/dbustypes.py
+%%DATADIR%%-2.0/codegen/dbustypes.pyc
+%%DATADIR%%-2.0/codegen/dbustypes.pyo
+%%DATADIR%%-2.0/codegen/parser.py
+%%DATADIR%%-2.0/codegen/parser.pyc
+%%DATADIR%%-2.0/codegen/parser.pyo
+%%DATADIR%%-2.0/codegen/utils.py
+%%DATADIR%%-2.0/codegen/utils.pyc
+%%DATADIR%%-2.0/codegen/utils.pyo
+%%DATADIR%%-2.0/gdb/glib_gdb.py
+%%DATADIR%%-2.0/gdb/gobject_gdb.py
+%%DATADIR%%-2.0/gettext/po/Makefile.in.in
+%%DATADIR%%-2.0/schemas/gschema.dtd
+%%DATADIR%%-2.0/valgrind/glib.supp
%%NLS%%share/locale/af/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/am/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/an/LC_MESSAGES/glib20.mo
@@ -387,6 +390,7 @@
%%NLS%%share/locale/fa/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/fi/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/fr/LC_MESSAGES/glib20.mo
+%%NLS%%share/locale/fur/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/ga/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/gd/LC_MESSAGES/glib20.mo
%%NLS%%share/locale/gl/LC_MESSAGES/glib20.mo
More information about the Midnightbsd-cvs
mailing list