diff options
Diffstat (limited to 'poky/meta/recipes-gnome')
| -rw-r--r-- | poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch | 6 | ||||
| -rw-r--r-- | poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch | 84 | ||||
| -rw-r--r-- | poky/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb (renamed from poky/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb) | 7 | ||||
| -rw-r--r-- | poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb | 3 | ||||
| -rw-r--r-- | poky/meta/recipes-gnome/librsvg/librsvg_2.54.4.bb (renamed from poky/meta/recipes-gnome/librsvg/librsvg_2.54.3.bb) | 2 |
5 files changed, 9 insertions, 93 deletions
diff --git a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch index 5afba3c644..56fd3daead 100644 --- a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch +++ b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch @@ -1,4 +1,4 @@ -From 63d97fefdbc90f5c68f67bdc30844776d9a1b720 Mon Sep 17 00:00:00 2001 +From 985eda68d3303112791cf6858f6fef1a99288e8a Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Tue, 30 May 2017 14:55:49 +0300 Subject: [PATCH] Don't use AC_CANONICAL_HOST @@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac -index f2659a5..1e8b016 100644 +index 040975e..5f7b53a 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,6 @@ AC_PREREQ(2.53) - AC_INIT([adwaita-icon-theme], [41.0], + AC_INIT([adwaita-icon-theme], [42.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme]) -AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) diff --git a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch deleted file mode 100644 index a1d39cf558..0000000000 --- a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 79da031e9811f3eef34b14cce419be93fea34319 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 13 Jun 2017 18:10:06 +0300 -Subject: [PATCH] Run installation commands as shell jobs - -This greatly speeds up installation time on multi-core systems. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/merge_requests/39] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - src/fullcolor/Makefile.am | 5 +++-- - src/spinner/Makefile.am | 7 ++++--- - src/symbolic/Makefile.am | 11 ++++++----- - 3 files changed, 13 insertions(+), 10 deletions(-) - -diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am -index d73529b..b7d0808 100644 ---- a/src/fullcolor/Makefile.am -+++ b/src/fullcolor/Makefile.am -@@ -9,9 +9,10 @@ install-data-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.png"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ - done; \ -- done; -+ done; \ -+ wait - - ## FIXME we should add a way to remove links generated by icon mapping - uninstall-local: -diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am -index c14caf6..322dc0d 100644 ---- a/src/spinner/Makefile.am -+++ b/src/spinner/Makefile.am -@@ -24,13 +24,14 @@ install-data-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ - done; \ - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/scalable-up-to-32/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \ -- done -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file & \ -+ done; \ -+ wait - - uninstall-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \ -diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am -index 957c0ee..e1f8818 100644 ---- a/src/symbolic/Makefile.am -+++ b/src/symbolic/Makefile.am -@@ -34,18 +34,19 @@ install-data-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ - done; \ -- done -+ done; \ - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/scalable/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file; \ -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file & \ - for size in $(symbolic_encode_sizes); do \ - $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ -- $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context; \ -+ $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context & \ - done \ -- done -+ done; \ -+ wait - - uninstall-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \ diff --git a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb index 46f9f4772c..c4f3b1c999 100644 --- a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb +++ b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb @@ -12,12 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase -SRC_URI += " \ - file://0001-Don-t-use-AC_CANONICAL_HOST.patch \ - file://0001-Run-installation-commands-as-shell-jobs.patch \ - " +SRC_URI += " file://0001-Don-t-use-AC_CANONICAL_HOST.patch" -SRC_URI[archive.sha256sum] = "ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba" +SRC_URI[archive.sha256sum] = "5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0" DEPENDS += "librsvg-native" diff --git a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb index 150d2c0b23..150eca9274 100644 --- a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb +++ b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb @@ -18,6 +18,8 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation", PACKAGECONFIG[working-scripts] = ",,libxslt-native xmlto-native python3-six python3-pygments" PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0" +CACHED_CONFIGUREVARS += "ac_cv_path_XSLTPROC=xsltproc" + SRC_URI[archive.sha256sum] = "cc1b709a20eb030a278a1f9842a362e00402b7f834ae1df4c1998a723152bf43" SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ @@ -43,6 +45,7 @@ do_install:append () { ${datadir}/gtk-doc/python/gtkdoc/config.py; do sed -e 's,${RECIPE_SYSROOT_NATIVE}/usr/bin/pkg-config,${bindir}/pkg-config,' \ -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \ + -e '1s|^#!.*|#!/usr/bin/env python3|' \ -i ${D}$fn done } diff --git a/poky/meta/recipes-gnome/librsvg/librsvg_2.54.3.bb b/poky/meta/recipes-gnome/librsvg/librsvg_2.54.4.bb index 3578898692..cc7fb9bbdf 100644 --- a/poky/meta/recipes-gnome/librsvg/librsvg_2.54.3.bb +++ b/poky/meta/recipes-gnome/librsvg/librsvg_2.54.4.bb @@ -20,7 +20,7 @@ SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.pat file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch \ " -SRC_URI[archive.sha256sum] = "66158f2ef46dde260026846c4da102e4a9dd4e5293010f30949c6cc26dd6efe8" +SRC_URI[archive.sha256sum] = "ea152a243f6a43c0e036a28c70de3fcbcdea5664c6811c78592bc229ecc24833" # librsvg is still autotools-based, but is calling cargo from its automake-driven makefiles # so we cannot use cargo class directly, but still need bits and pieces from it |