From 2b10adc0845a56b41bf64d0fe0b863fb5d269181 Mon Sep 17 00:00:00 2001 From: wangmy Date: Tue, 2 Nov 2021 11:35:10 +0800 Subject: glib-2.0: upgrade 2.70.0 -> 2.70.1 Fix network changes not being signalled from NetworkManager (work by Julian Andres Klode) (#2505) Fix build when building with --fatal-meson-warnings (work by Eli Schwartz) (!2304) Bugs fixed: 2245 gdesktopappinfo: Do not call xterm when it does not exist, inform the caller the launch failed 2253 Backport 2251 "GString: Bump minimum size" to glib-2-70 2256 Backport 2254 "Small optimization for g_object_set" to glib-2-70 2259 Backport 2257 "Fix documentation for g_dbus_object_manager_get_object()." to glib-2-70 2262 Backport 2244 "gutils: Avoid segfault in g_get_user_database_entry" to glib-2-70 2271 Backport 2266 "fix uninitial variable" to glib-2-70 2276 Backport 2274 "Do not try to access errno after calling getpwnam_r." to glib-2-70 2300 Backport 2285 "fix issues found by svace static code analyzer" to glib-2-70 2301 Backport 2293 "glib-private: Fix MSVC build with AddressSanitizer" to glib-2-70 2302 Backport 2291 "gnetworkmonitornm: Stop using removed PropertiesChanged signal" to glib-2-70 2304 meson: fix warnings for extract_all_objects function (From OE-Core rev: 0924cdc5b266f18840ebe30bdaa84df56e3f8c76) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib-2.0_2.70.0.bb | 54 --------------------------- meta/recipes-core/glib-2.0/glib-2.0_2.70.1.bb | 54 +++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 54 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.70.0.bb create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.70.1.bb diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.70.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.70.0.bb deleted file mode 100644 index 8217aaa8d0..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.70.0.bb +++ /dev/null @@ -1,54 +0,0 @@ -require glib.inc - -PE = "1" - -SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ - file://run-ptest \ - file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \ - file://Enable-more-tests-while-cross-compiling.patch \ - file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ - file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ - file://0001-Do-not-ignore-return-value-of-write.patch \ - file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ - file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \ - file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ - file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ - file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ - file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ - " -SRC_URI:append:class-native = " file://relocate-modules.patch" - -SRC_URI[sha256sum] = "200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742" - -# Find any meson cross files in FILESPATH that are relevant for the current -# build (using siteinfo) and add them to EXTRA_OEMESON. -inherit siteinfo -def find_meson_cross_files(d): - if bb.data.inherits_class('native', d): - return "" - - thisdir = os.path.normpath(d.getVar("THISDIR")) - import collections - sitedata = siteinfo_data(d) - # filename -> found - files = collections.OrderedDict() - for path in d.getVar("FILESPATH").split(":"): - for element in sitedata: - filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) - sanitized_path = filename.replace(thisdir, "${THISDIR}") - if sanitized_path == filename: - if os.path.exists(filename): - bb.error("Cannot add '%s' to --cross-file, because it's not relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir)) - continue - files[filename.replace(thisdir, "${THISDIR}")] = os.path.exists(filename) - - items = ["--cross-file=" + k for k,v in files.items() if v] - d.appendVar("EXTRA_OEMESON", " " + " ".join(items)) - items = ["%s:%s" % (k, "True" if v else "False") for k,v in files.items()] - d.appendVarFlag("do_configure", "file-checksums", " " + " ".join(items)) - -python () { - find_meson_cross_files(d) -} diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.70.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.70.1.bb new file mode 100644 index 0000000000..f7bb62f74b --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.70.1.bb @@ -0,0 +1,54 @@ +require glib.inc + +PE = "1" + +SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ + file://run-ptest \ + file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \ + file://Enable-more-tests-while-cross-compiling.patch \ + file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ + file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ + file://0001-Do-not-ignore-return-value-of-write.patch \ + file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ + file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \ + file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ + file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ + file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ + file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ + " +SRC_URI:append:class-native = " file://relocate-modules.patch" + +SRC_URI[sha256sum] = "f9b7bce7f51753a1f43853bbcaca8bf09e15e994268e29cfd7a76f65636263c0" + +# Find any meson cross files in FILESPATH that are relevant for the current +# build (using siteinfo) and add them to EXTRA_OEMESON. +inherit siteinfo +def find_meson_cross_files(d): + if bb.data.inherits_class('native', d): + return "" + + thisdir = os.path.normpath(d.getVar("THISDIR")) + import collections + sitedata = siteinfo_data(d) + # filename -> found + files = collections.OrderedDict() + for path in d.getVar("FILESPATH").split(":"): + for element in sitedata: + filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) + sanitized_path = filename.replace(thisdir, "${THISDIR}") + if sanitized_path == filename: + if os.path.exists(filename): + bb.error("Cannot add '%s' to --cross-file, because it's not relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir)) + continue + files[filename.replace(thisdir, "${THISDIR}")] = os.path.exists(filename) + + items = ["--cross-file=" + k for k,v in files.items() if v] + d.appendVar("EXTRA_OEMESON", " " + " ".join(items)) + items = ["%s:%s" % (k, "True" if v else "False") for k,v in files.items()] + d.appendVarFlag("do_configure", "file-checksums", " " + " ".join(items)) + +python () { + find_meson_cross_files(d) +} -- cgit v1.2.3-54-g00ecf