From owner-freebsd-gnome@freebsd.org Sun Jul 29 16:48:34 2018 Return-Path: Delivered-To: freebsd-gnome@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 23FA0105AE47 for ; Sun, 29 Jul 2018 16:48:34 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org [IPv6:2001:1900:2254:206a::50:5]) by mx1.freebsd.org (Postfix) with ESMTP id B49C5863AE for ; Sun, 29 Jul 2018 16:48:33 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: by mailman.ysv.freebsd.org (Postfix) id 76252105AE42; Sun, 29 Jul 2018 16:48:33 +0000 (UTC) Delivered-To: gnome@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 542D7105AE41 for ; Sun, 29 Jul 2018 16:48:33 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.ysv.freebsd.org (mxrelay.ysv.freebsd.org [IPv6:2001:1900:2254:206a::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.ysv.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E94BA863AA for ; Sun, 29 Jul 2018 16:48:32 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.ysv.freebsd.org (Postfix) with ESMTPS id 2406717AD2 for ; Sun, 29 Jul 2018 16:48:32 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id w6TGmWEQ013532 for ; Sun, 29 Jul 2018 16:48:32 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id w6TGmWX0013531 for gnome@FreeBSD.org; Sun, 29 Jul 2018 16:48:32 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" From: bugzilla-noreply@freebsd.org To: gnome@FreeBSD.org Subject: maintainer-approval requested: [Bug 214338] [PATCH] devel/glib20: new kqueue() backend for file monitoring : [Attachment 195597] Proposed patch (since 473551 revision) Date: Sun, 29 Jul 2018 16:48:31 +0000 X-Bugzilla-Type: request X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: needs-patch X-Bugzilla-Severity: Affects Many People X-Bugzilla-Who: X-Bugzilla-Status: In Progress X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: eugen@freebsd.org X-Bugzilla-Flags: maintainer-feedback? Message-ID: In-Reply-To: References: X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jul 2018 16:48:34 -0000 lightside has asked freebsd-gnome mailing list for maintainer-approval: Bug 214338: [PATCH] devel/glib20: new kqueue() backend for file monitoring https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D214338 Attachment 195597: Proposed patch (since 473551 revision) https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D195597&action=3Dedit --- Comment #50 from lightside --- Created attachment 195597 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D195597&action= =3Dedit Proposed patch (since 473551 revision) (In reply to comment #48) > To avoid playing with __FreeBSD_version I make always defined macro Ok, I updated files/kqueue_fnm.c file based on your changes in attachment #195570, but fixed spelling error for "compiler" word. (In reply to comment #48) > Your way to fix `make check-plist` is a bit hacky to me :) The following sed patch: @${REINPLACE_CMD} -e '/^libkqueue_la_OBJECTS =3D/s|$$(am_libkqueue_la_OBJECTS)|libkqueue_la-gkqueuefilemonitor.lo libkqueue_la-kqueue-helper.lo|' \ ${WRKSRC}/gio/kqueue/Makefile.in changes following line of ${WRKSRC}/gio/kqueue/Makefile.in file from: libkqueue_la_OBJECTS =3D $(am_libkqueue_la_OBJECTS) to: libkqueue_la_OBJECTS =3D libkqueue_la-gkqueuefilemonitor.lo libkqueue_la-kqueue-helper.lo This is because of other changes for am_libkqueue_la_OBJECTS variable in files/patch-gio_filemonitor patch: -8<-- --- gio/kqueue/Makefile.in.orig 2017-02-13 15:22:04 UTC +++ gio/kqueue/Makefile.in @@ -183,9 +183,8 @@ LTLIBRARIES =3D $(installed_test_LTLIBRARI libkqueue_la_LIBADD =3D am__objects_1 =3D am_libkqueue_la_OBJECTS =3D 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 =3D $(am_libkqueue_la_OBJECTS) AM_V_lt =3D $(am__v_lt_@AM_V@) -->8- The "/^libkqueue_la_OBJECTS =3D/" fragment searches for line(s) which start= s with "libkqueue_la_OBJECTS =3D" text and "s|$$(am_libkqueue_la_OBJECTS)|libkqueue_la-gkqueuefilemonitor.lo libkqueue_la-kqueue-helper.lo|" fragment changes "$(am_libkqueue_la_OBJECTS= )" text to "libkqueue_la-gkqueuefilemonitor.lo libkqueue_la-kqueue-helper.lo",= if line(s) with "libkqueue_la_OBJECTS =3D" text was found. The libkqueue_la-gkqueuefilemonitor.lo and libkqueue_la-kqueue-helper.lo have available Makefile's rules for gkqueuefilemonitor.c and kqueue-helper.c fil= es. This is why the files/kqueue_fnm.c was copied to ${WRKSRC}/gio/kqueue/kqueue-helper.c, instead of ${WRKSRC}/gio/kqueue/kqueue_fnm.c. (In reply to comment #48) > In last patch I put patched/regenerated Makefile.in and now no need to do= any > patch or autoreconf operations. This works, but may require to apply more changes for devel/glib20 port. I think, the maintainer may decide about used approach. Attached modified pat= ch. Thanks for attention.