diff options
Diffstat (limited to 'poky/meta/recipes-gnome')
-rw-r--r-- | poky/meta/recipes-gnome/gcr/gcr_3.34.0.bb | 2 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb | 8 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb | 2 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch | 33 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb | 1 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb | 3 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/json-glib/json-glib/0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch | 33 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb | 4 | ||||
-rw-r--r-- | poky/meta/recipes-gnome/librsvg/librsvg_2.40.21.bb (renamed from poky/meta/recipes-gnome/librsvg/librsvg_2.40.20.bb) | 3 |
9 files changed, 78 insertions, 11 deletions
diff --git a/poky/meta/recipes-gnome/gcr/gcr_3.34.0.bb b/poky/meta/recipes-gnome/gcr/gcr_3.34.0.bb index 9853b3f416..39e87de5f0 100644 --- a/poky/meta/recipes-gnome/gcr/gcr_3.34.0.bb +++ b/poky/meta/recipes-gnome/gcr/gcr_3.34.0.bb @@ -8,7 +8,7 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/gcr/issues" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" -DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt \ +DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt gnupg-native \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}" inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg diff --git a/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb index d0df5015a5..0405fa78b5 100644 --- a/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb +++ b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb @@ -40,20 +40,20 @@ inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even GIR_MESON_OPTION = 'gir' -EXTRA_OEMESON_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dinstalled_tests=true', '-Dinstalled_tests=false', d)}" - LIBV = "2.10.0" GDK_PIXBUF_LOADERS ?= "png jpeg" -PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} ${GDK_PIXBUF_LOADERS}" +PACKAGECONFIG = "${GDK_PIXBUF_LOADERS} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}" PACKAGECONFIG[png] = "-Dpng=true,-Dpng=false,libpng" PACKAGECONFIG[jpeg] = "-Djpeg=true,-Djpeg=false,jpeg" PACKAGECONFIG[tiff] = "-Dtiff=true,-Dtiff=false,tiff" PACKAGECONFIG[jpeg2000] = "-Djasper=true,-Djasper=false,jasper" - +PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" PACKAGECONFIG[x11] = "-Dx11=true,-Dx11=false,virtual/libx11" PACKAGES =+ "${PN}-xlib" diff --git a/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb b/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb index b8466d4833..18818d527c 100644 --- a/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb +++ b/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb @@ -3,7 +3,7 @@ DESCRIPTION = "GConf is a system for storing application preferences. \ It is intended for user preferences; not configuration of something like \ Apache, or arbitrary data storage." SECTION = "x11/gnome" -HOMEPAGE = "https://projects.gnome.org/gconf/" +HOMEPAGE = "https://gitlab.gnome.org/Archive/gconf" LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch new file mode 100644 index 0000000000..adb357b5ec --- /dev/null +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch @@ -0,0 +1,33 @@ +From 56ba5656258b82dbc069ab3a61e597c931a16a83 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 17 Jun 2020 11:43:16 +0200 +Subject: [PATCH] gir: add a dependency for g-ir-compiler for building .girs + +meson inserts the dependency if the compiler is used directly, but +fails to do so if the compiler is run through a wrapper. This leads +to build race errors between building the compiler and using it. + +Fix provided by Quentin Schulz <quentin.schulz@streamunlimited.com> + +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/228] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + gir/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gir/meson.build b/gir/meson.build +index b37fdb81..557e5517 100644 +--- a/gir/meson.build ++++ b/gir/meson.build +@@ -448,7 +448,7 @@ foreach gir : gir_files + typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), + input: gir, + output: '@BASENAME@.typelib', +- depends: [gobject_gir, ], ++ depends: [gobject_gir, gircompiler, ], + command: gircompiler_command, + install: true, + install_dir: typelibdir, +-- +2.27.0 + diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb index b1371776af..92b0d1d52f 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb @@ -22,6 +22,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$ file://0001-Port-cross-compilation-support-to-meson.patch \ file://0001-meson.build-disable-tests-when-cross-compiling.patch \ file://0001-Fix-build-reproducibility.patch \ + file://0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch \ " SRC_URI[md5sum] = "37278eab3704e42234b6080b8cf241f1" diff --git a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb index b508e62741..fb5e69f401 100644 --- a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb +++ b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb @@ -1,7 +1,7 @@ SUMMARY = "Documentation generator for glib-based software" DESCRIPTION = "Gtk-doc is a set of scripts that extract specially formatted comments \ from glib-based software and produce a set of html documentation files from them" -HOMEPAGE = "http://www.gtk.org/gtk-doc/" +HOMEPAGE = "https://www.gtk.org/docs/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" @@ -59,4 +59,3 @@ gtkdoc_makefiles_sysroot_preprocess() { -e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \ ${SYSROOT_DESTDIR}${datadir}/gtk-doc/data/gtk-doc*make } - diff --git a/poky/meta/recipes-gnome/json-glib/json-glib/0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch b/poky/meta/recipes-gnome/json-glib/json-glib/0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch new file mode 100644 index 0000000000..2a834b674d --- /dev/null +++ b/poky/meta/recipes-gnome/json-glib/json-glib/0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch @@ -0,0 +1,33 @@ +From d60fcd5bd5c2675e4342775b910a2ea48ec0eccb Mon Sep 17 00:00:00 2001 +From: Dimitry Andric <dim@FreeBSD.org> +Date: Wed, 19 Aug 2020 03:35:16 +0000 +Subject: [PATCH] scanner: use macro instead of cast to convert pointer to integer + +Clang 11 build failed due to a new warning (part of -Werror=pointer-to-int-cast): +../json-glib/json-scanner.c:928:13: error: cast to smaller integer type 'GTokenType' from 'gpointer' (aka 'void *') [-Werror,-Wvoid-pointer-to-enum-cast] + *token_p = (GTokenType) value_p->v_symbol; + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/json-glib/-/commit/8c5fabe962b7337066dac7a697d23fce257a5d64] +Signed-off-by: Jan Beich <jbeich@FreeBSD.org> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + json-glib/json-scanner.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/json-glib/json-scanner.c b/json-glib/json-scanner.c +index 0c9919f..59dd29c 100644 +--- a/json-glib/json-scanner.c ++++ b/json-glib/json-scanner.c +@@ -925,7 +925,7 @@ json_scanner_get_token_i (JsonScanner *scanner, + + case G_TOKEN_SYMBOL: + if (scanner->config->symbol_2_token) +- *token_p = (GTokenType) value_p->v_symbol; ++ *token_p = GPOINTER_TO_INT (value_p->v_symbol); + break; + + case G_TOKEN_BINARY: +-- +2.28.0 + diff --git a/poky/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb b/poky/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb index 5143d73ed7..bbe284c01e 100644 --- a/poky/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb +++ b/poky/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb @@ -14,7 +14,9 @@ DEPENDS = "glib-2.0" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase lib_package gobject-introspection gtk-doc gettext ptest-gnome manpages -SRC_URI += "file://run-ptest" +SRC_URI += "file://run-ptest \ + file://0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch \ +" SRC_URI[archive.md5sum] = "4d4bb9837f6d31e32d0ce658ae135f68" SRC_URI[archive.sha256sum] = "720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47" diff --git a/poky/meta/recipes-gnome/librsvg/librsvg_2.40.20.bb b/poky/meta/recipes-gnome/librsvg/librsvg_2.40.21.bb index 6dd0533a5d..237aec6062 100644 --- a/poky/meta/recipes-gnome/librsvg/librsvg_2.40.20.bb +++ b/poky/meta/recipes-gnome/librsvg/librsvg_2.40.21.bb @@ -23,8 +23,7 @@ SRC_URI += "file://gtk-option.patch \ file://0001-Remove-non-reproducible-SRCDIR.patch \ " -SRC_URI[archive.md5sum] = "4949d313b0c5d9161a5c259104af5568" -SRC_URI[archive.sha256sum] = "cff4dd3c3b78bfe99d8fcfad3b8ba1eee3289a0823c0e118d78106be6b84c92b" +SRC_URI[archive.sha256sum] = "f7628905f1cada84e87e2b14883ed57d8094dca3281d5bcb24ece4279e9a92ba" CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" |