From 6882c21e9c282d59a15f9ae80dffb56b897956e7 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 11 Dec 2022 13:53:07 +1000 Subject: [PATCH] Epiphany: fix #7524, add haiku icon for incognito mode, tune style --- .../epiphany/additional-files/icons.zip | Bin 0 -> 15505 bytes www-client/epiphany/epiphany-43.0.recipe | 6 +- .../epiphany/patches/epiphany-43.0.patchset | 245 +++++++++++++++++- 3 files changed, 245 insertions(+), 6 deletions(-) create mode 100644 www-client/epiphany/additional-files/icons.zip diff --git a/www-client/epiphany/additional-files/icons.zip b/www-client/epiphany/additional-files/icons.zip new file mode 100644 index 0000000000000000000000000000000000000000..4d34947e06caefbeb0a3984a46daba547c638645 GIT binary patch literal 15505 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 literal 0 HcmV?d00001 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 +