summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gnome/adwaita-icon-theme
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-13 13:46:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-13 16:52:24 +0100
commit5c63147e31f3d320ba38c4479bc5c0c74722ce1c (patch)
treebcb9a439e7a446cbae2c76ace2fd2736809298dd /meta/recipes-gnome/gnome/adwaita-icon-theme
parentc362c7feef27db0ba4307d6a43987ecca2dab81c (diff)
downloadpoky-5c63147e31f3d320ba38c4479bc5c0c74722ce1c.tar.gz
Revert "adwaita-icon-theme: upgrade 41.0 -> 42.0"
This reverts commit 131b143b6ea37963a0380975718cbf8420e5b87f. Upstream dropped many 'legacy' low res bitmap icons and also plans to phase out 'generic app' icons in the svg format, saying that all apps must carry their own icons. This breaks the icons displayed in sato so revert for now until we have a plan to mitigate that. [YOCTO #14782] (From OE-Core rev: 04603905991ba7e703b07abc16c8a689d94be95d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gnome/adwaita-icon-theme')
-rw-r--r--meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch6
-rw-r--r--meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch84
2 files changed, 87 insertions, 3 deletions
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 32f98e049b..5afba3c644 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 @@
1From 15ffd817b3e334dc7c0508761c7ef417d76379c5 Mon Sep 17 00:00:00 2001 1From 63d97fefdbc90f5c68f67bdc30844776d9a1b720 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 30 May 2017 14:55:49 +0300 3Date: Tue, 30 May 2017 14:55:49 +0300
4Subject: [PATCH] Don't use AC_CANONICAL_HOST 4Subject: [PATCH] Don't use AC_CANONICAL_HOST
@@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
14 1 file changed, 1 deletion(-) 14 1 file changed, 1 deletion(-)
15 15
16diff --git a/configure.ac b/configure.ac 16diff --git a/configure.ac b/configure.ac
17index 040975e..5f7b53a 100644 17index f2659a5..1e8b016 100644
18--- a/configure.ac 18--- a/configure.ac
19+++ b/configure.ac 19+++ b/configure.ac
20@@ -3,7 +3,6 @@ AC_PREREQ(2.53) 20@@ -3,7 +3,6 @@ AC_PREREQ(2.53)
21 21
22 AC_INIT([adwaita-icon-theme], [42.0], 22 AC_INIT([adwaita-icon-theme], [41.0],
23 [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme]) 23 [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme])
24-AC_CANONICAL_HOST 24-AC_CANONICAL_HOST
25 AC_CONFIG_MACRO_DIR([m4]) 25 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
new file mode 100644
index 0000000000..a1d39cf558
--- /dev/null
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
@@ -0,0 +1,84 @@
1From 79da031e9811f3eef34b14cce419be93fea34319 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 13 Jun 2017 18:10:06 +0300
4Subject: [PATCH] Run installation commands as shell jobs
5
6This greatly speeds up installation time on multi-core systems.
7
8Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/merge_requests/39]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10
11---
12 src/fullcolor/Makefile.am | 5 +++--
13 src/spinner/Makefile.am | 7 ++++---
14 src/symbolic/Makefile.am | 11 ++++++-----
15 3 files changed, 13 insertions(+), 10 deletions(-)
16
17diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am
18index d73529b..b7d0808 100644
19--- a/src/fullcolor/Makefile.am
20+++ b/src/fullcolor/Makefile.am
21@@ -9,9 +9,10 @@ install-data-local:
22 for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.png"`; do \
23 context="`dirname $$file`"; \
24 $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
25- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
26+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
27 done; \
28- done;
29+ done; \
30+ wait
31
32 ## FIXME we should add a way to remove links generated by icon mapping
33 uninstall-local:
34diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am
35index c14caf6..322dc0d 100644
36--- a/src/spinner/Makefile.am
37+++ b/src/spinner/Makefile.am
38@@ -24,13 +24,14 @@ install-data-local:
39 for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \
40 context="`dirname $$file`"; \
41 $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
42- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
43+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
44 done; \
45 for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \
46 context="`dirname $$file`"; \
47 $(mkdir_p) $(DESTDIR)$(themedir)/scalable-up-to-32/$$context; \
48- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \
49- done
50+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file & \
51+ done; \
52+ wait
53
54 uninstall-local:
55 for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \
56diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am
57index 957c0ee..e1f8818 100644
58--- a/src/symbolic/Makefile.am
59+++ b/src/symbolic/Makefile.am
60@@ -34,18 +34,19 @@ install-data-local:
61 for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \
62 context="`dirname $$file`"; \
63 $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
64- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
65+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
66 done; \
67- done
68+ done; \
69 for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \
70 context="`dirname $$file`"; \
71 $(mkdir_p) $(DESTDIR)$(themedir)/scalable/$$context; \
72- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file; \
73+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file & \
74 for size in $(symbolic_encode_sizes); do \
75 $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
76- $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context; \
77+ $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context & \
78 done \
79- done
80+ done; \
81+ wait
82
83 uninstall-local:
84 for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \