1 files changed, 0 insertions, 96 deletions
diff --git a/devel/glib20/files/patch-gio_kqueue_kqueue-helper.c b/devel/glib20/files/patch-gio_kqueue_kqueue-helper.c
deleted file mode 100644
index 0b6b00f91e3b..000000000000
--- a/devel/glib20/files/patch-gio_kqueue_kqueue-helper.c
+++ /dev/null
@@ -1,96 +0,0 @@
-This bug combines serveral patches:
-https://bugzilla.gnome.org/show_bug.cgi?id=778515
-and
-https://bugzilla.gnome.org/show_bug.cgi?id=739424
-https://bug739424.bugzilla-attachments.gnome.org/attachment.cgi?id=351191
-
-https://bugzilla.gnome.org/show_bug.cgi?id=776147
-https://git.gnome.org/browse/glib/commit/?id=76072a2dde4a4acc8be8d3c47efbc6811ebe0c1e
-
---- gio/kqueue/kqueue-helper.c.orig	2018-01-28 21:18:25.213606000 +0100
-+++ gio/kqueue/kqueue-helper.c	2018-01-28 21:18:34.964780000 +0100
-@@ -43,7 +43,7 @@ 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);
-+G_LOCK_DEFINE (hash_lock);
- 
- static int kqueue_descriptor = -1;
- static int kqueue_socket_pair[] = {-1, -1};
-@@ -97,8 +97,10 @@ convert_kqueue_events_to_gio (uint32_t flags, gboolean
-     }
-   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_MOVED;
-+      return G_FILE_MONITOR_EVENT_DELETED;
-     }
-   if (flags & NOTE_REVOKE)
-     {
-@@ -291,10 +293,10 @@ process_kqueue_notifications (GIOChannel   *gioc,
- 
-   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)
-     {
-+      G_UNLOCK (hash_lock);
-       KH_W ("Got a notification for a deleted or non-existing subscription %d",
-              n.fd);
-       return TRUE;
-@@ -336,6 +338,7 @@ process_kqueue_notifications (GIOChannel   *gioc,
-         g_file_monitor_source_handle_event (source, mask, NULL, NULL, NULL, g_get_monotonic_time ());
-     }
- 
-+  G_UNLOCK (hash_lock);
-   return TRUE;
- }
- 
-@@ -451,13 +454,14 @@ _kh_start_watching (kqueue_sub *sub)
- 
-   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);
-+  G_UNLOCK (hash_lock);
-+
-   return TRUE;
- }
- 
-@@ -498,22 +502,15 @@ _kh_add_sub (kqueue_sub *sub)
- gboolean
- _kh_cancel_sub (kqueue_sub *sub)
- {
--  gboolean missing = FALSE;
-+  gboolean removed = FALSE;
-   g_assert (kqueue_socket_pair[0] != -1);
-   g_assert (sub != NULL);
- 
--  G_LOCK (hash_lock);
--  missing = !g_hash_table_remove (subs_hash_table, GINT_TO_POINTER (sub->fd));
--  G_UNLOCK (hash_lock);
-+  _km_remove (sub);
- 
--  if (missing)
--    {
--      /* If there were no fd for this subscription, file is still
--       * missing. */
--      KH_W ("Removing subscription from missing");
--      _km_remove (sub);
--    }
--  else
-+  removed = g_hash_table_remove (subs_hash_table, GINT_TO_POINTER (sub->fd));
-+
-+  if (removed)
-     {
-       /* fd will be closed in the kqueue thread */
-       _kqueue_thread_remove_fd (sub->fd);