From 79d229e8be892cc0bd36fe9f71ac4671cc34aa82 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 6 Sep 2018 12:29:29 +0200 Subject: glib: update to 2.58.0 Drop upstreamed patches, refresh the rest. Add an explicit dependency on gettext-native, as glib is no longer fooled by setting msgfmt to /bin/false. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...stall-gio-querymodules-as-libexec_PROGRAM.patch | 14 ++--- ...st-for-pthread_getname_np-before-using-it.patch | 70 ---------------------- ...s-Ignore-other-per-value-options-than-ski.patch | 32 ---------- .../Enable-more-tests-while-cross-compiling.patch | 29 ++++----- ...un-media-sdX-drive-mount-if-username-root.patch | 16 +++-- .../glib-2.0/glib-2.0/relocate-modules.patch | 6 +- 6 files changed, 28 insertions(+), 139 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Test-for-pthread_getname_np-before-using-it.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-glib-mkenums-Ignore-other-per-value-options-than-ski.patch (limited to 'meta/recipes-core/glib-2.0/glib-2.0') diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch index 561d100209..97d0aff5d6 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch @@ -1,4 +1,4 @@ -From 80682c171ccb27d01343d4cfcfb4dd49b7863ccc Mon Sep 17 00:00:00 2001 +From 856045927b9ab391165c0ebabf401835f8439eab Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 22 Mar 2016 15:14:58 +0200 Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM @@ -8,24 +8,22 @@ renamer does not cope with library packages with files in ${bindir} Signed-off-by: Jussi Kukkonen Upstream-Status: Inappropriate [OE specific] + --- gio/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gio/Makefile.am b/gio/Makefile.am -index b7f91cc..4d81cc0 100644 +index e14cad2..bf2bcc7 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am -@@ -702,7 +702,8 @@ gio.def: libgio-2.0.la +@@ -835,7 +835,8 @@ gio.def: libgio-2.0.la gio-2.0.lib: libgio-2.0.la gio.def $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@ --bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings -+bin_PROGRAMS = glib-compile-schemas glib-compile-resources gsettings +-bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings gio-launch-desktop ++bin_PROGRAMS = glib-compile-schemas glib-compile-resources gsettings gio-launch-desktop +libexec_PROGRAMS = gio-querymodules glib_compile_resources_LDADD = libgio-2.0.la \ $(top_builddir)/gobject/libgobject-2.0.la \ --- -2.1.4 - diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Test-for-pthread_getname_np-before-using-it.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Test-for-pthread_getname_np-before-using-it.patch deleted file mode 100644 index c6e4966bb8..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Test-for-pthread_getname_np-before-using-it.patch +++ /dev/null @@ -1,70 +0,0 @@ -From f627fe16099a2b08d8b4e9023ae6b4f352451967 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 6 Nov 2016 08:59:08 -0800 -Subject: [PATCH] Test for pthread_getname_np before using it - -Its a GNU extention and not all libc implement it -musl e.g. implements the setname API but not getname -in any case, it seems to be safer to check for the -function before using it. - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - config.h.in | 3 +++ - configure.ac | 10 ++++++++++ - glib/tests/thread.c | 2 +- - 3 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/config.h.in b/config.h.in -index 2c35ff1..da7ac30 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -326,6 +326,9 @@ - #undef HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP - - /* Have function pthread_setname_np(const char*) */ -+#undef HAVE_PTHREAD_GETNAME_NP -+ -+/* Have function pthread_setname_np(const char*) */ - #undef HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID - - /* Have function pthread_setname_np(pthread_t, const char*) */ -diff --git a/configure.ac b/configure.ac -index 4309671..209770a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2121,6 +2121,16 @@ AS_IF([ test x"$have_threads" = xposix], [ - AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP,1, - [Have function pthread_cond_timedwait_relative_np])], - [AC_MSG_RESULT(no)]) -+ dnl gets thread names -+ AC_MSG_CHECKING(for pthread_getname_np(pthread_t, char*, size_t)) -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM( -+ [#include ], -+ [pthread_getname_np(pthread_self(),"example",0)])], -+ [AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_PTHREAD_GETNAME_NP,1, -+ [Have function pthread_setname_np(const char*)])], -+ [AC_MSG_RESULT(no)]) - dnl Sets thread names on OS X 10.6, iOS 3.2 (and higher) - AC_MSG_CHECKING(for pthread_setname_np(const char*)) - AC_LINK_IFELSE( -diff --git a/glib/tests/thread.c b/glib/tests/thread.c -index 5447836..2f248a6 100644 ---- a/glib/tests/thread.c -+++ b/glib/tests/thread.c -@@ -174,7 +174,7 @@ test_thread5 (void) - static gpointer - thread6_func (gpointer data) - { --#ifdef HAVE_PTHREAD_SETNAME_NP_WITH_TID -+#if defined(HAVE_PTHREAD_SETNAME_NP_WITH_TID) && defined(HAVE_PTHREAD_GETNAME_NP) - char name[16]; - - pthread_getname_np (pthread_self(), name, 16); --- -2.10.2 - diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-glib-mkenums-Ignore-other-per-value-options-than-ski.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-glib-mkenums-Ignore-other-per-value-options-than-ski.patch deleted file mode 100644 index c87635a082..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-glib-mkenums-Ignore-other-per-value-options-than-ski.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 12ffb50d587003a46678567b771c6e984035a5e9 Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt -Date: Sat, 28 Apr 2018 03:07:50 +0200 -Subject: [PATCH] glib-mkenums: Ignore other per value options than 'skip' and - 'nick' - -If some other per value option was present than 'skip' or 'nick' then -a KeyError would occur. Ignoring such options matches the behaviour of -the old, Perl-based glib-mkenums. - -Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=795008] -Signed-off-by: Peter Kjellerstedt ---- - gobject/glib-mkenums.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in -index fe9a10756..4ccc1f458 100755 ---- a/gobject/glib-mkenums.in -+++ b/gobject/glib-mkenums.in -@@ -218,7 +218,7 @@ def parse_entries(file, file_name): - if options is not None: - options = parse_trigraph(options) - if 'skip' not in options: -- entries.append((name, value, options['nick'])) -+ entries.append((name, value, options.get('nick', None))) - else: - entries.append((name, value)) - elif re.match(r's*\#', line): --- -2.12.0 - diff --git a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch index b98f933dae..50781e7892 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch @@ -1,7 +1,7 @@ -From d762907d33b81cf7469b5696c87f2188d2050afb Mon Sep 17 00:00:00 2001 +From 4b1a6d247c78125096a6ea5ab3cab8a1f000dc23 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Mon, 9 Nov 2015 11:07:27 +0200 -Subject: [PATCH 06/10] Enable more tests while cross-compiling +Subject: [PATCH] Enable more tests while cross-compiling Upstream disables a few tests while cross-compiling because their build requires running other built binaries. This usually makes sense but in the cross-compile @@ -16,10 +16,10 @@ Signed-off-by: Jussi Kukkonen 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am -index acc1da4..9176640 100644 +index 1f0bed7..8295deb 100644 --- a/gio/tests/Makefile.am +++ b/gio/tests/Makefile.am -@@ -516,10 +516,9 @@ test_programs += \ +@@ -550,10 +550,9 @@ test_programs += \ endif # ----------------------------------------------------------------------------- @@ -32,7 +32,7 @@ index acc1da4..9176640 100644 test_programs += resources resources_SOURCES = resources.c nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h -@@ -543,7 +542,11 @@ if !ENABLE_INSTALLED_TESTS +@@ -578,7 +577,11 @@ if !ENABLE_INSTALLED_TESTS libresourceplugin_la_LDFLAGS += -rpath / endif @@ -44,7 +44,7 @@ index acc1da4..9176640 100644 test-generated.txt: test1.txt $(AM_V_GEN) echo "Generated" > $@ && \ -@@ -564,7 +567,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- +@@ -599,7 +602,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource @@ -53,10 +53,10 @@ index acc1da4..9176640 100644 BUILT_SOURCES += giotypefuncs.inc diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am -index 656941d..68555ff 100644 +index 0e60987..927d13a 100644 --- a/tests/gobject/Makefile.am +++ b/tests/gobject/Makefile.am -@@ -48,10 +48,13 @@ if ENABLE_TIMELOOP +@@ -51,10 +51,13 @@ if ENABLE_TIMELOOP installed_test_programs += timeloop-closure endif @@ -72,14 +72,9 @@ index 656941d..68555ff 100644 testmarshal.h: stamp-testmarshal.h @true -@@ -69,7 +72,6 @@ BUILT_SOURCES += testmarshal.h testmarshal.c - CLEANFILES += stamp-testmarshal.h +@@ -71,4 +74,3 @@ testmarshal.c: testmarshal.h testmarshal.list $(glib_genmarshal) + BUILT_SOURCES += testmarshal.h testmarshal.c + CLEANFILES += stamp-testmarshal.h testmarshal.h testmarshal.c EXTRA_DIST += testcommon.h testmarshal.list - BUILT_EXTRA_DIST += testmarshal.h testmarshal.c -endif # !CROSS_COMPILING - - dist-hook: $(BUILT_EXTRA_DIST) - files='$(BUILT_EXTRA_DIST)'; \ --- -2.14.1 - +\ No newline at end of file diff --git a/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch b/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch index 3d0c008bbe..3040479422 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch @@ -1,4 +1,4 @@ -From c53e94a520b573aa0dcf12903e9563fe8badc34c Mon Sep 17 00:00:00 2001 +From 66e5fd5e870a2de04ec0f0c5dbfa23db496bad43 Mon Sep 17 00:00:00 2001 From: Marius Avram Date: Wed, 27 Aug 2014 12:10:41 +0300 Subject: [PATCH] Allow /run/media/sdX drive mount if username root @@ -14,17 +14,18 @@ graphical applications such as the File Manager (pcmanfm). Upstream-Status: Inappropriate Signed-off-by: Marius Avram + --- - gio/gunixmounts.c | 5 +++++ + gio/gunixmounts.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c -index 4999354..f6c1472 100644 +index 355329c..6467fc5 100644 --- a/gio/gunixmounts.c +++ b/gio/gunixmounts.c -@@ -2136,6 +2136,11 @@ g_unix_mount_guess_should_display (GUnixMountEntry *mount_entry) - mount_path[sizeof ("/run/media/") - 1 + user_name_len] == '/') - is_in_runtime_dir = TRUE; +@@ -2745,6 +2745,11 @@ g_unix_mount_guess_should_display (GUnixMountEntry *mount_entry) + is_in_runtime_dir = TRUE; + } + /* Allow no username in path in /run/media if current user is root */ + if (strcmp(user_name, "root") == 0 && @@ -34,6 +35,3 @@ index 4999354..f6c1472 100644 if (is_in_runtime_dir || g_str_has_prefix (mount_path, "/media/")) { char *path; --- -1.7.9.5 - diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index 0c8cbd731b..f9794d3dd2 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -1,4 +1,4 @@ -From c8fa58dc2e9322727ba21eafbe9a69a5f68ffd35 Mon Sep 17 00:00:00 2001 +From 8326961841f4d16c7239e747de11e3817c35cfd2 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds @@ -19,7 +19,7 @@ Signed-off-by: Jussi Kukkonen 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gio/giomodule.c b/gio/giomodule.c -index 1ead84c..f744aa2 100644 +index 36c0cef..912e490 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c @@ -40,6 +40,8 @@ @@ -31,7 +31,7 @@ index 1ead84c..f744aa2 100644 #endif #include -@@ -1083,7 +1085,15 @@ get_gio_module_dir (void) +@@ -1099,7 +1101,15 @@ get_gio_module_dir (void) #endif g_free (install_dir); #else -- cgit 1.2.3-korg