summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/default-versions.inc2
-rw-r--r--meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST-3.34.3.patch27
-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.patch24
-rw-r--r--meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb43
-rw-r--r--meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb (renamed from meta/recipes-gnome/gnome/adwaita-icon-theme_3.38.0.bb)7
6 files changed, 17 insertions, 92 deletions
diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index 5e6fd8a..a88b65a 100644
--- a/meta/conf/distro/include/default-versions.inc
+++ b/meta/conf/distro/include/default-versions.inc
@@ -1,5 +1,3 @@
1# 1#
2# Default preferred versions 2# Default preferred versions
3# 3#
4
5PREFERRED_VERSION_adwaita-icon-theme ?= "3.34.3"
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 4ed5e15..0000000
--- 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 @@
1From 8b3b153b6b95662316528ef083365b46cf5f7841 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 30 May 2017 14:55:49 +0300
4Subject: [PATCH] Don't use AC_CANONICAL_HOST
5
6This won't work when building allarch (and is only used to find out if
7target is windows).
8
9Upstream-Status: Inappropriate [embedded specific]
10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
11
12---
13 configure.ac | 1 -
14 1 file changed, 1 deletion(-)
15
16diff --git a/configure.ac b/configure.ac
17index 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 c8c70c4..5afba3c 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 8b3b153b6b95662316528ef083365b46cf5f7841 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 449865d..888649e 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], [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 c4d7e25..54e3e5e 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 @@
1From 8dcd73b45a660dbdc560676835ba46f495334f14 Mon Sep 17 00:00:00 2001 1From 79da031e9811f3eef34b14cce419be93fea34319 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 13 Jun 2017 18:10:06 +0300 3Date: Tue, 13 Jun 2017 18:10:06 +0300
4Subject: [PATCH] Run installation commands as shell jobs 4Subject: [PATCH] Run installation commands as shell jobs
@@ -7,14 +7,15 @@ This greatly speeds up installation time on multi-core systems.
7 7
8Upstream-Status: Pending 8Upstream-Status: Pending
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 9Signed-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
16diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am 17diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am
17index 1c940a5..3998ee6 100644 18index 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:
33diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am 34diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am
34index 86f4d7c..3fae8c1 100644 35index 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 \
55diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am 56diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am
56index 24aac9b..61ba071 100644 57index 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--
852.11.0
86
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb
deleted file mode 100644
index f98f20c..0000000
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.34.3.bb
+++ /dev/null
@@ -1,43 +0,0 @@
1SUMMARY = "GTK+ icon theme"
2HOMEPAGE = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
3BUGTRACKER = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/issues"
4SECTION = "x11/gnome"
5
6LICENSE = "LGPL-3.0 | CC-BY-SA-3.0"
7LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \
8 file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \
9 file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02"
10
11inherit allarch autotools pkgconfig gettext gtk-icon-cache
12
13MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
14SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
15 file://0001-Don-t-use-AC_CANONICAL_HOST-3.34.3.patch \
16 file://0001-Run-installation-commands-as-shell-jobs.patch \
17 "
18
19SRC_URI[md5sum] = "9aea4ad9bc002aacad155ee0748b357f"
20SRC_URI[sha256sum] = "e7c2d8c259125d5f35ec09522b88c8fe7ecf625224ab0811213ef0a95d90b908"
21
22DEPENDS += "librsvg-native"
23
24PACKAGES = "${PN}-cursors ${PN}-symbolic-hires ${PN}-symbolic ${PN}-hires ${PN}"
25
26RREPLACES:${PN} = "gnome-icon-theme"
27RCONFLICTS:${PN} = "gnome-icon-theme"
28RPROVIDES:${PN} = "gnome-icon-theme"
29
30FILES:${PN}-cursors = "${prefix}/share/icons/Adwaita/cursors/"
31FILES:${PN}-symbolic-hires = "${prefix}/share/icons/Adwaita/96x96/*/*.symbolic.png \
32 ${prefix}/share/icons/Adwaita/64x64/*/*.symbolic.png \
33 ${prefix}/share/icons/Adwaita/48x48/*/*.symbolic.png \
34 ${prefix}/share/icons/Adwaita/32x32/*/*.symbolic.png"
35FILES:${PN}-symbolic = "${prefix}/share/icons/Adwaita/16x16/*/*.symbolic.png \
36 ${prefix}/share/icons/Adwaita/24x24/*/*.symbolic.png \
37 ${prefix}/share/icons/Adwaita/scalable/*/*-symbolic*.svg"
38FILES:${PN}-hires = "${prefix}/share/icons/Adwaita/256x256/ \
39 ${prefix}/share/icons/Adwaita/512x512/"
40FILES:${PN} = "${prefix}/share/icons/Adwaita/ \
41 ${prefix}/share/pkgconfig/adwaita-icon-theme.pc"
42
43BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.38.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb
index f9e52ca..2b21e1b 100644
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.38.0.bb
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb
@@ -10,15 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \
10 file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \ 10 file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \
11 file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02" 11 file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02"
12 12
13inherit allarch autotools pkgconfig gettext gtk-icon-cache 13inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase
14 14
15MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" 15SRC_URI += " \
16SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
17 file://0001-Don-t-use-AC_CANONICAL_HOST.patch \ 16 file://0001-Don-t-use-AC_CANONICAL_HOST.patch \
18 file://0001-Run-installation-commands-as-shell-jobs.patch \ 17 file://0001-Run-installation-commands-as-shell-jobs.patch \
19 " 18 "
20 19
21SRC_URI[sha256sum] = "6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97" 20SRC_URI[archive.sha256sum] = "ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba"
22 21
23DEPENDS += "librsvg-native" 22DEPENDS += "librsvg-native"
24 23