From patchwork Fri Dec 17 22:25:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 35359 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BC67927BBE9; Fri, 17 Dec 2021 22:27:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7709727BBEA for ; Fri, 17 Dec 2021 22:27:54 +0000 (GMT) Received: from localhost ([::1]:46790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myLhh-0003Cn-JR for patchwork@mira.cbaines.net; Fri, 17 Dec 2021 17:27:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myLfv-0001w9-40 for guix-patches@gnu.org; Fri, 17 Dec 2021 17:26:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57492) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myLfu-0006oD-Qf for guix-patches@gnu.org; Fri, 17 Dec 2021 17:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myLfu-0002cy-Hz for guix-patches@gnu.org; Fri, 17 Dec 2021 17:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52572] [PATCH v2] gnu: local.mk: Register missing patches. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Dec 2021 22:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52572 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 52572@debbugs.gnu.org Received: via spool by 52572-submit@debbugs.gnu.org id=B52572.163977993110056 (code B ref 52572); Fri, 17 Dec 2021 22:26:02 +0000 Received: (at 52572) by debbugs.gnu.org; 17 Dec 2021 22:25:31 +0000 Received: from localhost ([127.0.0.1]:40805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myLfP-0002c8-CW for submit@debbugs.gnu.org; Fri, 17 Dec 2021 17:25:31 -0500 Received: from jpoiret.xyz ([206.189.101.64]:55404) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myLfO-0002c0-3F for 52572@debbugs.gnu.org; Fri, 17 Dec 2021 17:25:30 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 8E714184F5C; Fri, 17 Dec 2021 22:25:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1639779928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IP16RUfzAIaYO3rKSG306SFhr4Zknpy/v9RfLhlBgpw=; b=AxfC+OjJw922YOJu2x9/7Ng03Ywso/R/QuwlMUnIZKPC3F16hM2dxzGpoxbOTiHhGcUs9Q kX6d/mWzCE2JM3u5b04HbymEJLHmvXyKC8Gn2zeiBVp7+8kVV0z/pUpkV6ZMSdVs8wUabH 5/5X7In/XYicfrFkS4rSdB25kJEdr3Oovvn6qTwVbPkSn2gj4AnlPxAQo0ZkOIox5qJ3BB AbgeE8Oev74iwno2aEmhuFtalj3qgMbxJytKprqvBXo4S3x7lqI+hdaP+7idX9DYrhsvXZ 5a/gPg3+H8z56fHJQDW45cPqis41i5cYpnVqMZSawpIeaZtBOQstZALaqHN+Sw== Date: Fri, 17 Dec 2021 23:25:22 +0100 Message-Id: <20211217222522.2440-1-dev@jpoiret.xyz> In-Reply-To: <20211217121738.27506-1-dev@jpoiret.xyz> References: <20211217121738.27506-1-dev@jpoiret.xyz> MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret X-getmail-retrieved-from-mailbox: Patches Sorry, the last patch had a typo, `%d%` instead of `%D%`. This should work now. Without this, the guix installed by its package definition is not able to install anything GCC 10 related. The guix package also needs to be updated to point to a commit that includes this patch. Best, Josselin -- >8 -- * gnu/local.mk (dist_patch_DATA): Add gcc-cross-gxx-include-dir.patch, gcc-10-cross-environment-variables.patch, gnome-session-support-elogind.patch, icedtea-7-hotspot-aarch64-use-c++98.patch, libvirt-create-machine-cgroup.patch, openjdk-14-builtins.patch, python-babel-fix-parse-future-test.patch, rust-wl-clipboard-rs-newer-wl.patch, streamlink-update-test.patch. --- gnu/local.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/local.mk b/gnu/local.mk index adb7507d7a..c3e313aa7e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1082,6 +1082,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-boot-2.95.3.patch \ %D%/packages/patches/gcc-boot-4.6.4.patch \ %D%/packages/patches/gcc-cross-environment-variables.patch \ + %D%/packages/patches/gcc-cross-gxx-include-dir.patch \ %D%/packages/patches/gcc-fix-texi2pod.patch \ %D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \ %D%/packages/patches/gcc-4.9-libsanitizer-fix.patch \ @@ -1114,6 +1115,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-8-strmov-store-file-names.patch \ %D%/packages/patches/gcc-9-asan-fix-limits-include.patch \ %D%/packages/patches/gcc-9-strmov-store-file-names.patch \ + %D%/packages/patches/gcc-10-cross-environment-variables.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-brect-bounds.patch \ %D%/packages/patches/gd-Revert-fix-303-gdlib.pc.patch \ @@ -1180,6 +1182,7 @@ dist_patch_DATA = \ %D%/packages/patches/gnome-online-miners-tracker-3.patch \ %D%/packages/patches/gnome-screenshot-meson-0.60.patch \ %D%/packages/patches/gnome-settings-daemon-gc.patch \ + %D%/packages/patches/gnome-session-support-elogind.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnupg-1-build-with-gcc10.patch \ @@ -1263,6 +1266,7 @@ dist_patch_DATA = \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icecat-use-system-media-libs.patch \ %D%/packages/patches/icedtea-6-extend-hotspot-aarch64-support.patch \ + %D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch\ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/id3lib-UTF16-writing-bug.patch \ %D%/packages/patches/idris-disable-test.patch \ @@ -1315,6 +1319,7 @@ dist_patch_DATA = \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ %D%/packages/patches/librime-fix-build-with-gcc10.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \ + %D%/packages/patches/libvirt-create-machine-cgroup.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \ @@ -1548,6 +1553,7 @@ dist_patch_DATA = \ %D%/packages/patches/opencv-rgbd-aarch64-test-fix.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ + %D%/packages/patches/openjdk-14-builtins.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ %D%/packages/patches/openssh-hurd.patch \ %D%/packages/patches/openresolv-restartcmd-guix.patch \ @@ -1659,6 +1665,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \ %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ + %D%/packages/patches/python-babel-fix-parse-future-test.patch \ %D%/packages/patches/python-cross-compile.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ @@ -1760,6 +1767,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-nettle-sys-disable-vendor.patch \ %D%/packages/patches/rust-openssl-sys-no-vendor.patch \ %D%/packages/patches/rust-shell2batch-lint-fix.patch \ + %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \ %D%/packages/patches/sbc-fix-build-non-x86.patch \ %D%/packages/patches/sbcl-aserve-add-HTML-5-elements.patch \ %D%/packages/patches/sbcl-aserve-fix-rfe12668.patch \ @@ -1796,6 +1804,7 @@ dist_patch_DATA = \ %D%/packages/patches/spice-vdagent-glib-2.68.patch \ %D%/packages/patches/sssd-fix-samba.patch \ %D%/packages/patches/sssd-system-directories.patch \ + %D%/packages/patches/streamlink-update-test.patch \ %D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/suitesparse-mongoose-cmake.patch \ %D%/packages/patches/superlu-dist-awpm-grid.patch \