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 --- .../0001-Install-gio-querymodules-as-libexec_PROGRAM.patch | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch') 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 - -- cgit 1.2.3-korg