From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 29 18:20:07 2021 Received: (at submit) by debbugs.gnu.org; 29 Nov 2021 23:20:07 +0000 Received: from localhost ([127.0.0.1]:39703 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrpwN-0004xr-DE for submit@debbugs.gnu.org; Mon, 29 Nov 2021 18:20:07 -0500 Received: from lists.gnu.org ([209.51.188.17]:34354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrpwL-0004xi-UZ for submit@debbugs.gnu.org; Mon, 29 Nov 2021 18:20:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrpwL-0000oW-Jm for guix-patches@gnu.org; Mon, 29 Nov 2021 18:20:05 -0500 Received: from planete-kraus.eu ([89.234.140.182]:45334) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1mrpwI-0002vz-S6 for guix-patches@gnu.org; Mon, 29 Nov 2021 18:20:05 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id e63c7485 for ; Mon, 29 Nov 2021 23:19:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :to:subject:date:message-id:mime-version:content-type; s=dkim; bh=CJlPqXq5Q/Fo6lQawpIdOLmBW1U=; b=JKZGIg3c/HMaSJxJNuUkOHY9Z+lh 9OlwJi5apvIzstaur6TBwWLGysNMb3mGcUcOxNnwOVpu61WByqCCgnriLJ3UEjul sVK2HUMsaWphipyYByRRpBm78qzSGjIKTFPYPC3+iRfheFnoeinX5JNF5iC0+guR mGtPdqe01+r3kwg= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id d06ecdf2 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Mon, 29 Nov 2021 23:19:52 +0000 (UTC) From: Vivien Kraus To: guix-patches@gnu.org Subject: [PATCH] [core-updates-frozen] Fix gnome-builder. Date: Tue, 30 Nov 2021 00:19:12 +0100 Message-ID: <87czmi7dov.fsf@planete-kraus.eu> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=89.234.140.182; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) 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/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Dear guix, GNOME builder is not ready yet for libsoup 3, so I suggest that we add a libsoup 2 variant for devhelp, and use libsoup 2 everywhere for builder. What do you think? Best regards, Vivien --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-devhelp-Add-a-libsoup-2-variant.patch Content-Transfer-Encoding: quoted-printable Content-Description: Add a libsoup 2 variant for devhelp From=203d579f6a778f92db432b9de4065295cd510f712d Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 30 Nov 2021 00:03:07 +0100 Subject: [PATCH 1/2] gnu: devhelp: Add a libsoup 2 variant. * gnu/packages/gnome.scm (devhelp-with-libsoup2): New variable. =2D-- gnu/packages/gnome.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8e0e750180..ccb99ca8ec 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5854,6 +5854,22 @@ (define-public devhelp throughout GNOME for API documentation).") (license license:gpl2+))) =20 +(define-public devhelp-with-libsoup2 + (package/inherit devhelp + (arguments + (substitute-keyword-arguments (package-arguments devhelp) + ((#:phases phases '%standard-phases) + `(modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "build-aux/meson/meson_post_install.py" + (("gtk-update-icon-cache") "true")))))))) + (inputs + `(("amtk" ,amtk) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("webkitgtk" ,webkitgtk-with-libsoup2))))) + (define-public cogl (package (name "cogl") =2D-=20 2.34.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0002-gnu-gnome-builder-Use-libsoup-2.patch Content-Transfer-Encoding: quoted-printable Content-Description: Use libsoup 2 in GNOME builder From=206c896768d191f1fbc129b2c5b1d7bcd8a88aa93c Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 30 Nov 2021 00:05:18 +0100 Subject: [PATCH 2/2] gnu: gnome-builder: Use libsoup 2. MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gnome-builder) [phase 'patch-meson]: Don=E2=80=99= t search for webkit2gtk-4.1. [inputs]: Replace devhelp with devhelp-with-libsoup2 and webkit with webkit-with-libsoup2. =2D-- gnu/packages/gnome.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ccb99ca8ec..5f99616571 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12486,10 +12486,7 @@ (define-public gnome-builder (substitute* "src/libide/meson.build" (("/usr/lib") (string-append (assoc-ref inputs "python-pygobject") =2D "/lib"))) =2D (substitute* "meson.build" =2D (("webkit2gtk-4.0") "webkit2gtk-4.1")) =2D #t)) + "/lib"))))) (add-after 'configure 'fix-ninja (lambda _ ;; #43296: meson(?) incorrectly assumes we want to link @@ -12505,7 +12502,7 @@ (define-public gnome-builder (inputs `(("cmark" ,cmark) ("clang" ,clang) =2D ("devhelp" ,devhelp) + ("devhelp" ,devhelp-with-libsoup2) ("glade" ,glade3) ("gspell" ,gspell) ("gtk+" ,gtk+) @@ -12521,7 +12518,7 @@ (define-public gnome-builder ("sysprof" ,sysprof) ("template-glib" ,template-glib) ("vte" ,vte) =2D ("webkitgtk" ,webkitgtk))) + ("webkitgtk" ,webkitgtk-with-libsoup2))) (propagated-inputs `(("gtksourceview" ,gtksourceview))) ;needed for settings (native-inputs =2D-=20 2.34.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAEBCAAdFiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmGlX/AACgkQO7C8EjLY uCwSfwwAsCIY+rlOO/hru+CdzCboqQVUQDL1LNa+RPxFcvtQBrGGkPeKpAg1CaTQ tZppS8nB6zDD4+MJngzDT+2rvQhhI2adf6GVPbkSB1wrjklSqsKq+bcKErbRmUs4 tUFIMFbbrkSTRdNQ3l2x2QrkNg5aKS4e3ojN7oQYYLBzhAmFoWqSF6m+/sYZN8gv GGOtg+qYgWh+39gg2FCrVLW6Eu0Xk1rSG/zXoHboolSTX7YLUdE+SRTkPUtSNd6H 5dtlGaFzNqlj2QtasqieH/3fU43hBwl3KAUCsmJWhc+NGqloaImdYmqDPXTQA+Uq fwOXrFOu6GsNmVek7ctCwqDOPauO1tMz3vmOL4fR9wy9EDUymPLTI45sRjxU66Fn nMcB+i8HtArnSKFrF4iCBcHlP5XWqMZhOK6Z5aZNKMYxKKCpYEkYwvp3REkOWBwh deBIvFmh7o3NW9UJw6Zc4OMPUrsqWICP+f1FI3+1roZartKQjU1nOjm2GMZUH3Re C/fQ4vsf =EvpA -----END PGP SIGNATURE----- --==-=-=--