Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Apr 2018 03:23:47 +0000
From:      bugzilla-noreply@freebsd.org
To:        gnome@FreeBSD.org
Subject:   maintainer-approval requested: [Bug 226920] devel/glib20: pull the latest file monitor fix from upstream : [Attachment 192768] Proposed patch (since 466648 revision)
Message-ID:  <bug-226920-6497-YAUhHOoXtG@https.bugs.freebsd.org/bugzilla/>
In-Reply-To: <bug-226920-6497@https.bugs.freebsd.org/bugzilla/>
References:  <bug-226920-6497@https.bugs.freebsd.org/bugzilla/>

next in thread | previous in thread | raw e-mail | index | archive | help
lightside <lightside@gmx.com> has asked freebsd-gnome mailing list
<gnome@FreeBSD.org> for maintainer-approval:
Bug 226920: devel/glib20: pull the latest file monitor fix from upstream
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D226920

Attachment 192768: Proposed patch (since 466648 revision)
https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D192768&action=3Dedit



--- Comment #20 from lightside <lightside@gmx.com> ---
Created attachment 192768
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D192768&action=
=3Dedit
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/ab179184b883ad378a420223f3780718=
21f0
c8b9
https://bugzilla.gnome.org/show_bug.cgi?id=3D795193

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=3D"# %s%n# https://gitlab.gnome.org/GNOME/glib/commi=
t/%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.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-226920-6497-YAUhHOoXtG>