diff --git a/www-client/epiphany/additional-files/icons.zip b/www-client/epiphany/additional-files/icons.zip new file mode 100644 index 000000000..4d34947e0 Binary files /dev/null and b/www-client/epiphany/additional-files/icons.zip differ diff --git a/www-client/epiphany/epiphany-43.0.recipe b/www-client/epiphany/epiphany-43.0.recipe index 6df304776..6855ee3e8 100644 --- a/www-client/epiphany/epiphany-43.0.recipe +++ b/www-client/epiphany/epiphany-43.0.recipe @@ -8,13 +8,14 @@ Its code name is Epiphany." HOMEPAGE="https://wiki.gnome.org/Apps/Web" COPYRIGHT="2005-2022 The GNOME Project" LICENSE="GNU GPL v3" -REVISION="3" +REVISION="4" SOURCE_URI="https://gitlab.gnome.org/GNOME/epiphany/-/archive/$portVersion/epiphany-$portVersion.tar.bz2" CHECKSUM_SHA256="867117c09a532c06e2db0f283c153f310bfec0e28c4ef06955dfa1f3ec6167c7" PATCHES="epiphany-$portVersion.patchset" ADDITIONAL_FILES=" epiphany.rdef.in compile-schemas.sh + icons.zip " ARCHITECTURES="all !x86_gcc2" @@ -98,12 +99,14 @@ BUILD_PREREQUIRES=" cmd:ninja cmd:pkg_config$secondaryArchSuffix cmd:xargs + cmd:unzip " PATCH() { cd $sourceDir find src lib embed -type f -regex '.*\(c\|ui\|css\)' -print0 | xargs -0 sed -i 's/-symbolic//g' + unzip -o $sourceDir/../../additional-files/icons.zip -d $sourceDir } BUILD() @@ -130,6 +133,7 @@ INSTALL() mv "$appsDir/GNOME Web/epiphany" "$appsDir/GNOME Web/Web" rm -rf $dataDir/{help,gnome-shell,dbus-1,applications} + rm -rf $dataDir/icons/hicolor/symbolic mkdir $prefix/bin ln -s "$appsDir/GNOME Web/Web" $prefix/bin/epiphany diff --git a/www-client/epiphany/patches/epiphany-43.0.patchset b/www-client/epiphany/patches/epiphany-43.0.patchset index da2c2c84f..78c2f6be2 100644 --- a/www-client/epiphany/patches/epiphany-43.0.patchset +++ b/www-client/epiphany/patches/epiphany-43.0.patchset @@ -1,4 +1,4 @@ -From 91529206483118ebf834db86635e90c6f2126bb9 Mon Sep 17 00:00:00 2001 +From e522672901daee0b6929b4db2eb8b52248441e68 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 6 Dec 2022 19:51:55 +1000 Subject: Fix build for Haiku @@ -26,7 +26,7 @@ index 8dd7a93..3d95be6 100644 2.37.3 -From 5d82c77e12b18cff9132d8caa20d48de27f61110 Mon Sep 17 00:00:00 2001 +From 2b9143bc8ab8a1f54c26d21685120d1cb09ba2d2 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 6 Dec 2022 19:52:45 +1000 Subject: Use /dev/random for ephy_sync_utils_generate_random_bytes @@ -64,7 +64,7 @@ index 75c08fc..156a730 100644 2.37.3 -From d943e38124b8603c61d354110e3754912c33cf02 Mon Sep 17 00:00:00 2001 +From 222d38b4297cab4febc961031843ec086942bd4c Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 6 Dec 2022 19:53:26 +1000 Subject: Disable settings for set default browser @@ -93,7 +93,7 @@ index f557397..758aa7e 100644 2.37.3 -From a3698021dd53e67d8ef3becafca6ac9f48a443c5 Mon Sep 17 00:00:00 2001 +From fac20930d8a54a942b80271139d06e9eea9308de Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 6 Dec 2022 19:53:41 +1000 Subject: Add open handler for Haiku @@ -152,7 +152,7 @@ index 18017f7..6f4d58d 100644 2.37.3 -From 460f4cdde23e11390eed95fa3d7037b37c3792f6 Mon Sep 17 00:00:00 2001 +From ea37024d90fc721044a4fad47b6fc1b563349b06 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 6 Dec 2022 19:54:11 +1000 Subject: Set XDG variables @@ -204,3 +204,238 @@ index be9b6db..68d9922 100644 -- 2.37.3 + +From b0d04927885c6f7014269c60219f9f7f20519014 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sun, 11 Dec 2022 12:06:20 +1000 +Subject: Disable translate languages, fix #7524 + + +diff --git a/lib/contrib/gnome-languages.c b/lib/contrib/gnome-languages.c +index 75ba956..4570215 100644 +--- a/lib/contrib/gnome-languages.c ++++ b/lib/contrib/gnome-languages.c +@@ -44,8 +44,13 @@ + #define __LC_LAST 13 + #endif + ++#ifdef __HAIKU__ ++#define ISO_CODES_DATADIR ISO_CODES_PREFIX "/xml/iso-codes" ++#define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/locale" ++#else + #define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes" + #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale" ++#endif + + #if 0 + #include "default-input-sources.h" +@@ -288,6 +293,9 @@ gnome_normalize_locale (const char *locale) + static gboolean + language_name_is_valid (const char *language_name) + { ++#ifdef __HAIKU__ ++ return language_name != NULL; ++#else + locale_t locale; + + locale = newlocale (LC_MESSAGES_MASK, language_name, (locale_t) 0); +@@ -297,6 +305,7 @@ language_name_is_valid (const char *language_name) + } + + return FALSE; ++#endif + } + + static void +@@ -307,7 +316,14 @@ language_name_get_codeset_details (const char *language_name, + locale_t locale; + locale_t old_locale; + const char *codeset = NULL; +- ++#ifdef __HAIKU__ ++ if (pcodeset != NULL) { ++ *pcodeset = g_strdup ("UTF-8"); ++ } ++ if (is_utf8 != NULL) { ++ *is_utf8 = TRUE; ++ } ++#else + locale = newlocale (LC_CTYPE_MASK, language_name, (locale_t) 0); + if (locale == (locale_t) 0) + return; +@@ -328,6 +344,7 @@ language_name_get_codeset_details (const char *language_name, + + uselocale (old_locale); + freelocale (locale); ++#endif + } + + /** +@@ -582,7 +599,9 @@ collect_locales (void) + + found_localebin_locales = collect_locales_from_localebin (); + ++#ifndef __HAIKU__ + found_dir_locales = collect_locales_from_directory (); ++#endif + + if (!(found_localebin_locales || found_dir_locales)) { + g_warning ("Could not read list of available locales from libc, " +@@ -701,7 +720,9 @@ get_translated_language (const char *code, + char *name; + + language = get_language (code); +- ++#ifdef __HAIKU__ ++ return g_strdup(language); ++#else + name = NULL; + if (language != NULL) { + const char *translated_name; +@@ -731,6 +752,7 @@ get_translated_language (const char *code, + } + + return name; ++#endif + } + + static const char * +@@ -759,7 +781,9 @@ get_translated_territory (const char *code, + char *name; + + territory = get_territory (code); +- ++#ifdef __HAIKU__ ++ return g_strdup(territory); ++#else + name = NULL; + if (territory != NULL) { + const char *translated_territory; +@@ -785,6 +809,7 @@ get_translated_territory (const char *code, + } + + return name; ++#endif + } + + static void +-- +2.37.3 + + +From 18736ed4d0deff9f3b4118862c93b4ee5183c5d7 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sun, 11 Dec 2022 12:06:53 +1000 +Subject: Use system locale folder for liblocaledir + + +diff --git a/meson.build b/meson.build +index 3d95be6..01f696d 100644 +--- a/meson.build ++++ b/meson.build +@@ -21,7 +21,7 @@ datadir = join_paths(prefix, get_option('datadir')) + desktopdir = join_paths(datadir, 'applications') + libdir = join_paths(prefix, get_option('libdir')) + libexecdir = join_paths(prefix, get_option('libexecdir')) +-liblocaledir = join_paths(prefix, libdir, 'locale') ++liblocaledir = join_paths(prefix, get_option('localedir')) + localedir = join_paths(prefix, get_option('localedir')) + pkgdatadir = join_paths(datadir, 'epiphany') + pkglibdir = join_paths(libdir, 'epiphany') +@@ -30,7 +30,7 @@ servicedir = join_paths(datadir, 'dbus-1', 'services') + webprocessextensionsdir = join_paths(pkglibdir, 'web-process-extensions') + + iso_codes = dependency('iso-codes') +-iso_codes_prefix = iso_codes.get_variable(pkgconfig: 'prefix') ++iso_codes_prefix = join_paths(prefix, get_option('datadir')) + + profile = get_option('profile') + application_id = 'org.gnome.Epiphany' +-- +2.37.3 + + +From 9744769450a7a35d80d42a259d350e6937dd1c46 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sun, 11 Dec 2022 12:07:29 +1000 +Subject: Remove icon transparency for about page + + +diff --git a/src/resources/about.css b/src/resources/about.css +index e3138b9..85507b5 100644 +--- a/src/resources/about.css ++++ b/src/resources/about.css +@@ -7,7 +7,6 @@ html { + --base-color: #fff; + --text-color: #000; + --borders: #d3d7cf; +- --icon-invert: 0.2; /* average(0x2e, 0x34, 0x36) / 0xff */ + + /* Misc colors */ + --header-color: #999; +@@ -25,7 +24,6 @@ html { + --base-color: #2d2d2d; + --text-color: #fff; + --borders: #1b1b1b; +- --icon-invert: 0.93; /* average(0xee, 0xee, 0xec) / 0xff */ + + /* Misc colors */ + --header-color: #666; +@@ -92,14 +90,6 @@ h1 { + text-shadow: 0 1px 0 var(--base-color); + } + +-#about-icon { +- filter: drop-shadow(0 1px 12px rgba(0, 0, 0, 0.05)) +- drop-shadow(0 -1px rgba(0, 0, 0, 0.05)) +- drop-shadow(1px 0 rgba(0, 0, 0, 0.1)) +- drop-shadow(0 1px rgba(0, 0, 0, 0.3)) +- drop-shadow(-1px 0 rgba(0, 0, 0, 0.1)); +-} +- + /* about:epiphany */ + + html.epiphany-html { +@@ -259,7 +249,7 @@ html.epiphany-html { + margin:auto; + display:block; + filter: brightness(0) invert(var(--icon-invert)); +- opacity: 0.5; ++ opacity: 1.0; + } + + /* about:overview */ +@@ -423,7 +413,7 @@ html[dir="rtl"] .overview-item { + .overview-empty img { + -webkit-user-select: none; + -webkit-user-drag: none; +- opacity: 0.5; ++ opacity: 1.0; + width: 128px; + filter: brightness(0) invert(var(--icon-invert)); + } +-- +2.37.3 + + +From a84d189836b5334a2445c66aa0cae8d5300c6ff0 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sun, 11 Dec 2022 13:44:46 +1000 +Subject: With 128px for about icons + + +diff --git a/src/resources/about.css b/src/resources/about.css +index 85507b5..c7eb69e 100644 +--- a/src/resources/about.css ++++ b/src/resources/about.css +@@ -250,6 +250,7 @@ html.epiphany-html { + display:block; + filter: brightness(0) invert(var(--icon-invert)); + opacity: 1.0; ++ width: 128px; + } + + /* about:overview */ +-- +2.37.3 +