From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id KBN/DluWj2EB2QAAgWs5BA (envelope-from ) for ; Sat, 13 Nov 2021 11:41:31 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id UE4WCluWj2E0dQAAbx9fmQ (envelope-from ) for ; Sat, 13 Nov 2021 10:41:31 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D79F6B15B for ; Sat, 13 Nov 2021 11:41:29 +0100 (CET) Received: from localhost ([::1]:42802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mlqTQ-0001yG-HW for larch@yhetil.org; Sat, 13 Nov 2021 05:41:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlqT0-0001xy-8q for bug-guix@gnu.org; Sat, 13 Nov 2021 05:41:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35077) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mlqT0-0007Pl-0o for bug-guix@gnu.org; Sat, 13 Nov 2021 05:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mlqSz-0002F8-VT for bug-guix@gnu.org; Sat, 13 Nov 2021 05:41:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#51808: [PATCH] Devhelp: On core-updates-frozen, upgrade to 41.2 to use webkit2 4.1 Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 13 Nov 2021 10:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51808 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: 51808@debbugs.gnu.org X-Debbugs-Original-To: bug-guix@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16368000188465 (code B ref -1); Sat, 13 Nov 2021 10:41:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Nov 2021 10:40:18 +0000 Received: from localhost ([127.0.0.1]:46612 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlqSI-0002CT-9K for submit@debbugs.gnu.org; Sat, 13 Nov 2021 05:40:18 -0500 Received: from lists.gnu.org ([209.51.188.17]:44414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlqSE-0002CA-7S for submit@debbugs.gnu.org; Sat, 13 Nov 2021 05:40:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlqSC-0001pm-Qd for bug-guix@gnu.org; Sat, 13 Nov 2021 05:40:14 -0500 Received: from [2a00:5881:4008:2810::309] (port=49754 helo=planete-kraus.eu) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1mlqSA-0007AJ-30 for bug-guix@gnu.org; Sat, 13 Nov 2021 05:40:12 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 0b153745 for ; Sat, 13 Nov 2021 10:40:06 +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=hMUWZgbuiFLkWU5y/xVIFeeN8sk=; b=ltX+25wVy3vWDUQIlp07xJVFodnc hyo4ktdyEuzpepuQe5dmriA6uUAbmD6xt3WrWBQv4hMHiBVCbj0odNgTEu4wFGUz Bb2Gw52cTC/omA7+1cPf+hNWzJFPb/E2MamZeFW4FJqXMaxxRuLfiqJoC1URosIu 9tGAoZH9nkXzttw= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 3e45718e (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Sat, 13 Nov 2021 10:40:04 +0000 (UTC) Date: Sat, 13 Nov 2021 10:39:58 +0000 Message-ID: <87mtm8jq4h.fsf@planete-kraus.eu> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:5881:4008:2810::309 (failed) Received-SPF: pass client-ip=2a00:5881:4008:2810::309; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" Reply-to: Vivien Kraus From: Vivien Kraus via Bug reports for GNU Guix X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1636800090; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=irYadRtv3UYhpXEpxU3roJwxDq5V8qHd5FHtdzys2yg=; b=YgKObfJUmwDMg/8qpdEEEN3VKjgF0F1Vy7aKfWGBjxbHRO48KSOc+e6XXLL4CjspCgHsUJ 3GkgWRsbKWX4T/X4hHjgxFaEPvK10MPbRyqC2axIdJi2JZrQqjoHr+iCGOaRkqFxQ5TZ9E 2Pm6OmgrlwGL64RgsfxAqCboYLVIgRNkVLXab1VdtJ4H0DcJj1Pa717Ht/rrS1qEf/g1nY YKuigl4V2jb0hrG3txiKT+txR70bRlEUafnszOcH0KsJDmMeWqLmgWHDBzxhinleW5kEP3 vtGn7ML/GSszDuyXHaAhss9Wi+u6+M8zDCNumxw8umKgIL9Q69k5gJN+7IqgXA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1636800090; a=rsa-sha256; cv=none; b=OK28y0tXIvgvAv3ZhRd084zf87G2+7ynOv/VbfsdbpwcGcmldxXRDF//Z5mri/uJ9jUNjO 6zifHCcntn38R8WTzEwRUXb083fglJCo94knJqdbMpolnO4XXg2xVcbrpaqp0of4Tcr+U8 enQnfntbB4w3DWTkTWS1kFapdBbuTVL0+bZDUX4KuFKmW2sRUqMFtrKo3rQTcWe5Ft1bob eYuT+LELkOk/9PgMc7BJYOjuWqatVpyq1ZOkt0pi6QoE2DOHIO5tFBCpxzAkTwVwbePEvl XX2rMxfRUrgMqx2zFZPbsgwtuET66zuJElRpZuzAo+OhfZXJvUdAXCGNScMbDA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=ltX+25wV; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: -5.63 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=ltX+25wV; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: D79F6B15B X-Spam-Score: -5.63 X-Migadu-Scanner: scn1.migadu.com X-TUID: UIXlDGkCpIo4 --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Dear guix, devhelp 41 gained support for building against webkit2 4.1. I think we should upgrade, right? Vivien --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-devhelp-Upgrade-to-41.2.patch Content-Transfer-Encoding: quoted-printable Content-Description: Upgrade devhelp to 41.2 From=20fadbf75a7667cfb9e2a25024913373a53310d06c Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 13 Nov 2021 10:35:26 +0000 Subject: [PATCH] gnu: devhelp: Upgrade to 41.2. * gnu/packages/gnome.scm (devhelp): Upgrade to 41.2 to upgrade the webkit dependency to 4.1. * gnu/packages/gnome.scm (devhelp) [arguments]: Use meson 0.59. * gnu/packages/gnome.scm (devhelp) [phase skip-gtk-update-icon-cache]: the post install script has been moved from meson_post_install.py to build-aux/meson/. * gnu/packages/gnome.scm (devhelp) [phase fix-devhelp-gir-inputs]: the devh= elp GIR still mentions webkit 4.0, use 4.1 instead. =2D-- gnu/packages/gnome.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d097495b1e..3f1eada0c0 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5775,7 +5775,7 @@ (define-public amtk (define-public devhelp (package (name "devhelp") =2D (version "40.1") + (version "41.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5783,17 +5783,23 @@ (define-public devhelp name "-" version ".tar.xz")) (sha256 (base32 =2D "1fvb69l1nyxdrs95ar95rmpfs8nfkpys4x74r8ilid44hhzdk2iy"))= )) + "1lk0gycjvs6gibhy0zs3ffkrkzrkyl5nkp7n60hgpa6syjq91apc")))) (build-system meson-build-system) (arguments =2D '(#:glib-or-gtk? #t + `(#:glib-or-gtk? #t + #:meson ,meson-0.59 #:phases (modify-phases %standard-phases (add-after 'unpack 'skip-gtk-update-icon-cache ;; Don't create 'icon-theme.cache'. (lambda _ =2D (substitute* "meson_post_install.py" =2D (("gtk-update-icon-cache") "true"))))))) + (substitute* "build-aux/meson/meson_post_install.py" + (("gtk-update-icon-cache") "true")))) + (add-after 'unpack 'fix-devhelp-gir-inputs + ;; It still mentions webkitgtk 4.0 + (lambda _ + (substitute* "devhelp/meson.build" + (("'WebKit2-4.0'") "'WebKit2-4.1'"))))))) (native-inputs `(("intltool" ,intltool) ("itstool" ,itstool) =2D-=20 2.33.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAEBCAAdFiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmGPlf4ACgkQO7C8EjLY uCyyOAv+JOjCWQPCbKWop1twDAxAIMqRwKek3dBEsbvESGui+5pgmWJ8+d3SfCih Jy4OhHbJuTJ+43GWt4YWRKuGuEAKv+oUJQYZCeaWTnkx23/2mMxVjs4kEYcKMQ0r I1EE1ANk9LSLc5JO67SjbYbv66THrCHz+KrQX1JlCcSq3MiuDRyduXXqEYVo+wk5 kF3879J6MdCKS8+e7u0EmK9Q5mAlED1WBA7ek4dMfpQX+C62d7ubzTOuneFn/ISP j9bm2EGKrdRLRVwPmEcSz1fXD2BFUq5DZQ9Y1KJySkZBw00A8eS/DxxJOv9Q4mNR dweFA9+We5VY2WXP4khaknbpVHGJbQVXxFeeBaGLzB8D0zYiyuvlhbiHwdRN4SS/ SM5JTP8VqODCyOfVOFx71U2BqerQQHGIG8Vzlz6U2Opz1dDZBuRBn+3A8huaEhbq xATw8hWM6A/LKvb042Er401NgSegw8d5uyPCZEG9eFdoU0x8hVjmwu9oxW2U+paj aD+DoPPX =vjFm -----END PGP SIGNATURE----- --==-=-=--