cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to epiphany-3.32.2

Browse Source 
- apply upstream's patch for ephy-web-app-utils.c
This commit is contained in:
jasper 2019-05-08 18:28:29 +00:00
parent ecbb994277
commit f6c43c1bc2
3 changed files with 52 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/epiphany/Makefile
View File

@ -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

4
www/epiphany/distinfo
View File

@ -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

56
www/epiphany/patches/patch-lib_ephy-web-app-utils_c
View File

@ -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 *