From f6c43c1bc23201f6c68653bb5862e7125351e565 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Wed, 8 May 2019 18:28:29 +0000
Subject: [PATCH] - update to epiphany-3.32.2 - apply upstream's patch for
 ephy-web-app-utils.c

---
 www/epiphany/Makefile                         |  5 +-
 www/epiphany/distinfo                         |  4 +-
 .../patches/patch-lib_ephy-web-app-utils_c    | 56 ++++++++++++++++---
 3 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 8af3d932415..f7fa05ab74d 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.182 2019/05/08 14:39:03 jasper Exp $
+# $OpenBSD: Makefile,v 1.183 2019/05/08 18:28:29 jasper Exp $
 
 COMMENT=	GNOME web browser based on webkit
 
 GNOME_PROJECT=	epiphany
-GNOME_VERSION=	3.32.0
+GNOME_VERSION=	3.32.2
 MAJOR_V=	${GNOME_VERSION:R}
 SUBST_VARS=	MAJOR_V
-REVISION =	0
 
 CATEGORIES=	www
 
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index f4d60abd3e1..45543f77be0 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,2 +1,2 @@
-SHA256 (epiphany-3.32.0.tar.xz) = Rjmh5WGgNCuJR2k2kcD1LJ/WIeFBSCv8wH4+tpMclSE=
-SIZE (epiphany-3.32.0.tar.xz) = 5063552
+SHA256 (epiphany-3.32.2.tar.xz) = iucNn+q6N1TGOrJJ3u75t6MRYaNyZVtCFPFI6i9EDPo=
+SIZE (epiphany-3.32.2.tar.xz) = 5467848
diff --git a/www/epiphany/patches/patch-lib_ephy-web-app-utils_c b/www/epiphany/patches/patch-lib_ephy-web-app-utils_c
index 184eddbc41d..f5e92f2b567 100644
--- a/www/epiphany/patches/patch-lib_ephy-web-app-utils_c
+++ b/www/epiphany/patches/patch-lib_ephy-web-app-utils_c
@@ -1,24 +1,64 @@
-$OpenBSD: patch-lib_ephy-web-app-utils_c,v 1.1 2019/05/08 12:11:54 jasper Exp $
+$OpenBSD: patch-lib_ephy-web-app-utils_c,v 1.2 2019/05/08 18:28:29 jasper Exp $
 
-error: cannot jump from this goto statement to its label
-https://gitlab.gnome.org/GNOME/epiphany/issues/764
+https://gitlab.gnome.org/GNOME/epiphany/commit/4e998d45e4cc549a7ca561a33895b0fbcf7ba6bb
 
 Index: lib/ephy-web-app-utils.c
 --- lib/ephy-web-app-utils.c.orig
 +++ lib/ephy-web-app-utils.c
-@@ -348,6 +348,7 @@ ephy_web_application_create (const char *id,
+@@ -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);
-+  g_autofree char *app_file = g_build_filename (profile_dir, ".app", NULL);
    if (g_file_test (profile_dir, G_FILE_TEST_IS_DIR)) {
      g_warning ("Profile directory %s already exists", profile_dir);
-     goto out;
-@@ -360,7 +361,6 @@ ephy_web_application_create (const char *id,
+-    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));
+-    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 *