From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 6IcMJP1czV5JPQAA0tVLHw (envelope-from ) for ; Tue, 26 May 2020 18:16:29 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id wLIXIP1czV6wEgAAB5/wlQ (envelope-from ) for ; Tue, 26 May 2020 18:16:29 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AAD8A9402A0 for ; Tue, 26 May 2020 18:16:28 +0000 (UTC) Received: from localhost ([::1]:37942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jde7m-0004ec-Ug for larch@yhetil.org; Tue, 26 May 2020 14:16:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jde7O-0004cg-T4 for bug-guix@gnu.org; Tue, 26 May 2020 14:16:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34821) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jde7O-0003bY-Ff for bug-guix@gnu.org; Tue, 26 May 2020 14:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jde7O-00011z-Bw for bug-guix@gnu.org; Tue, 26 May 2020 14:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#41174: [PATCH] gnu: webkitgtk: Add patch to share all fonts. References: In-Reply-To: Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 26 May 2020 18:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41174 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 41174@debbugs.gnu.org Received: via spool by 41174-submit@debbugs.gnu.org id=B41174.15905169063888 (code B ref 41174); Tue, 26 May 2020 18:16:02 +0000 Received: (at 41174) by debbugs.gnu.org; 26 May 2020 18:15:06 +0000 Received: from localhost ([127.0.0.1]:46365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jde6R-00010W-TK for submit@debbugs.gnu.org; Tue, 26 May 2020 14:15:06 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:46199) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jde6L-0000zh-C9 for 41174@debbugs.gnu.org; Tue, 26 May 2020 14:15:01 -0400 Received: from localhost.localdomain (194-96-185-81.hdsl.highway.telekom.at [194.96.185.81]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 49WhvK0QYCz1LLyb for <41174@debbugs.gnu.org>; Tue, 26 May 2020 20:14:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 49WhvK0QYCz1LLyb DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1590516893; bh=DQBUS4lNYrq74L7cAdL6vxQ5QYrPKNUATHHLeINuilU=; h=From:To:Subject:Date:From; b=BPEHDcFSrtM3nfdc0JirpA9LegSjzoRlm4UeesYUbu5r9DLJS0+pH6AIgraL68UK6 cOvxUDp3RuJgAWdl0uIW2s555kF1amFVjGcDv6Azeyr3pNRs7Y6DK83upaq1+qDDqH tIwR2TjvQBO6fUja8/APtFbhpJeJEenbQAqPrfEg= From: Leo Prikler Date: Tue, 26 May 2020 20:13:46 +0200 Message-Id: <20200526181345.32726-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=tugraz.at header.s=mailrelay header.b=BPEHDcFS; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: 5.09 X-TUID: zsS5WYnsyluv * gnu/packages/patches/webkitgtk-bind-all-fonts.patch: New file. * gnu/packages/webkit.scm (webkitgtk)[source]: Use it here. * gnu/local.mk: Add it here. --- gnu/local.mk | 1 + .../patches/webkitgtk-bind-all-fonts.patch | 37 +++++++++++++++++++ gnu/packages/webkit.scm | 3 +- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/webkitgtk-bind-all-fonts.patch diff --git a/gnu/local.mk b/gnu/local.mk index d34e7e6ae5..7a694e551a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1580,6 +1580,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/weasyprint-library-paths.patch \ %D%/packages/patches/webkitgtk-share-store.patch \ + %D%/packages/patches/webkitgtk-bind-all-fonts.patch \ %D%/packages/patches/websocketpp-fix-for-boost-1.70.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ diff --git a/gnu/packages/patches/webkitgtk-bind-all-fonts.patch b/gnu/packages/patches/webkitgtk-bind-all-fonts.patch new file mode 100644 index 0000000000..fec0b812f1 --- /dev/null +++ b/gnu/packages/patches/webkitgtk-bind-all-fonts.patch @@ -0,0 +1,37 @@ +Add fonts from all XDG_DATA_DIRS, not just XDG_DATA_HOME. + +See . +Author: Leo Prikler +Index: webkitgtk-2.28.2/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp +=================================================================== +--- webkitgtk-2.28.2.orig/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp ++++ webkitgtk-2.28.2/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp +@@ -385,8 +385,8 @@ static void bindFonts(Vector& a + { + const char* configDir = g_get_user_config_dir(); + const char* homeDir = g_get_home_dir(); +- const char* dataDir = g_get_user_data_dir(); + const char* cacheDir = g_get_user_cache_dir(); ++ const char* const * dataDirs = g_get_system_data_dirs(); + + // Configs can include custom dirs but then we have to parse them... + GUniquePtr fontConfig(g_build_filename(configDir, "fontconfig", nullptr)); +@@ -394,15 +394,17 @@ static void bindFonts(Vector& a + GUniquePtr fontCache(g_build_filename(cacheDir, "fontconfig", nullptr)); + GUniquePtr fontHomeConfig(g_build_filename(homeDir, ".fonts.conf", nullptr)); + GUniquePtr fontHomeConfigDir(g_build_filename(configDir, ".fonts.conf.d", nullptr)); +- GUniquePtr fontData(g_build_filename(dataDir, "fonts", nullptr)); + GUniquePtr fontHomeData(g_build_filename(homeDir, ".fonts", nullptr)); + bindIfExists(args, fontConfig.get()); + bindIfExists(args, fontConfigHome.get()); + bindIfExists(args, fontCache.get(), BindFlags::ReadWrite); + bindIfExists(args, fontHomeConfig.get()); + bindIfExists(args, fontHomeConfigDir.get()); +- bindIfExists(args, fontData.get()); + bindIfExists(args, fontHomeData.get()); ++ for (auto dataDir = dataDirs; dataDir != nullptr && *dataDir != nullptr; dataDir++) { ++ GUniquePtr fontDataDir(g_build_filename(*dataDir, "fonts", nullptr)); ++ bindIfExists(args, fontDataDir.get()); ++ } + bindIfExists(args, "/var/cache/fontconfig"); // Used by Debian. + } diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 90be7d2625..a5c2b3fee2 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -129,7 +129,8 @@ engine that uses Wayland for graphics output.") (sha256 (base32 "1g9hik3bprki5s9d7y5288q5irwckbzajr6rnlvjrlnqrwjkblmr")) - (patches (search-patches "webkitgtk-share-store.patch")))) + (patches (search-patches "webkitgtk-share-store.patch" + "webkitgtk-bind-all-fonts.patch")))) (build-system cmake-build-system) (outputs '("out" "doc")) (arguments -- 2.26.2