[Bug 226920] devel/glib20: pull the latest file monitor fix from upstream

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=226920

lightside <lightside at gmx.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
 Attachment #192573|maintainer-approval?(gnome@ |
              Flags|FreeBSD.org)                |
 Attachment #192573|0                           |1
        is obsolete|                            |
 Attachment #192694|0                           |1
        is obsolete|                            |
 Attachment #192768|                            |maintainer-approval?(gnome@
              Flags|                            |FreeBSD.org)

--- Comment #20 from lightside <lightside at gmx.com> ---
Created attachment 192768
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=192768&action=edit
Proposed patch (since 466648 revision)

I checked https://gitlab.gnome.org/GNOME/glib/tree/master/gio/kqueue for
changes and found new commit for gio/kqueue/gkqueuefilemonitor.c file:
https://gitlab.gnome.org/GNOME/glib/commit/ab179184b883ad378a420223f378071821f0c8b9
https://bugzilla.gnome.org/show_bug.cgi?id=795193

Added new changes to the files/patch-gio_filemonitor patch.
-8<--
% git clone https://gitlab.gnome.org/GNOME/glib.git
<..>
% git clone glib glib-devel
<..>
% cd glib-devel
% git checkout -b devel 2.50.3
<..>
% git cherry-pick e305fe971e4647d971428a772b7290b9c308a96f
76072a2dde4a4acc8be8d3c47efbc6811ebe0c1e
<..>
% git cherry-pick aa39a0557c679fc345b0ba72a87c33152eb8ebcd
<..>
% git diff
* Unmerged path gio/kqueue/meson.build
% git rm gio/kqueue/meson.build
<..>
% git commit --no-edit
<..>
% git cherry-pick ba4a9538e14e8ba0ea037cab5f4b23aa47272a4c
ab179184b883ad378a420223f378071821f0c8b9
<..>
% git show -s --format="# %s%n# https://gitlab.gnome.org/GNOME/glib/commit/%H"
e305fe971e4647d971428a772b7290b9c308a96f
76072a2dde4a4acc8be8d3c47efbc6811ebe0c1e
aa39a0557c679fc345b0ba72a87c33152eb8ebcd
ba4a9538e14e8ba0ea037cab5f4b23aa47272a4c
ab179184b883ad378a420223f378071821f0c8b9 > ../patch-gio_filemonitor
% echo >> ../patch-gio_filemonitor
% git diff --no-color --no-prefix 2.50.3 HEAD | sed -e '/^index/d ;
/^deleted/d' >> ../patch-gio_filemonitor
-->8-

The attachment #192694 was obsoleted.
Please check new patch.

-- 
You are receiving this mail because:
You are on the CC list for the bug.