summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gnome
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome/gnome')
-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
-rw-r--r--meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb (renamed from meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb)7
3 files changed, 5 insertions, 92 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 5afba3c644..32f98e049b 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 63d97fefdbc90f5c68f67bdc30844776d9a1b720 Mon Sep 17 00:00:00 2001 1From 15ffd817b3e334dc7c0508761c7ef417d76379c5 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 f2659a5..1e8b016 100644 17index 040975e..5f7b53a 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], [41.0], 22 AC_INIT([adwaita-icon-theme], [42.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
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 @@
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 \
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb b/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 \
12 12
13inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase 13inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase
14 14
15SRC_URI += " \ 15SRC_URI += " file://0001-Don-t-use-AC_CANONICAL_HOST.patch"
16 file://0001-Don-t-use-AC_CANONICAL_HOST.patch \
17 file://0001-Run-installation-commands-as-shell-jobs.patch \
18 "
19 16
20SRC_URI[archive.sha256sum] = "ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba" 17SRC_URI[archive.sha256sum] = "5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0"
21 18
22DEPENDS += "librsvg-native" 19DEPENDS += "librsvg-native"
23 20