diff options
Diffstat (limited to 'meta/recipes-gnome/gnome')
5 files changed, 38 insertions, 163 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 deleted file mode 100644 index c8c70c4b58..0000000000 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.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.38.0], | ||
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-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 c4d7e2583b..0000000000 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch +++ /dev/null | |||
@@ -1,86 +0,0 @@ | |||
1 | From 8dcd73b45a660dbdc560676835ba46f495334f14 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 13 Jun 2017 18:10:06 +0300 | ||
4 | Subject: [PATCH] Run installation commands as shell jobs | ||
5 | |||
6 | This greatly speeds up installation time on multi-core systems. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
10 | --- | ||
11 | src/fullcolor/Makefile.am | 3 ++- | ||
12 | src/spinner/Makefile.am | 5 +++-- | ||
13 | src/symbolic/Makefile.am | 7 ++++--- | ||
14 | 3 files changed, 9 insertions(+), 6 deletions(-) | ||
15 | |||
16 | diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am | ||
17 | index 1c940a5..3998ee6 100644 | ||
18 | --- a/src/fullcolor/Makefile.am | ||
19 | +++ b/src/fullcolor/Makefile.am | ||
20 | @@ -9,9 +9,10 @@ install-data-local: | ||
21 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.png"`; do \ | ||
22 | context="`dirname $$file`"; \ | ||
23 | $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ | ||
24 | - $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ | ||
25 | + $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ | ||
26 | done; \ | ||
27 | - done; | ||
28 | + done; \ | ||
29 | + wait | ||
30 | |||
31 | ## FIXME we should add a way to remove links generated by icon mapping | ||
32 | uninstall-local: | ||
33 | diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am | ||
34 | index 86f4d7c..3fae8c1 100644 | ||
35 | --- a/src/spinner/Makefile.am | ||
36 | +++ b/src/spinner/Makefile.am | ||
37 | @@ -24,13 +24,14 @@ install-data-local: | ||
38 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ | ||
39 | context="`dirname $$file`"; \ | ||
40 | $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ | ||
41 | - $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ | ||
42 | + $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ | ||
43 | done; \ | ||
44 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \ | ||
45 | context="`dirname $$file`"; \ | ||
46 | $(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 & \ | ||
49 | - done | ||
50 | + done; \ | ||
51 | + wait | ||
52 | |||
53 | uninstall-local: | ||
54 | 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 | index 24aac9b..61ba071 100644 | ||
57 | --- a/src/symbolic/Makefile.am | ||
58 | +++ b/src/symbolic/Makefile.am | ||
59 | @@ -25,18 +25,19 @@ install-data-local: | ||
60 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ | ||
61 | context="`dirname $$file`"; \ | ||
62 | $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ | ||
63 | - $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ | ||
64 | + $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ | ||
65 | done; \ | ||
66 | - done | ||
67 | + done; \ | ||
68 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \ | ||
69 | context="`dirname $$file`"; \ | ||
70 | $(mkdir_p) $(DESTDIR)$(themedir)/scalable/$$context; \ | ||
71 | - $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file; \ | ||
72 | + $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file & \ | ||
73 | for size in $(symbolic_encode_sizes); do \ | ||
74 | $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ | ||
75 | - $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context; \ | ||
76 | + $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context & \ | ||
77 | done \ | ||
78 | - done | ||
79 | + done; \ | ||
80 | + wait | ||
81 | |||
82 | uninstall-local: | ||
83 | for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \ | ||
84 | -- | ||
85 | 2.11.0 | ||
86 | |||
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.38.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.38.0.bb deleted file mode 100644 index ff557978dc..0000000000 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.38.0.bb +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | SUMMARY = "GTK+ icon theme" | ||
2 | HOMEPAGE = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme" | ||
3 | BUGTRACKER = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/issues" | ||
4 | SECTION = "x11/gnome" | ||
5 | |||
6 | LICENSE = "LGPL-3.0 | CC-BY-SA-3.0" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ | ||
8 | file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \ | ||
9 | file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02" | ||
10 | |||
11 | inherit allarch autotools pkgconfig gettext gtk-icon-cache upstream-version-is-even | ||
12 | |||
13 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | ||
14 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ | ||
15 | file://0001-Don-t-use-AC_CANONICAL_HOST.patch \ | ||
16 | file://0001-Run-installation-commands-as-shell-jobs.patch \ | ||
17 | " | ||
18 | |||
19 | SRC_URI[sha256sum] = "6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97" | ||
20 | |||
21 | DEPENDS += "librsvg-native" | ||
22 | |||
23 | PACKAGES = "${PN}-cursors ${PN}-symbolic-hires ${PN}-symbolic ${PN}-hires ${PN}" | ||
24 | |||
25 | RREPLACES_${PN} = "gnome-icon-theme" | ||
26 | RCONFLICTS_${PN} = "gnome-icon-theme" | ||
27 | RPROVIDES_${PN} = "gnome-icon-theme" | ||
28 | |||
29 | FILES_${PN}-cursors = "${prefix}/share/icons/Adwaita/cursors/" | ||
30 | FILES_${PN}-symbolic-hires = "${prefix}/share/icons/Adwaita/96x96/*/*.symbolic.png \ | ||
31 | ${prefix}/share/icons/Adwaita/64x64/*/*.symbolic.png \ | ||
32 | ${prefix}/share/icons/Adwaita/48x48/*/*.symbolic.png \ | ||
33 | ${prefix}/share/icons/Adwaita/32x32/*/*.symbolic.png" | ||
34 | FILES_${PN}-symbolic = "${prefix}/share/icons/Adwaita/16x16/*/*.symbolic.png \ | ||
35 | ${prefix}/share/icons/Adwaita/24x24/*/*.symbolic.png \ | ||
36 | ${prefix}/share/icons/Adwaita/scalable/*/*-symbolic*.svg" | ||
37 | FILES_${PN}-hires = "${prefix}/share/icons/Adwaita/256x256/ \ | ||
38 | ${prefix}/share/icons/Adwaita/512x512/" | ||
39 | FILES_${PN} = "${prefix}/share/icons/Adwaita/ \ | ||
40 | ${prefix}/share/pkgconfig/adwaita-icon-theme.pc" | ||
41 | |||
42 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_46.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_46.0.bb new file mode 100644 index 0000000000..2f3e4e7b85 --- /dev/null +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_46.0.bb | |||
@@ -0,0 +1,29 @@ | |||
1 | SUMMARY = "GTK+ icon theme" | ||
2 | DESCRIPTION = "The Adwaita icon theme is the default icon theme of the GNOME desktop \ | ||
3 | This package package contains an icon theme for Gtk+ 3 applications." | ||
4 | HOMEPAGE = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme" | ||
5 | BUGTRACKER = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/issues" | ||
6 | SECTION = "x11/gnome" | ||
7 | |||
8 | LICENSE = "LGPL-3.0-only | CC-BY-SA-3.0" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ | ||
10 | file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \ | ||
11 | file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02" | ||
12 | |||
13 | inherit gnomebase allarch gtk-icon-cache | ||
14 | |||
15 | SRC_URI[archive.sha256sum] = "4bcb539bd75d64da385d6fa08cbaa9ddeaceb6ac8e82b85ba6c41117bf5ba64e" | ||
16 | |||
17 | DEPENDS += "librsvg-native" | ||
18 | |||
19 | PACKAGES =+ "${PN}-cursors ${PN}-symbolic" | ||
20 | |||
21 | RREPLACES:${PN} = "gnome-icon-theme" | ||
22 | RCONFLICTS:${PN} = "gnome-icon-theme" | ||
23 | RPROVIDES:${PN} = "gnome-icon-theme" | ||
24 | |||
25 | FILES:${PN}-cursors = "${datadir}/icons/Adwaita/cursors/" | ||
26 | FILES:${PN}-symbolic = "${datadir}/icons/Adwaita/symbolic*/" | ||
27 | FILES:${PN}-doc += "${datadir}/licenses/adwaita-icon-theme" | ||
28 | |||
29 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.6.bb b/meta/recipes-gnome/gnome/gconf_3.2.6.bb index ade93644ec..1e29bd9bb0 100644 --- a/meta/recipes-gnome/gnome/gconf_3.2.6.bb +++ b/meta/recipes-gnome/gnome/gconf_3.2.6.bb | |||
@@ -4,11 +4,12 @@ It is intended for user preferences; not configuration of something like \ | |||
4 | Apache, or arbitrary data storage." | 4 | Apache, or arbitrary data storage." |
5 | SECTION = "x11/gnome" | 5 | SECTION = "x11/gnome" |
6 | HOMEPAGE = "https://gitlab.gnome.org/Archive/gconf" | 6 | HOMEPAGE = "https://gitlab.gnome.org/Archive/gconf" |
7 | LICENSE = "LGPLv2+" | 7 | LICENSE = "LGPL-2.0-or-later" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" |
9 | 9 | ||
10 | DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native" | 10 | DEPENDS = "glib-2.0 glib-2.0-native dbus dbus-glib libxml2 intltool-native" |
11 | 11 | ||
12 | GNOMEBASEBUILDCLASS = "autotools" | ||
12 | inherit gnomebase gtk-doc gettext gobject-introspection gio-module-cache | 13 | inherit gnomebase gtk-doc gettext gobject-introspection gio-module-cache |
13 | 14 | ||
14 | SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \ | 15 | SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \ |
@@ -28,12 +29,12 @@ EXTRA_OECONF = "--enable-shared --disable-static \ | |||
28 | 29 | ||
29 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" | 30 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" |
30 | # We really don't want Polkit for native | 31 | # We really don't want Polkit for native |
31 | PACKAGECONFIG_class-native = "" | 32 | PACKAGECONFIG:class-native = "" |
32 | 33 | ||
33 | PACKAGECONFIG[polkit] = "--enable-defaults-service,--disable-defaults-service,polkit" | 34 | PACKAGECONFIG[polkit] = "--enable-defaults-service,--disable-defaults-service,polkit" |
34 | PACKAGECONFIG[debug] = "--enable-debug=yes, --enable-debug=minimum" | 35 | PACKAGECONFIG[debug] = "--enable-debug=yes, --enable-debug=minimum" |
35 | 36 | ||
36 | do_install_append() { | 37 | do_install:append() { |
37 | # this directory need to be created to avoid an Error 256 at gdm launch | 38 | # this directory need to be created to avoid an Error 256 at gdm launch |
38 | install -d ${D}${sysconfdir}/gconf/gconf.xml.system | 39 | install -d ${D}${sysconfdir}/gconf/gconf.xml.system |
39 | 40 | ||
@@ -42,19 +43,19 @@ do_install_append() { | |||
42 | rm -f ${D}${libdir}/gio/*/*.*a | 43 | rm -f ${D}${libdir}/gio/*/*.*a |
43 | } | 44 | } |
44 | 45 | ||
45 | do_install_append_class-native() { | 46 | do_install:append:class-native() { |
46 | create_wrapper ${D}/${bindir}/gconftool-2 \ | 47 | create_wrapper ${D}/${bindir}/gconftool-2 \ |
47 | GCONF_BACKEND_DIR=${STAGING_LIBDIR_NATIVE}/GConf/2 | 48 | GCONF_BACKEND_DIR=${STAGING_LIBDIR_NATIVE}/GConf/2 |
48 | } | 49 | } |
49 | 50 | ||
50 | FILES_${PN} += "${libdir}/GConf/* \ | 51 | FILES:${PN} += "${libdir}/GConf/* \ |
51 | ${libdir}/gio/*/*.so \ | 52 | ${libdir}/gio/*/*.so \ |
52 | ${datadir}/polkit* \ | 53 | ${datadir}/polkit* \ |
53 | ${datadir}/dbus-1/services/*.service \ | 54 | ${datadir}/dbus-1/services/*.service \ |
54 | ${datadir}/dbus-1/system-services/*.service \ | 55 | ${datadir}/dbus-1/system-services/*.service \ |
55 | " | 56 | " |
56 | RDEPENDS_${PN} = "python3-xml" | 57 | RDEPENDS:${PN} = "python3-xml" |
57 | 58 | ||
58 | FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd" | 59 | FILES:${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd" |
59 | 60 | ||
60 | BBCLASSEXTEND = "native" | 61 | BBCLASSEXTEND = "native" |