From 393846f19370b4407e24b907dbb48b1b16d78fcd Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 20 May 2019 12:24:11 -0400 Subject: poky: subtree update:a015ed7704..797916f93a Adrian Bunk (4): poky-tiny.conf: Remove the removed irda feature from a comment musl: Add TEMP_FAILURE_RETRY from glibc systemd: Disable idn properly for musl instead of NI_IDN workarounds ofono: upgrade 1.25 -> 1.29 Alexander Kanavin (2): packagegroup-cross-canadian: repackage when TUNE_ARCH changes qemux86: use a Core 2 Duo CPU instead of the original circa-1993 Pentium Fabio Berton (1): mesa: Convert recipe to use meson build system Haiqing Bai (1): sysstat: Add PACKAGECONFIG[cron] for '--enable-install-cron' option Khem Raj (2): mmc-utils: Fix build with clang epiphany: Do not bypass initialization of variable with __attribute__((cleanup)) Liwei Song (1): mdadm: install the systemd service through Makefile Marco Felsch (1): mesa: fix imx gallium driver PACKAGECONFIG option Mark Hatle (1): bitbake: gitsm: Fix a bug where the wrong path was used for the submodule init Martin Jansa (2): grub-efi-cfg, systemd-boot-cfg: use MACHINE_ARCH tcmode-default.inc: use the same TUNE_PKGARCH variable as PN set in go-cross Ming Liu (2): kernel.bbclass: adjust a condition checking dhcp: fix a NSUPDATE compiling issue Richard Purdie (2): gettext/flex/m4/bzip2/gzip/parted/slang/attr: Add make to -ptest packages apr/apr-util: Add ptest dependency on libgcc Ross Burton (1): glib-2.0: add missing libgcc dependency to glib-2.0-ptest Tim Orling (1): libtest-needs-perl: upgrade 0.002005 -> 0.002006 Zang Ruochen (1): libinput: Upgrade 1.13.1 -> 1.13.2 Change-Id: Ic565210b5ca776c937445934910f602f424ecce1 Signed-off-by: Brad Bishop --- .../recipes-gnome/epiphany/epiphany_3.32.1.2.bb | 1 + ...tils-Clean-up-ephy_web_application_create.patch | 79 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 poky/meta/recipes-gnome/epiphany/files/0001-web-app-utils-Clean-up-ephy_web_application_create.patch (limited to 'poky/meta/recipes-gnome') diff --git a/poky/meta/recipes-gnome/epiphany/epiphany_3.32.1.2.bb b/poky/meta/recipes-gnome/epiphany/epiphany_3.32.1.2.bb index ba2e851bb..49631d92d 100644 --- a/poky/meta/recipes-gnome/epiphany/epiphany_3.32.1.2.bb +++ b/poky/meta/recipes-gnome/epiphany/epiphany_3.32.1.2.bb @@ -12,6 +12,7 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ + file://0001-web-app-utils-Clean-up-ephy_web_application_create.patch \ " SRC_URI[archive.md5sum] = "93faec353e9f62519859e6164350fd5d" SRC_URI[archive.sha256sum] = "a8284fb9bbc8b7914a154a8eac1598c8b59ae421e0d685146fb48198427926be" diff --git a/poky/meta/recipes-gnome/epiphany/files/0001-web-app-utils-Clean-up-ephy_web_application_create.patch b/poky/meta/recipes-gnome/epiphany/files/0001-web-app-utils-Clean-up-ephy_web_application_create.patch new file mode 100644 index 000000000..ea644fb98 --- /dev/null +++ b/poky/meta/recipes-gnome/epiphany/files/0001-web-app-utils-Clean-up-ephy_web_application_create.patch @@ -0,0 +1,79 @@ +From 49f435217873e679b142f64d3e7def919fb642bb Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Wed, 8 May 2019 15:58:32 +0000 +Subject: [PATCH] web-app-utils: Clean up ephy_web_application_create() + +Fixes #764 + +(cherry picked from commit 4e998d45e4cc549a7ca561a33895b0fbcf7ba6bb) +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/epiphany/commit/a6a022c9c498ad5dcf7f2220644a7520df74ca31] + +Signed-off-by: Khem Raj +--- + lib/ephy-web-app-utils.c | 24 ++++++++++-------------- + 1 file changed, 10 insertions(+), 14 deletions(-) + +diff --git a/lib/ephy-web-app-utils.c b/lib/ephy-web-app-utils.c +index 97f3f24..fc68a96 100644 +--- a/lib/ephy-web-app-utils.c ++++ b/lib/ephy-web-app-utils.c +@@ -374,46 +374,42 @@ ephy_web_application_create (const char *id, + const char *name, + GdkPixbuf *icon) + { +- char *profile_dir; +- char *desktop_file_path = NULL; ++ g_autofree char *app_file = NULL; ++ g_autofree char *profile_dir = NULL; ++ g_autofree char *desktop_file_path = NULL; + + /* If there's already a WebApp profile for the contents of this + * view, do nothing. */ + profile_dir = ephy_web_application_get_profile_directory (id); + if (g_file_test (profile_dir, G_FILE_TEST_IS_DIR)) { + g_warning ("Profile directory %s already exists", profile_dir); +- goto out; ++ return NULL; + } + + /* Create the profile directory, populate it. */ + if (g_mkdir_with_parents (profile_dir, 488) == -1) { + g_warning ("Failed to create directory %s", profile_dir); +- goto out; ++ return NULL; + } + + /* Skip migration for new web apps. */ + ephy_profile_utils_set_migration_version_for_profile_dir (EPHY_PROFILE_MIGRATION_VERSION, profile_dir); + + /* Create an .app file. */ +- g_autofree char *app_file = g_build_filename (profile_dir, ".app", NULL); ++ app_file = g_build_filename (profile_dir, ".app", NULL); + int fd = g_open (app_file, O_WRONLY|O_CREAT|O_TRUNC, 0644); + if (fd < 0) { +- LOG ("Failed to create .app file: %s", g_strerror (errno)); +- goto out; +- } else { +- close (fd); ++ g_warning ("Failed to create .app file: %s", g_strerror (errno)); ++ return NULL; + } ++ close (fd); + + /* Create the deskop file. */ + desktop_file_path = create_desktop_file (id, name, address, profile_dir, icon); + if (desktop_file_path) + ephy_web_application_initialize_settings (profile_dir); + +- out: +- if (profile_dir) +- g_free (profile_dir); +- +- return desktop_file_path; ++ return g_steal_pointer (&desktop_file_path); + } + + char * +-- +2.21.0 + -- cgit v1.2.3