From unknown Sun Jun 22 07:56:39 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#53195] [PATCH] gnu: nautilus: Fix build with libportal-0.5. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Jan 2022 20:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53195 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53195@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164193181432033 (code B ref -1); Tue, 11 Jan 2022 20:11:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Jan 2022 20:10:14 +0000 Received: from localhost ([127.0.0.1]:55680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7NTC-0008KX-0M for submit@debbugs.gnu.org; Tue, 11 Jan 2022 15:10:14 -0500 Received: from lists.gnu.org ([209.51.188.17]:33266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7NT8-0008KI-8P for submit@debbugs.gnu.org; Tue, 11 Jan 2022 15:10:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7NT3-0003wk-Rx for guix-patches@gnu.org; Tue, 11 Jan 2022 15:10:09 -0500 Received: from mout.gmx.net ([212.227.17.21]:56505) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7NT0-00024p-VU for guix-patches@gnu.org; Tue, 11 Jan 2022 15:10:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1641931794; bh=Q48OG5P91Mwj9bV2rmTiuspQ7FAN/FW/hRnZliJ32IU=; h=X-UI-Sender-Class:From:To:Subject:Date; b=HK8o2ecACWOa780EHShr7XOonUdFC/74I9SG2KrkLb4+IkE4YwHpyq/TUfFmgsGUN ueAe2F2wX+3g8okNSmiItp7/TpYA6n+lsDEQbssC5zGTnLYQx5Prmg6v40CgoUfkDR T0SM8m6zGpJFiWN0DT4+bnFxWJyDRXEdT5QDa8Ok= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MRTNF-1mjwvP28Hd-00NULb for ; Tue, 11 Jan 2022 21:09:54 +0100 User-agent: mu4e 1.6.10; emacs 27.2 From: Pierre Langlois Date: Tue, 11 Jan 2022 20:05:50 +0000 Message-ID: <87o84iuj8u.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Provags-ID: V03:K1:2zqRfpF2liIITXRoPu3OTeY3jhSVFKMnDd4gC+k58/Yz432v8O7 24dD9ZrjswG2dfOC5y8CHwRkgqNNm9jt3QoYzxU+v41qDRpSo25jWwbLofcazHP/WNplr+2 wnmYIFSEnVoR8ijsYYZDH8AL4hwTE1NSfh40hzUNF4GIh8VPE3oYMs9ztb+mKeYB3DvR1w1 FsR4NNsUOvqo2YJjsZhXg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:5AAEPKABxWU=:KMNelBnvygamgotULECkdP vCJEWD0zLxJSXFu4IEPzxBc7T6ro3pgs1iV2s785JsTYw5nzTwaUmhlIVBMA83twzMt4VXR+C FOlH4TFWCmukpY24ZUuzjF4GbaMRrKjDcoDe4li2Z70fUPFPYjxOnbSL4o85Yx9SA8Q7cVcWQ NTk6Kt2kIpOrM3KAM3HayeqkgEpVqJ4NVOPa9RaC2CzJKeg23xqc++yZy5PzaCt6CEUINXFXS aOgPSPkS3q56f3VGV/OS6i99z/rJMlRF93tBrM/VJoxwD8zNdtp/4b4rLYcYWn+dbmJ/SJzAq BoLaCou1Gcw8c6P+R3Pzw4ZTgyhVnkIdLoaCrRPZ5412gCVEdENK3sHfLA9y4cAbEuBLdquwo /32IhCN3ZEtDIfeeT+O367ow9hh06BsUZI2Ny4v9pXUndCtlB2iJHGsm0ge+G+vR5OcEIke4u F9Xx/iFaft58n5/WcDNzAsnWDsUSn93JrMoLQHjrzM57wq20bui9S50fFrLvqoJTNz1CfObPG FGCMQmghFljJZVCRBQvf6uDxdBetUKIDcNKu3VFjv9dHisucLT2ujbAs+BzHUNFsRvp3ojzS+ 1cx3mEx3Ti7+jkeJs2nYAzJeLYtasHYHEfxGjm4ZefE903Uinc+8AvVNVQ3N1FvN4b4onpowT K00G0DOuBSpzYQjRhn57xLWKCKtVv/8O/r4fzlzIu9Jju/yGxjzhhFfmdcgqBkRL615Y327nE Wf92UFkc+sPVJK2R0dRNF21JMffPcDs8CqagGCJrnEApUG2waYhlZi5thgHV+nYM/VzSjomsn 0bahlfbz2CgVtE7lHtl2daTBCoxak++5lapQxmBUz4iSWlubmvVs7/7AL4xD4PI/JAW52CvMH nUB2xNCks5qo4XMX0skTmMtXJ4QvbcDPPLc/3VZeLKN0zIjPDGrGy/ca72pCFsAnCc746VSqy cRJIRdk8euCOlAjJCULXI/DMBCCYI2SRQe+/AqnGWBcJwuxNmxGM0v3n8gsQUTt4++GPSAs5v KNsWoYnndx2ZoGS9zc4gIkA8mprjQZQUNJOuZw4qG49PD2kRR9sUBAQa2lLHG3oDWygpGEU3K OBJRp5IwVdvuzU= Received-SPF: pass client-ip=212.227.17.21; envelope-from=pierre.langlois@gmx.com; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.1 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Hi Guix! I noticed nautilus fails to build and saw there was a patch upstream so here's a patch! I've also added a patch to update nautilus to 41.1 and adjust its style while I was there. The patch will only be in nautilus 42 though. These patches are pretty trivial so I'll push them in the next few hours unless somebody beats me to it :-). Thanks, Pierre --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmHd5BEYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UgTwH/R9UCnVhfrCO3sYc+RyIcfDK EPdgfWoKMl9BhkyW6F27yH6JPtZmcyLajj0bCY+JbRpaTSsSJspNRw0PlPmysLrd IZHZpSPsM315DYbgHYgd5kECpiLLoFXVQ0pIAaP7/eLi5nH7Qw+lfw1RiDRel8/I VIEVy8o00iT7cdbGxaZY0nzfK9W/GA2/uvLRGWr1vMD5d6XG0nZt5D89+Ebbv8Iq ND0n2fTJRdRDqrl6UJA953kDPe62AuLF+PV7gQ0ItWkcgjjlLWxzrNmruYt0xVdt kspghvGI9Lqwg99kCFSr9oreTlFzMyKC8QQZh2mdNbTLVgnibImzqfLD4Rv4d9E= =kC/A -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-nautilus-Fix-build-with-libportal-0.5.patch Content-Transfer-Encoding: quoted-printable =46rom 3191e0e9084a1afeefac35e585d5a6afe1782290 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 11 Jan 2022 19:51:21 +0000 Subject: [PATCH 1/3] gnu: nautilus: Fix build with libportal-0.5. * gnu/packages/patches/nautilus-add-libportal-gtk3.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gnome.scm (nautilus)[source]: Use it. =2D-- gnu/local.mk | 1 + gnu/packages/gnome.scm | 6 +- .../patches/nautilus-add-libportal-gtk3.patch | 61 +++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/nautilus-add-libportal-gtk3.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7c75a1043b..1706663bde 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1507,6 +1507,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/musl-cross-locale.patch \ %D%/packages/patches/mutt-store-references.patch \ %D%/packages/patches/m4-gnulib-libio.patch \ + %D%/packages/patches/nautilus-add-libportal-gtk3.patch \ %D%/packages/patches/ncompress-fix-softlinks.patch \ %D%/packages/patches/netcdf-date-time.patch \ %D%/packages/patches/netpbm-CVE-2017-2586.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 60e79a7039..8181e498c3 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9095,7 +9095,11 @@ (define-public nautilus name "-" version ".tar.xz")) (sha256 (base32 - "1rd1a0wjh2sc7mzw6m61rryvgxpi2lin4xj0x9khqw04q6nl3fgr")))= ) + "1rd1a0wjh2sc7mzw6m61rryvgxpi2lin4xj0x9khqw04q6nl3fgr")) + (patches + ;; This patch is already upstream and can be removed next + ;; release. + (search-patches "nautilus-add-libportal-gtk3.patch")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t diff --git a/gnu/packages/patches/nautilus-add-libportal-gtk3.patch b/gnu/= packages/patches/nautilus-add-libportal-gtk3.patch new file mode 100644 index 0000000000..cefa47cc64 =2D-- /dev/null +++ b/gnu/packages/patches/nautilus-add-libportal-gtk3.patch @@ -0,0 +1,61 @@ +From 55cfd66ccca391fc144f5863ff6bfc1f3b137e2d Mon Sep 17 00:00:00 2001 +From: =3D?UTF-8?q?Ant=3DC3=3DB3nio=3D20Fernandes?=3D +Date: Tue, 21 Dec 2021 17:42:27 +0000 +Subject: [PATCH] general: Add libportal-gtk3 dependency + +The portal-gtk3.h header has been moved into a separate library which +binds gtk3 explicitly. + +https://github.com/flatpak/libportal/pull/53 +--- + build-aux/flatpak/org.gnome.Nautilus.json | 5 +++-- ;; Changes removed = in Guix + build-aux/flatpak/org.gnome.Nautilus.yml | 3 ++- ;; Changes removed = in Guix + meson.build | 4 +++- + src/meson.build | 1 + + src/nautilus-files-view.c | 2 +- + 5 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/meson.build b/meson.build +index 927216636..4626fa0bb 100644 +--- a/meson.build ++++ b/meson.build +@@ -122,8 +122,10 @@ gnome_desktop =3D dependency('gnome-desktop-3.0', ve= rsion: '>=3D 3.0.0') + gtk =3D dependency('gtk+-3.0', version: '>=3D 3.22.27') + libhandy =3D dependency('libhandy-1', version: '>=3D 1.1.90') + libportal =3D [] ++libportal_gtk3 =3D [] + if get_option('libportal') +- libportal =3D dependency('libportal', version: '>=3D 0.3') ++ libportal =3D dependency('libportal', version: '>=3D 0.5') ++ libportal_gtk3 =3D dependency('libportal-gtk3', version: '>=3D 0.5') + endif + selinux =3D [] + if get_option('selinux') +diff --git a/src/meson.build b/src/meson.build +index 682d6f3a3..d7fb76d53 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -285,6 +285,7 @@ nautilus_deps =3D [ + libgd_dep, + libhandy, + libportal, ++ libportal_gtk3, + nautilus_extension, + selinux, + tracker_sparql, +diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c +index dfb7fb26c..a24005a11 100644 +--- a/src/nautilus-files-view.c ++++ b/src/nautilus-files-view.c +@@ -93,7 +93,7 @@ + + #ifdef HAVE_LIBPORTAL + #include +-#include ++#include + #endif + + /* Minimum starting update inverval */ +-- +GitLab + =2D- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-nautilus-Update-to-41.1.patch Content-Transfer-Encoding: quoted-printable =46rom 25b9874e65e18de668e46da1f6bb7b83b23050e7 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 11 Jan 2022 19:55:03 +0000 Subject: [PATCH 2/3] gnu: nautilus: Update to 41.1. * gnu/packages/gnome.scm (nautilus): Update to 41.1. [arguments]: Remove #:meson keyword. =2D-- gnu/packages/gnome.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8181e498c3..b621f6c43a 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9087,7 +9087,7 @@ (define-public tracker-miners (define-public nautilus (package (name "nautilus") - (version "41.0") + (version "41.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9095,7 +9095,7 @@ (define-public nautilus name "-" version ".tar.xz")) (sha256 (base32 - "1rd1a0wjh2sc7mzw6m61rryvgxpi2lin4xj0x9khqw04q6nl3fgr")) + "0bsqh241m43x3qb3z0mjakjic610ncl95zhjdgls649phnc30qry")) (patches ;; This patch is already upstream and can be removed next ;; release. @@ -9103,7 +9103,6 @@ (define-public nautilus (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t - #:meson ,meson-0.59 #:phases (modify-phases %standard-phases (add-after 'unpack 'make-extensible =2D- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-gnu-nautilus-Adjust-style.patch Content-Transfer-Encoding: quoted-printable =46rom 625c25732ce7e7bc28bda9164c6145993b3689a4 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 11 Jan 2022 19:59:23 +0000 Subject: [PATCH 3/3] gnu: nautilus: Adjust style. * gnu/packages/gnome.scm (nautilus)[native-inputs, inputs]: Remove labels. =2D-- gnu/packages/gnome.scm | 56 +++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b621f6c43a..b30edcc736 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9135,35 +9135,35 @@ (define-public nautilus ;; Settings schema 'org.gnome.nautilus.preferences' is not insta= lled #:tests? #f)) (native-inputs - `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-da= tabase - ("glib:bin" ,glib "bin") ; for glib-mkenums, etc. - ("gobject-introspection" ,gobject-introspection) - ("intltool" ,intltool) - ("pkg-config" ,pkg-config))) + (list desktop-file-utils ; for update-desktop-database + `(,glib "bin") ; for glib-mkenums, etc. + gobject-introspection + intltool + pkg-config)) (inputs - `(("dconf" ,dconf) - ("gexiv2" ,gexiv2) - ("gvfs" ,gvfs) - ("exempi" ,exempi) - ("gnome-desktop" ,gnome-desktop) - ("gnome-autoar" ,gnome-autoar) - ("gst-plugins-base" ,gst-plugins-base) - ("json-glib" ,json-glib) - ("libhandy" ,libhandy) - ("libportal" ,libportal) - ("libseccomp" ,libseccomp) - ("libselinux" ,libselinux) - ("libsoup" ,libsoup-minimal-2) ; to satisfy tracker dependencies - ("tracker" ,tracker) - ("tracker-miners" ,tracker-miners) - ;; XXX: gtk+ is required by libnautilus-extension.pc - ;; - ;; Don't propagate it to reduces "profile pollution" of the 'gnome= ' meta - ;; package. See: - ;; . - ("gtk+" ,gtk+) - ("libexif" ,libexif) - ("libxml2" ,libxml2))) + (list dconf + gexiv2 + gvfs + exempi + gnome-desktop + gnome-autoar + gst-plugins-base + json-glib + libhandy + libportal + libseccomp + libselinux + libsoup-minimal-2 ; to satisfy tracker dependencies + tracker + tracker-miners + ;; XXX: gtk+ is required by libnautilus-extension.pc + ;; + ;; Don't propagate it to reduces "profile pollution" of the 'g= nome' meta + ;; package. See: + ;; . + gtk+ + libexif + libxml2)) (native-search-paths (list (search-path-specification (variable "NAUTILUS_EXTENSION_PATH") =2D- 2.34.0 --=-=-=-- From unknown Sun Jun 22 07:56:39 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Pierre Langlois Subject: bug#53195: closed (Re: [PATCH] gnu: nautilus: Fix build with libportal-0.5.) Message-ID: References: <871r1dvlxc.fsf@gmx.com> <87o84iuj8u.fsf@gmx.com> X-Gnu-PR-Message: they-closed 53195 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 53195@debbugs.gnu.org Date: Wed, 12 Jan 2022 00:27:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1641947222-23260-1" This is a multi-part message in MIME format... ------------=_1641947222-23260-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #53195: [PATCH] gnu: nautilus: Fix build with libportal-0.5. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 53195@debbugs.gnu.org. --=20 53195: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D53195 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1641947222-23260-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 53195-done) by debbugs.gnu.org; 12 Jan 2022 00:26:55 +0000 Received: from localhost ([127.0.0.1]:55861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7RTb-00062m-1Z for submit@debbugs.gnu.org; Tue, 11 Jan 2022 19:26:55 -0500 Received: from mout.gmx.net ([212.227.17.21]:56933) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7RTW-00062U-4k for 53195-done@debbugs.gnu.org; Tue, 11 Jan 2022 19:26:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1641947204; bh=4vTNucpUPsw9fnwn7glVfnk7Bda2hvk+TtGOATEBeQU=; h=X-UI-Sender-Class:References:From:To:Subject:Date:In-reply-to; b=MGloMn1DjopFowbxPSGdPh8EkWeBDk13xcFeMOD5kncoZ63S6K9WofKQl6v6hJjfm l2BBS9KOJYS17IeYmPadTV6s+UwacZxol5rj3uF2ajf77mnqArKnIv8y44b/iIvZdG +lCCVTOD99UOelMr46OLED7cp0/UBVCGTFDY4yzQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MSbx3-1mwlI23Q4X-00Sv3h for <53195-done@debbugs.gnu.org>; Wed, 12 Jan 2022 01:26:43 +0100 References: <87o84iuj8u.fsf@gmx.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Pierre Langlois To: 53195-done@debbugs.gnu.org Subject: Re: [PATCH] gnu: nautilus: Fix build with libportal-0.5. Date: Wed, 12 Jan 2022 00:24:57 +0000 In-reply-to: <87o84iuj8u.fsf@gmx.com> Message-ID: <871r1dvlxc.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:0euZkB2ojuw0m5V9Pjm8ygcGHOAUGbHjNfNGCijw3qRV04Mw+Z8 twg/bEEvp54T6Kv2ustLstS/Ah7alxEM/GHcSeTy3/LdUCgZ+mJPFUxzVs1FhHkcfSwUIa8 VesacJQRKY7viwTwRW4KboS58D1WT+Gk41wRq+NNa19hW5noq3E6/VIUCB3Hmolp2yMMBGJ jGgN5UaVrHR8UGVOT7PzA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:O8JBq9mnR9g=:sIMXpn2i5OPKV0I5vgGeX1 P+XZKI97QMC4n+cfup2fzwlLC0mTTSOq6Lv3rgm8Erjt+Ej7Ddtez/k+MB5y8fe2hgIHsRnV3 2wWW7ihl0HW+sc77cxHsXSHIDMEULtTwYqIm/QXWFx4fOId/GZbnZrw3u8dkwslR4VJz7IUoi 25vEWfUY2DhIibslfGB+4IQxr4vNdElJ/KH67mBIzkIIbIZjBUIY+rh3+YzLraUUkr7NWd4zO KRlijevqFZBpHIWO9BWf7Lm7d5IDjjASm35ReneNd3lM2KxpSM7gzaVeYA4iav9zeW3uWb2Cb iUHbWvKcsQJrc6r6pEIORZTtY2Q0mb/Q3Pm9cDt2kKgrThIsYgHTiBbYJvqH7c1GTzBZYbixS PNlL/Uja5r1hhwRtemVsOBPO50RY11Jae0rawd7pZeyuGDZTIcXotYZhLnj4D+hT9wnn7seGn RaL8tPGV80sXD3vB+Ut8YdBy8S2/T/xKfSpaXVJ7Migc5XwzFDKEsuo9ShqwpQRwWE0A78Kyj bdvZDY5X0+zFFpOLIQP5gEMUu0mkvjEi4nwiO7yBHOfvdxvSH1Gkrc13re7G4BTajYLJchQXS CEYa/9/ePTx5RuVp71IZGAjpIc4iml55BvsWlCFIzx/s6rIZLPFrRksk7p5CBIbJyMl0vzb3I ioJRB8Siwf4V2/71foLxNpfhN3vndwCOvN7oUa5qQCo4PRdU2imKNl2b6BX6Zoxwdr8Pls5Ac ZY92CfuOVVq55lj9r6aMHdlgPj7SqecleKsw9QGvK+yuxglPfDqS222fm8glqMFRrDky3zfQF 1+a22++zoruvb5NoF8HfYJmo4xNpb3Ews5ZT1I6pWJd45SNhk2yOm1X9QS64NSCSA7W8yvJmo kRpyfZUSnPw8OevvnrKblkYfQrk191nleqkQ5H1recZ+/cPwn6vlY9Y3To7RiXlemKhHd9gpU W0ONCydioaTpppDh9eDQPN3fFHYF/swP+0dv58VG/rtypBW8Qi/2c/P21c0eNxJLLkUNjK33w zQkQCJATEaPqoA+zXinbscd1UD/DLcrd8Sw7jnl8xj96+UcNbq2/gjIlny34YdWG1Ld3gUHGc GIHrWr3nnKGBJk= X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 53195-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Pierre Langlois writes: > [[PGP Signed Part:Undecided]] > Hi Guix! > > I noticed nautilus fails to build and saw there was a patch upstream so > here's a patch! I've also added a patch to update nautilus to 41.1 and > adjust its style while I was there. The patch will only be in nautilus > 42 though. > > These patches are pretty trivial so I'll push them in the next few hours > unless somebody beats me to it :-). Pushed with a9678953ea0be55fb40500066ddeb2451298a190 5b0a7fd9ad3f3e3fbb89bd19dc90490f4bc5ca4a 857dc1cc64aa365cd6ba79a55b1e8f2f667c5d20 And gnome builds again! :-) Thanks, Pierre --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmHeID8YHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UmBkIAIUsVJ/EHysMywdM9evmc1/0 K9K9F6mYZOYV6YV09TIGkfPj91CQ7l+Pmpll373Wj/LaPOz+uEz7pYHagjApROGB Jsmeab2gSmFYy3DtruhRw/qaXjNn8fjTfujHbpi6nNHL6Z5hFPMDc3Cqxx3KTKC8 7MYOssvQw/ukXmwVWpzJQ/T2/j5ePv72qdfw62PYibklEkLhBDFSDZDjOaGWrAs7 DfV7lH0CECw1N3EFRwik4Ct4znpdhxwotuBo6wWhZxu7NpfPQ5kGjyP/yy11nufx 3//8fVXdE4fWqZG8mHsoiP5c/NuAVxDLeD+2FFqDqQHdhmKCEpJVRFHwFvZ/TSE= =w5nY -----END PGP SIGNATURE----- --=-=-=-- ------------=_1641947222-23260-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 11 Jan 2022 20:10:14 +0000 Received: from localhost ([127.0.0.1]:55680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7NTC-0008KX-0M for submit@debbugs.gnu.org; Tue, 11 Jan 2022 15:10:14 -0500 Received: from lists.gnu.org ([209.51.188.17]:33266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7NT8-0008KI-8P for submit@debbugs.gnu.org; Tue, 11 Jan 2022 15:10:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7NT3-0003wk-Rx for guix-patches@gnu.org; Tue, 11 Jan 2022 15:10:09 -0500 Received: from mout.gmx.net ([212.227.17.21]:56505) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7NT0-00024p-VU for guix-patches@gnu.org; Tue, 11 Jan 2022 15:10:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1641931794; bh=Q48OG5P91Mwj9bV2rmTiuspQ7FAN/FW/hRnZliJ32IU=; h=X-UI-Sender-Class:From:To:Subject:Date; b=HK8o2ecACWOa780EHShr7XOonUdFC/74I9SG2KrkLb4+IkE4YwHpyq/TUfFmgsGUN ueAe2F2wX+3g8okNSmiItp7/TpYA6n+lsDEQbssC5zGTnLYQx5Prmg6v40CgoUfkDR T0SM8m6zGpJFiWN0DT4+bnFxWJyDRXEdT5QDa8Ok= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MRTNF-1mjwvP28Hd-00NULb for ; Tue, 11 Jan 2022 21:09:54 +0100 User-agent: mu4e 1.6.10; emacs 27.2 From: Pierre Langlois To: guix-patches@gnu.org Subject: [PATCH] gnu: nautilus: Fix build with libportal-0.5. Date: Tue, 11 Jan 2022 20:05:50 +0000 Message-ID: <87o84iuj8u.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Provags-ID: V03:K1:2zqRfpF2liIITXRoPu3OTeY3jhSVFKMnDd4gC+k58/Yz432v8O7 24dD9ZrjswG2dfOC5y8CHwRkgqNNm9jt3QoYzxU+v41qDRpSo25jWwbLofcazHP/WNplr+2 wnmYIFSEnVoR8ijsYYZDH8AL4hwTE1NSfh40hzUNF4GIh8VPE3oYMs9ztb+mKeYB3DvR1w1 FsR4NNsUOvqo2YJjsZhXg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:5AAEPKABxWU=:KMNelBnvygamgotULECkdP vCJEWD0zLxJSXFu4IEPzxBc7T6ro3pgs1iV2s785JsTYw5nzTwaUmhlIVBMA83twzMt4VXR+C FOlH4TFWCmukpY24ZUuzjF4GbaMRrKjDcoDe4li2Z70fUPFPYjxOnbSL4o85Yx9SA8Q7cVcWQ NTk6Kt2kIpOrM3KAM3HayeqkgEpVqJ4NVOPa9RaC2CzJKeg23xqc++yZy5PzaCt6CEUINXFXS aOgPSPkS3q56f3VGV/OS6i99z/rJMlRF93tBrM/VJoxwD8zNdtp/4b4rLYcYWn+dbmJ/SJzAq BoLaCou1Gcw8c6P+R3Pzw4ZTgyhVnkIdLoaCrRPZ5412gCVEdENK3sHfLA9y4cAbEuBLdquwo /32IhCN3ZEtDIfeeT+O367ow9hh06BsUZI2Ny4v9pXUndCtlB2iJHGsm0ge+G+vR5OcEIke4u F9Xx/iFaft58n5/WcDNzAsnWDsUSn93JrMoLQHjrzM57wq20bui9S50fFrLvqoJTNz1CfObPG FGCMQmghFljJZVCRBQvf6uDxdBetUKIDcNKu3VFjv9dHisucLT2ujbAs+BzHUNFsRvp3ojzS+ 1cx3mEx3Ti7+jkeJs2nYAzJeLYtasHYHEfxGjm4ZefE903Uinc+8AvVNVQ3N1FvN4b4onpowT K00G0DOuBSpzYQjRhn57xLWKCKtVv/8O/r4fzlzIu9Jju/yGxjzhhFfmdcgqBkRL615Y327nE Wf92UFkc+sPVJK2R0dRNF21JMffPcDs8CqagGCJrnEApUG2waYhlZi5thgHV+nYM/VzSjomsn 0bahlfbz2CgVtE7lHtl2daTBCoxak++5lapQxmBUz4iSWlubmvVs7/7AL4xD4PI/JAW52CvMH nUB2xNCks5qo4XMX0skTmMtXJ4QvbcDPPLc/3VZeLKN0zIjPDGrGy/ca72pCFsAnCc746VSqy cRJIRdk8euCOlAjJCULXI/DMBCCYI2SRQe+/AqnGWBcJwuxNmxGM0v3n8gsQUTt4++GPSAs5v KNsWoYnndx2ZoGS9zc4gIkA8mprjQZQUNJOuZw4qG49PD2kRR9sUBAQa2lLHG3oDWygpGEU3K OBJRp5IwVdvuzU= Received-SPF: pass client-ip=212.227.17.21; envelope-from=pierre.langlois@gmx.com; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.1 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Hi Guix! I noticed nautilus fails to build and saw there was a patch upstream so here's a patch! I've also added a patch to update nautilus to 41.1 and adjust its style while I was there. The patch will only be in nautilus 42 though. These patches are pretty trivial so I'll push them in the next few hours unless somebody beats me to it :-). Thanks, Pierre --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmHd5BEYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UgTwH/R9UCnVhfrCO3sYc+RyIcfDK EPdgfWoKMl9BhkyW6F27yH6JPtZmcyLajj0bCY+JbRpaTSsSJspNRw0PlPmysLrd IZHZpSPsM315DYbgHYgd5kECpiLLoFXVQ0pIAaP7/eLi5nH7Qw+lfw1RiDRel8/I VIEVy8o00iT7cdbGxaZY0nzfK9W/GA2/uvLRGWr1vMD5d6XG0nZt5D89+Ebbv8Iq ND0n2fTJRdRDqrl6UJA953kDPe62AuLF+PV7gQ0ItWkcgjjlLWxzrNmruYt0xVdt kspghvGI9Lqwg99kCFSr9oreTlFzMyKC8QQZh2mdNbTLVgnibImzqfLD4Rv4d9E= =kC/A -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-nautilus-Fix-build-with-libportal-0.5.patch Content-Transfer-Encoding: quoted-printable =46rom 3191e0e9084a1afeefac35e585d5a6afe1782290 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 11 Jan 2022 19:51:21 +0000 Subject: [PATCH 1/3] gnu: nautilus: Fix build with libportal-0.5. * gnu/packages/patches/nautilus-add-libportal-gtk3.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gnome.scm (nautilus)[source]: Use it. =2D-- gnu/local.mk | 1 + gnu/packages/gnome.scm | 6 +- .../patches/nautilus-add-libportal-gtk3.patch | 61 +++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/nautilus-add-libportal-gtk3.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7c75a1043b..1706663bde 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1507,6 +1507,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/musl-cross-locale.patch \ %D%/packages/patches/mutt-store-references.patch \ %D%/packages/patches/m4-gnulib-libio.patch \ + %D%/packages/patches/nautilus-add-libportal-gtk3.patch \ %D%/packages/patches/ncompress-fix-softlinks.patch \ %D%/packages/patches/netcdf-date-time.patch \ %D%/packages/patches/netpbm-CVE-2017-2586.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 60e79a7039..8181e498c3 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9095,7 +9095,11 @@ (define-public nautilus name "-" version ".tar.xz")) (sha256 (base32 - "1rd1a0wjh2sc7mzw6m61rryvgxpi2lin4xj0x9khqw04q6nl3fgr")))= ) + "1rd1a0wjh2sc7mzw6m61rryvgxpi2lin4xj0x9khqw04q6nl3fgr")) + (patches + ;; This patch is already upstream and can be removed next + ;; release. + (search-patches "nautilus-add-libportal-gtk3.patch")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t diff --git a/gnu/packages/patches/nautilus-add-libportal-gtk3.patch b/gnu/= packages/patches/nautilus-add-libportal-gtk3.patch new file mode 100644 index 0000000000..cefa47cc64 =2D-- /dev/null +++ b/gnu/packages/patches/nautilus-add-libportal-gtk3.patch @@ -0,0 +1,61 @@ +From 55cfd66ccca391fc144f5863ff6bfc1f3b137e2d Mon Sep 17 00:00:00 2001 +From: =3D?UTF-8?q?Ant=3DC3=3DB3nio=3D20Fernandes?=3D +Date: Tue, 21 Dec 2021 17:42:27 +0000 +Subject: [PATCH] general: Add libportal-gtk3 dependency + +The portal-gtk3.h header has been moved into a separate library which +binds gtk3 explicitly. + +https://github.com/flatpak/libportal/pull/53 +--- + build-aux/flatpak/org.gnome.Nautilus.json | 5 +++-- ;; Changes removed = in Guix + build-aux/flatpak/org.gnome.Nautilus.yml | 3 ++- ;; Changes removed = in Guix + meson.build | 4 +++- + src/meson.build | 1 + + src/nautilus-files-view.c | 2 +- + 5 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/meson.build b/meson.build +index 927216636..4626fa0bb 100644 +--- a/meson.build ++++ b/meson.build +@@ -122,8 +122,10 @@ gnome_desktop =3D dependency('gnome-desktop-3.0', ve= rsion: '>=3D 3.0.0') + gtk =3D dependency('gtk+-3.0', version: '>=3D 3.22.27') + libhandy =3D dependency('libhandy-1', version: '>=3D 1.1.90') + libportal =3D [] ++libportal_gtk3 =3D [] + if get_option('libportal') +- libportal =3D dependency('libportal', version: '>=3D 0.3') ++ libportal =3D dependency('libportal', version: '>=3D 0.5') ++ libportal_gtk3 =3D dependency('libportal-gtk3', version: '>=3D 0.5') + endif + selinux =3D [] + if get_option('selinux') +diff --git a/src/meson.build b/src/meson.build +index 682d6f3a3..d7fb76d53 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -285,6 +285,7 @@ nautilus_deps =3D [ + libgd_dep, + libhandy, + libportal, ++ libportal_gtk3, + nautilus_extension, + selinux, + tracker_sparql, +diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c +index dfb7fb26c..a24005a11 100644 +--- a/src/nautilus-files-view.c ++++ b/src/nautilus-files-view.c +@@ -93,7 +93,7 @@ + + #ifdef HAVE_LIBPORTAL + #include +-#include ++#include + #endif + + /* Minimum starting update inverval */ +-- +GitLab + =2D- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-nautilus-Update-to-41.1.patch Content-Transfer-Encoding: quoted-printable =46rom 25b9874e65e18de668e46da1f6bb7b83b23050e7 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 11 Jan 2022 19:55:03 +0000 Subject: [PATCH 2/3] gnu: nautilus: Update to 41.1. * gnu/packages/gnome.scm (nautilus): Update to 41.1. [arguments]: Remove #:meson keyword. =2D-- gnu/packages/gnome.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8181e498c3..b621f6c43a 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9087,7 +9087,7 @@ (define-public tracker-miners (define-public nautilus (package (name "nautilus") - (version "41.0") + (version "41.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9095,7 +9095,7 @@ (define-public nautilus name "-" version ".tar.xz")) (sha256 (base32 - "1rd1a0wjh2sc7mzw6m61rryvgxpi2lin4xj0x9khqw04q6nl3fgr")) + "0bsqh241m43x3qb3z0mjakjic610ncl95zhjdgls649phnc30qry")) (patches ;; This patch is already upstream and can be removed next ;; release. @@ -9103,7 +9103,6 @@ (define-public nautilus (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t - #:meson ,meson-0.59 #:phases (modify-phases %standard-phases (add-after 'unpack 'make-extensible =2D- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-gnu-nautilus-Adjust-style.patch Content-Transfer-Encoding: quoted-printable =46rom 625c25732ce7e7bc28bda9164c6145993b3689a4 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 11 Jan 2022 19:59:23 +0000 Subject: [PATCH 3/3] gnu: nautilus: Adjust style. * gnu/packages/gnome.scm (nautilus)[native-inputs, inputs]: Remove labels. =2D-- gnu/packages/gnome.scm | 56 +++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b621f6c43a..b30edcc736 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9135,35 +9135,35 @@ (define-public nautilus ;; Settings schema 'org.gnome.nautilus.preferences' is not insta= lled #:tests? #f)) (native-inputs - `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-da= tabase - ("glib:bin" ,glib "bin") ; for glib-mkenums, etc. - ("gobject-introspection" ,gobject-introspection) - ("intltool" ,intltool) - ("pkg-config" ,pkg-config))) + (list desktop-file-utils ; for update-desktop-database + `(,glib "bin") ; for glib-mkenums, etc. + gobject-introspection + intltool + pkg-config)) (inputs - `(("dconf" ,dconf) - ("gexiv2" ,gexiv2) - ("gvfs" ,gvfs) - ("exempi" ,exempi) - ("gnome-desktop" ,gnome-desktop) - ("gnome-autoar" ,gnome-autoar) - ("gst-plugins-base" ,gst-plugins-base) - ("json-glib" ,json-glib) - ("libhandy" ,libhandy) - ("libportal" ,libportal) - ("libseccomp" ,libseccomp) - ("libselinux" ,libselinux) - ("libsoup" ,libsoup-minimal-2) ; to satisfy tracker dependencies - ("tracker" ,tracker) - ("tracker-miners" ,tracker-miners) - ;; XXX: gtk+ is required by libnautilus-extension.pc - ;; - ;; Don't propagate it to reduces "profile pollution" of the 'gnome= ' meta - ;; package. See: - ;; . - ("gtk+" ,gtk+) - ("libexif" ,libexif) - ("libxml2" ,libxml2))) + (list dconf + gexiv2 + gvfs + exempi + gnome-desktop + gnome-autoar + gst-plugins-base + json-glib + libhandy + libportal + libseccomp + libselinux + libsoup-minimal-2 ; to satisfy tracker dependencies + tracker + tracker-miners + ;; XXX: gtk+ is required by libnautilus-extension.pc + ;; + ;; Don't propagate it to reduces "profile pollution" of the 'g= nome' meta + ;; package. See: + ;; . + gtk+ + libexif + libxml2)) (native-search-paths (list (search-path-specification (variable "NAUTILUS_EXTENSION_PATH") =2D- 2.34.0 --=-=-=-- ------------=_1641947222-23260-1--