From patchwork Wed May 18 10:57:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 8172 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5C79C433FE for ; Wed, 18 May 2022 10:58:55 +0000 (UTC) Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by mx.groups.io with SMTP id smtpd.web09.3574.1652871531400334727 for ; Wed, 18 May 2022 03:58:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VLl+rrne; spf=pass (domain: gmail.com, ip: 209.85.218.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f46.google.com with SMTP id m20so3005604ejj.10 for ; Wed, 18 May 2022 03:58:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9OH4Y24qtv8AZjVzixNzSiwCoJkKPpzastnvATKuTbQ=; b=VLl+rrnenm2mUNgrOcSYFtcMjWu3brGocJeqDtB4Zl4sg1l/dJobDbtpdBqZIa30Ci aVi8t5ZjeJZX0TaGaOYTV35s3rUePgxw1dvNKNJqjNt8s5Uq70rSgKreO1a2smlIgty+ 1VOUnh2604SAvw7FJB1GQq+U3W2voF26EEWn8huElztQ3Op3ylEVdbh2coFXHmO7MrOw tlObr9g8+BMwXTAKDhclqqQNYMU+gq+C4GhJ99Ddn3m31SKmnXLsOBPpfWP/Q4exj+Bp ZCnWWvlK/eMaCT8xTQPcjIf6SxMb3+H+Iq8qfPBPIqFOqLGhni5lYhCe02Cn1QJJzpBu 89ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9OH4Y24qtv8AZjVzixNzSiwCoJkKPpzastnvATKuTbQ=; b=WJwM8E4vBiZNj2ohJTZXtiqEauJO8BUvcxhss9Bcym2S7qm/0tdOk8nKDP5SevAOkE bUJGczUX6AIfOIM8VsPoiT82mz1iXEXv+SO/jE9hh7vEHPT0e8FhNCrE0e0tF5c11Y1H S/YPeQE5U09dUzEYTg6c/Dgg0mq9wHovsO67yvW3RlGoLLk0ZQl00JcCqRURiEI6WwPG mRMcsNzbNGr7Kg3qnlKUIQtUY8pH/A7/MDcZEkwi8vgOdVT6yTk1/ta6lDMXRCsaAvRQ 5eC9qTvCyJxFNh5GFZFrsB2bFekfOU2sDLYF/Ut/wungMqSm+UjMwh+2UPKnysqHa3Ud AWgQ== X-Gm-Message-State: AOAM530+gLbQoVAgL8SYdX/KB1XNIzhfF0BRGGoPkoWzBZL5SzpELGdz MhbrAOmFlC/866Uy3vbf3+4dtppgWxE= X-Google-Smtp-Source: ABdhPJwbSCfSbAjD59qcXO8D+GSA1mPA8vPkehsV6qV2JzZQ0GSQxZGE1qxR4O/siwX4EWWW0tME8A== X-Received: by 2002:a17:907:d91:b0:6f4:c817:d492 with SMTP id go17-20020a1709070d9100b006f4c817d492mr24527079ejc.407.1652871530000; Wed, 18 May 2022 03:58:50 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id qs24-20020a170906459800b006f3ef214da9sm861524ejc.15.2022.05.18.03.58.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 May 2022 03:58:49 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 02/49] adwaita-icon-theme: upgrade 41.0 -> 42.0 Date: Wed, 18 May 2022 12:57:56 +0200 Message-Id: <20220518105843.3299331-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220518105843.3299331-1-alex@linutronix.de> References: <20220518105843.3299331-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 18 May 2022 10:58:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165799 Signed-off-by: Alexander Kanavin --- .../0001-Don-t-use-AC_CANONICAL_HOST.patch | 6 +- ...-installation-commands-as-shell-jobs.patch | 84 ------------------- ...eme_41.0.bb => adwaita-icon-theme_42.0.bb} | 7 +- 3 files changed, 5 insertions(+), 92 deletions(-) delete mode 100644 meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch rename meta/recipes-gnome/gnome/{adwaita-icon-theme_41.0.bb => adwaita-icon-theme_42.0.bb} (87%) diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch index 5afba3c644..56fd3daead 100644 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch @@ -1,4 +1,4 @@ -From 63d97fefdbc90f5c68f67bdc30844776d9a1b720 Mon Sep 17 00:00:00 2001 +From 985eda68d3303112791cf6858f6fef1a99288e8a Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 30 May 2017 14:55:49 +0300 Subject: [PATCH] Don't use AC_CANONICAL_HOST @@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac -index f2659a5..1e8b016 100644 +index 040975e..5f7b53a 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,6 @@ AC_PREREQ(2.53) - AC_INIT([adwaita-icon-theme], [41.0], + AC_INIT([adwaita-icon-theme], [42.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme]) -AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch deleted file mode 100644 index a1d39cf558..0000000000 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 79da031e9811f3eef34b14cce419be93fea34319 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 13 Jun 2017 18:10:06 +0300 -Subject: [PATCH] Run installation commands as shell jobs - -This greatly speeds up installation time on multi-core systems. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/merge_requests/39] -Signed-off-by: Alexander Kanavin - ---- - src/fullcolor/Makefile.am | 5 +++-- - src/spinner/Makefile.am | 7 ++++--- - src/symbolic/Makefile.am | 11 ++++++----- - 3 files changed, 13 insertions(+), 10 deletions(-) - -diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am -index d73529b..b7d0808 100644 ---- a/src/fullcolor/Makefile.am -+++ b/src/fullcolor/Makefile.am -@@ -9,9 +9,10 @@ install-data-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.png"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ - done; \ -- done; -+ done; \ -+ wait - - ## FIXME we should add a way to remove links generated by icon mapping - uninstall-local: -diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am -index c14caf6..322dc0d 100644 ---- a/src/spinner/Makefile.am -+++ b/src/spinner/Makefile.am -@@ -24,13 +24,14 @@ install-data-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ - done; \ - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/scalable-up-to-32/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \ -- done -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file & \ -+ done; \ -+ wait - - uninstall-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \ -diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am -index 957c0ee..e1f8818 100644 ---- a/src/symbolic/Makefile.am -+++ b/src/symbolic/Makefile.am -@@ -34,18 +34,19 @@ install-data-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ - done; \ -- done -+ done; \ - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/scalable/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file; \ -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file & \ - for size in $(symbolic_encode_sizes); do \ - $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ -- $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context; \ -+ $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context & \ - done \ -- done -+ done; \ -+ wait - - uninstall-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \ diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb similarity index 87% rename from meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb rename to meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb index 46f9f4772c..c4f3b1c999 100644 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb @@ -12,12 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase -SRC_URI += " \ - file://0001-Don-t-use-AC_CANONICAL_HOST.patch \ - file://0001-Run-installation-commands-as-shell-jobs.patch \ - " +SRC_URI += " file://0001-Don-t-use-AC_CANONICAL_HOST.patch" -SRC_URI[archive.sha256sum] = "ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba" +SRC_URI[archive.sha256sum] = "5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0" DEPENDS += "librsvg-native"