diff options
| author | prlw1 <prlw1@pkgsrc.org> | 2022-03-10 21:28:03 +0000 |
|---|---|---|
| committer | prlw1 <prlw1@pkgsrc.org> | 2022-03-10 21:28:03 +0000 |
| commit | fdd950e537b645e5b2462e3c689b3931bb7d6880 (patch) | |
| tree | 994ece9d9a82eb97870fd99ecabd7791a7e753d6 /www/epiphany/patches | |
| parent | 81b3e185cd742c1db6c29d5c26ba3746d536414a (diff) | |
| download | pkgsrc-fdd950e537b645e5b2462e3c689b3931bb7d6880.tar.gz | |
Fix build with meson >= 0.61
Update epiphany to 40.6
Two year's worth of development, bug fixes and translation updates.
Note:
The Safe Browsing phishing protection feature is now disabled by
default (#682) to comply with changes to Google's terms of service,
which now prohibit inclusion of API keys in open source projects.
For details, see:
https://gitlab.gnome.org/GNOME/epiphany/-/blob/40.6/NEWS
Diffstat (limited to 'www/epiphany/patches')
| -rw-r--r-- | www/epiphany/patches/patch-data_meson.build | 23 | ||||
| -rw-r--r-- | www/epiphany/patches/patch-lib_ephy-sync-utils.c | 39 |
2 files changed, 37 insertions, 25 deletions
diff --git a/www/epiphany/patches/patch-data_meson.build b/www/epiphany/patches/patch-data_meson.build new file mode 100644 index 00000000000..a75af71850d --- /dev/null +++ b/www/epiphany/patches/patch-data_meson.build @@ -0,0 +1,23 @@ +$NetBSD: patch-data_meson.build,v 1.1 2022/03/10 21:28:03 prlw1 Exp $ + +Fix build with meson >= 0.61 +commit bfbb5f7bab38301d8a4a444173acdae8d9692146 + +--- data/meson.build.orig 2021-12-21 00:24:23.783496100 +0000 ++++ data/meson.build +@@ -16,7 +16,6 @@ install_data( + desktop_conf = configuration_data() + desktop_conf.set('icon', application_id) + desktop = i18n.merge_file( +- 'desktop', + input: configure_file( + input: files('org.gnome.Epiphany.desktop.in.in'), + output: 'org.gnome.Epiphany.desktop.in', +@@ -32,7 +31,6 @@ desktop = i18n.merge_file( + appdata_conf = configuration_data() + appdata_conf.set('appid', application_id) + appdata = i18n.merge_file( +- 'appdata', + input: configure_file( + input: files('org.gnome.Epiphany.appdata.xml.in.in'), + output: 'org.gnome.Epiphany.appdata.xml.in', diff --git a/www/epiphany/patches/patch-lib_ephy-sync-utils.c b/www/epiphany/patches/patch-lib_ephy-sync-utils.c index 6e261ee092d..0b18ee3a953 100644 --- a/www/epiphany/patches/patch-lib_ephy-sync-utils.c +++ b/www/epiphany/patches/patch-lib_ephy-sync-utils.c @@ -1,35 +1,24 @@ -$NetBSD: patch-lib_ephy-sync-utils.c,v 1.1 2020/06/10 19:45:51 nia Exp $ +$NetBSD: patch-lib_ephy-sync-utils.c,v 1.2 2022/03/10 21:28:03 prlw1 Exp $ NetBSD does not have getrandom(). ---- lib/ephy-sync-utils.c.orig 2020-05-29 15:32:59.180212500 +0000 +--- lib/ephy-sync-utils.c.orig 2021-12-21 00:24:23.810496800 +0000 +++ lib/ephy-sync-utils.c -@@ -30,7 +30,11 @@ - #include <libsoup/soup.h> - #include <stdio.h> +@@ -32,7 +32,7 @@ #include <string.h> -+#ifndef __NetBSD__ + #if defined(__linux__) #include <sys/random.h> -+#else -+#include <stdlib.h> -+#endif +-#elif defined(__FreeBSD__) || defined(__OpenBSD__) ++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) + #include <unistd.h> + #endif - static const char hex_digits[] = "0123456789abcdef"; - -@@ -179,12 +183,16 @@ ephy_sync_utils_generate_random_bytes (v - g_assert (num_bytes > 0); - g_assert (out); - -+#ifndef __NetBSD__ +@@ -187,7 +187,7 @@ ephy_sync_utils_generate_random_bytes (v + if (getentropy (out, num_bytes) == -1) { + g_error ("Failed to get entropy: %s", g_strerror (errno)); + } +-#else ++#elif !defined(__NetBSD__) do { ret = getrandom (out, num_bytes, 0); } while (ret < (gssize)num_bytes && errno == EINTR); - - if (ret != (gssize)num_bytes) - g_error ("Failed to generate randomness: %s", g_strerror (errno)); -+#else -+ arc4random_buf (out, num_bytes); -+#endif - } - - char * |