diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-10-10 21:10:03 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-14 11:48:45 +0100 |
commit | 01af095ce2b0f00a75e2951184901e0b9094d6a8 (patch) | |
tree | caa36ba91e0243dc5edf3f1a826d02d8921b5268 /meta/recipes-gnome/gnome/adwaita-icon-theme | |
parent | 4b2fa040eb2414ace66feedac92c2b05a68e1143 (diff) | |
download | poky-01af095ce2b0f00a75e2951184901e0b9094d6a8.tar.gz |
adwaita-icon-theme: update 3.34/38 -> 41.0
The original reason to pin the version (outdated librsvg)
no longer applies.
(From OE-Core rev: 354207b58e8511e0bf72f046142a1e150319fa74)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gnome/adwaita-icon-theme')
3 files changed, 14 insertions, 43 deletions
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST-3.34.3.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST-3.34.3.patch deleted file mode 100644 index 4ed5e151ee..0000000000 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST-3.34.3.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 8b3b153b6b95662316528ef083365b46cf5f7841 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Tue, 30 May 2017 14:55:49 +0300 | ||
4 | Subject: [PATCH] Don't use AC_CANONICAL_HOST | ||
5 | |||
6 | This won't work when building allarch (and is only used to find out if | ||
7 | target is windows). | ||
8 | |||
9 | Upstream-Status: Inappropriate [embedded specific] | ||
10 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
11 | |||
12 | --- | ||
13 | configure.ac | 1 - | ||
14 | 1 file changed, 1 deletion(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 449865d..888649e 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -3,7 +3,6 @@ AC_PREREQ(2.53) | ||
21 | |||
22 | AC_INIT([adwaita-icon-theme], [3.34.3], | ||
23 | [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme]) | ||
24 | -AC_CANONICAL_HOST | ||
25 | AC_CONFIG_MACRO_DIR([m4]) | ||
26 | AC_CONFIG_SRCDIR([index.theme.in]) | ||
27 | |||
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 c8c70c4b58..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 @@ | |||
1 | From 8b3b153b6b95662316528ef083365b46cf5f7841 Mon Sep 17 00:00:00 2001 | 1 | From 63d97fefdbc90f5c68f67bdc30844776d9a1b720 Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Tue, 30 May 2017 14:55:49 +0300 | 3 | Date: Tue, 30 May 2017 14:55:49 +0300 |
4 | Subject: [PATCH] Don't use AC_CANONICAL_HOST | 4 | Subject: [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 | ||
16 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
17 | index 449865d..888649e 100644 | 17 | index 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], [3.38.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 index c4d7e2583b..54e3e5ee85 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8dcd73b45a660dbdc560676835ba46f495334f14 Mon Sep 17 00:00:00 2001 | 1 | From 79da031e9811f3eef34b14cce419be93fea34319 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 13 Jun 2017 18:10:06 +0300 | 3 | Date: Tue, 13 Jun 2017 18:10:06 +0300 |
4 | Subject: [PATCH] Run installation commands as shell jobs | 4 | Subject: [PATCH] Run installation commands as shell jobs |
@@ -7,14 +7,15 @@ This greatly speeds up installation time on multi-core systems. | |||
7 | 7 | ||
8 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
10 | |||
10 | --- | 11 | --- |
11 | src/fullcolor/Makefile.am | 3 ++- | 12 | src/fullcolor/Makefile.am | 5 +++-- |
12 | src/spinner/Makefile.am | 5 +++-- | 13 | src/spinner/Makefile.am | 7 ++++--- |
13 | src/symbolic/Makefile.am | 7 ++++--- | 14 | src/symbolic/Makefile.am | 11 ++++++----- |
14 | 3 files changed, 9 insertions(+), 6 deletions(-) | 15 | 3 files changed, 13 insertions(+), 10 deletions(-) |
15 | 16 | ||
16 | diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am | 17 | diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am |
17 | index 1c940a5..3998ee6 100644 | 18 | index d73529b..b7d0808 100644 |
18 | --- a/src/fullcolor/Makefile.am | 19 | --- a/src/fullcolor/Makefile.am |
19 | +++ b/src/fullcolor/Makefile.am | 20 | +++ b/src/fullcolor/Makefile.am |
20 | @@ -9,9 +9,10 @@ install-data-local: | 21 | @@ -9,9 +9,10 @@ install-data-local: |
@@ -31,7 +32,7 @@ index 1c940a5..3998ee6 100644 | |||
31 | ## FIXME we should add a way to remove links generated by icon mapping | 32 | ## FIXME we should add a way to remove links generated by icon mapping |
32 | uninstall-local: | 33 | uninstall-local: |
33 | diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am | 34 | diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am |
34 | index 86f4d7c..3fae8c1 100644 | 35 | index c14caf6..322dc0d 100644 |
35 | --- a/src/spinner/Makefile.am | 36 | --- a/src/spinner/Makefile.am |
36 | +++ b/src/spinner/Makefile.am | 37 | +++ b/src/spinner/Makefile.am |
37 | @@ -24,13 +24,14 @@ install-data-local: | 38 | @@ -24,13 +24,14 @@ install-data-local: |
@@ -45,18 +46,18 @@ index 86f4d7c..3fae8c1 100644 | |||
45 | context="`dirname $$file`"; \ | 46 | context="`dirname $$file`"; \ |
46 | $(mkdir_p) $(DESTDIR)$(themedir)/scalable-up-to-32/$$context; \ | 47 | $(mkdir_p) $(DESTDIR)$(themedir)/scalable-up-to-32/$$context; \ |
47 | - $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \ | 48 | - $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \ |
48 | + $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file & \ | ||
49 | - done | 49 | - done |
50 | + $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file & \ | ||
50 | + done; \ | 51 | + done; \ |
51 | + wait | 52 | + wait |
52 | 53 | ||
53 | uninstall-local: | 54 | uninstall-local: |
54 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \ | 55 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \ |
55 | diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am | 56 | diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am |
56 | index 24aac9b..61ba071 100644 | 57 | index 957c0ee..e1f8818 100644 |
57 | --- a/src/symbolic/Makefile.am | 58 | --- a/src/symbolic/Makefile.am |
58 | +++ b/src/symbolic/Makefile.am | 59 | +++ b/src/symbolic/Makefile.am |
59 | @@ -25,18 +25,19 @@ install-data-local: | 60 | @@ -34,18 +34,19 @@ install-data-local: |
60 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ | 61 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ |
61 | context="`dirname $$file`"; \ | 62 | context="`dirname $$file`"; \ |
62 | $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ | 63 | $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ |
@@ -81,6 +82,3 @@ index 24aac9b..61ba071 100644 | |||
81 | 82 | ||
82 | uninstall-local: | 83 | uninstall-local: |
83 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \ | 84 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \ |
84 | -- | ||
85 | 2.11.0 | ||
86 | |||