From patchwork Mon Apr 4 04:17:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 1365 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 79D9727BBEA; Mon, 4 Apr 2022 05:18:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 50F3027BBE9 for ; Mon, 4 Apr 2022 05:18:14 +0100 (BST) Received: from localhost ([::1]:46656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nbEAP-0006Ro-F1 for patchwork@mira.cbaines.net; Mon, 04 Apr 2022 00:18:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbEAE-0006RQ-63 for guix-patches@gnu.org; Mon, 04 Apr 2022 00:18:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56232) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nbEAD-00041A-Tl for guix-patches@gnu.org; Mon, 04 Apr 2022 00:18:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nbEAD-00086Q-QA for guix-patches@gnu.org; Mon, 04 Apr 2022 00:18:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54703] [PATCH 1/3] gnu: woff2: Propagate brotli. References: <20220404041521.11010-1-maxim.cournoyer@gmail.com> In-Reply-To: <20220404041521.11010-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Apr 2022 04:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54703 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54703@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 54703-submit@debbugs.gnu.org id=B54703.164904587831136 (code B ref 54703); Mon, 04 Apr 2022 04:18:01 +0000 Received: (at 54703) by debbugs.gnu.org; 4 Apr 2022 04:17:58 +0000 Received: from localhost ([127.0.0.1]:50129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbEAA-000868-7w for submit@debbugs.gnu.org; Mon, 04 Apr 2022 00:17:58 -0400 Received: from mail-qv1-f52.google.com ([209.85.219.52]:33469) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbEA9-00085t-66 for 54703@debbugs.gnu.org; Mon, 04 Apr 2022 00:17:57 -0400 Received: by mail-qv1-f52.google.com with SMTP id i15so671410qvh.0 for <54703@debbugs.gnu.org>; Sun, 03 Apr 2022 21:17:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CtojCWmcoAxaMm3OmwZbix3XZNnUiU0Fh/S6Hk7rW1M=; b=lIX6JUG9KKuWBIPaVfmiG1YqgbQX1LThl2EWHoekP524j+mLD6CmxKq14Agdn8vhYZ fH74tAHPMknOcYxXrewAyjdHii8CqHErKJ4Fgn6DnzsOFC7Vl7/SgMq17RRcrYia2M4q hIBqMVDPN4s6y+zFc5FgGZ6gnA85gcMqIywPnDXob2x4ym6apvXESE5c9INxUC2kIdsM SfdVQ4Nz33WCjTd4E7q8GazLszZ20Q9eD9zMYbOcAhh12jU6nzIm5qzkR8zbWiWWaVfr 24/ZUGn+xPT/xWqyZEYTlA6w0StQDfNEeXjwa5EuCAeJl2vo7PPajDBNGtA6QgFtToqH SMYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CtojCWmcoAxaMm3OmwZbix3XZNnUiU0Fh/S6Hk7rW1M=; b=A7IVbAbtCDpeH2RaRB/XKZA+gURObMk8rKfDUhhEzX0PT3snPUm8XMlD1iF4eIfsPC pe2olCTVefn8r/UyOBvtlLO/SLHuQ08CthSt739GLdNaW1pq94q2r4VWdFZZKpI+M6Zz lck7ejeMVB8VlPLRH91vnM3iyYMi7JRA5SiYRWMtmf7YPOSeVcsYpbXd0ZXVzLNmk6zP sMkiCz3l8nskGlKG2QAAZdI7zQlVCYM6N662PPwZ7jmDeZCIzRLvMLLnq5fGFFrJexch HM8vEfvaaLh6A/iBRc16D7/NI51ZxL4l5VlYZlzcockp5ffsbtxkH8LeGY3wRPl5ukJm OJ+g== X-Gm-Message-State: AOAM533f5l2K/LD/Z3qX7E5DCkKW4WJACzzq7Ly20p0jPjYVyt/5lLUJ LuXWNx1jXdOMuPChtQEoDBgzcq8IH4k= X-Google-Smtp-Source: ABdhPJyjrEL97IV/mNnLGyHsOVZHzh3Z5+Iu0DTobMPcRKkVZHJcDzvZwAD+YqrGzxNVZVAWdnYJAg== X-Received: by 2002:a05:6214:29c5:b0:441:a73:88b2 with SMTP id gh5-20020a05621429c500b004410a7388b2mr16248345qvb.108.1649045871519; Sun, 03 Apr 2022 21:17:51 -0700 (PDT) Received: from localhost.localdomain (dsl-154-119.b2b2c.ca. [66.158.154.119]) by smtp.gmail.com with ESMTPSA id u13-20020a05622a010d00b002e1d653c2e1sm7642015qtw.46.2022.04.03.21.17.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Apr 2022 21:17:51 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 4 Apr 2022 00:17:41 -0400 Message-Id: <20220404041743.11131-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/fontutils.scm (woff2)[phases]: Delete trailing #t. [inputs]: Move brotli to ... [propagated-inputs]: ... here. --- gnu/packages/fontutils.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 04b868d31b..c8c32fd5a9 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -286,7 +286,7 @@ (define-public woff2 (build-system cmake-build-system) (outputs '("out" "bin")) (arguments - `(#:tests? #f ; No target + `(#:tests? #f ;no test suite #:configure-flags (list (string-append "-DCMAKE_INSTALL_BINDIR=" @@ -305,12 +305,11 @@ (define-public woff2 (lambda _ (substitute* "CMakeLists.txt" (("NOT BUILD_SHARED_LIBS") - "BUILD_SHARED_LIBS")) - #t))))) + "BUILD_SHARED_LIBS"))))))) (native-inputs (list pkg-config)) - (inputs - (list brotli)) + (propagated-inputs + (list brotli)) ;libwoff2dec.pc requires libbrotlidec (synopsis "Libraries and tools for WOFF2 font format") (description "WOFF2 provides libraries and tools to handle the Web Open Font Format (WOFF).") From patchwork Mon Apr 4 04:17:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 1366 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7884527BBEA; Mon, 4 Apr 2022 05:19:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4443527BBE9 for ; Mon, 4 Apr 2022 05:19:17 +0100 (BST) Received: from localhost ([::1]:46948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nbEBQ-0006gI-CI for patchwork@mira.cbaines.net; Mon, 04 Apr 2022 00:19:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbEBC-0006fu-Nk for guix-patches@gnu.org; Mon, 04 Apr 2022 00:19:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56243) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nbEBC-00048J-CN for guix-patches@gnu.org; Mon, 04 Apr 2022 00:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nbEBC-00088I-8f for guix-patches@gnu.org; Mon, 04 Apr 2022 00:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54703] [PATCH 2/3] gnu: webkitgtk: Update to 2.36.0 and enable extra features. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Apr 2022 04:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54703 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54703@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 54703-submit@debbugs.gnu.org id=B54703.164904588931190 (code B ref 54703); Mon, 04 Apr 2022 04:19:02 +0000 Received: (at 54703) by debbugs.gnu.org; 4 Apr 2022 04:18:09 +0000 Received: from localhost ([127.0.0.1]:50133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbEAG-00086o-Ee for submit@debbugs.gnu.org; Mon, 04 Apr 2022 00:18:09 -0400 Received: from mail-qv1-f46.google.com ([209.85.219.46]:34363) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbEAE-000861-Ez for 54703@debbugs.gnu.org; Mon, 04 Apr 2022 00:18:03 -0400 Received: by mail-qv1-f46.google.com with SMTP id a5so6626378qvx.1 for <54703@debbugs.gnu.org>; Sun, 03 Apr 2022 21:18:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iT0LCXhxD/hH+A3sNKNmKlJ5U1Q1eH7e1lP00n6I/78=; b=k9N3We9ZEUNO1MIl55q703DU+nX+3culGqtn3bl6oEvJltQsdGEr48TWhbWB6oTCwk x6gy37ZFS1q4fpc4v/UJ5CTlMcSTX2I1uY7+/MHyYc9HozFLdcDEziAZxHXFDyKdkzwa etnecPttr+8WZuZTui3nqDR9OffaZuIG4UwgeX78cLRpxhFbR/J+cDdKiwUfLPmvhotz JY9Jb+hDyGrUD5SoKDsC9TM6ftxOII7gHIQu6aHlqNMM8gqwnxL72T07Z8rhsvjFtIwX L53mKJC9J49/6m/CZlHKUv27exNMFKNb1ajMHudwDXnAWJb+iBtKjm4HKH9NDyw5SrGP lOGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iT0LCXhxD/hH+A3sNKNmKlJ5U1Q1eH7e1lP00n6I/78=; b=pz1S3BKp0L+NbUP1g894Js9NynJuP4AKqUMeLJxr1nbmhKTjQy9bmmlt185L5lvcri uBEFQyiJqx1bCGrN4Hk5oB6wU/4SzoIkAe15dkuqZfql5sH0qe5MgeuTFqR2EbtO9aMW VtfbePdi+RnXQAec8R6zAlygBEsC+O7P0rUq3mPt0IjJ1uttvCgCYfvbagIdXI54Alof 2ssbmlszukdcvaujDpts/L+vENO81I9NUzOMzwnQ8ucmCroiWoQDoC3GFcWouaky77VR 8le6ZnfIfj0ROBT2fjC2IiSoFRgvaYE4fUB3enzZ2iaZYrR23E8Oi3fE6gtGxTPkhOgU hQSw== X-Gm-Message-State: AOAM533CTEPpb6qa9+7GfXiSJJHRxw8/+15Ycb68Kp8zu22b+kS1OXGC OSshW7CC3kS6eIXYJwOGtceIhj9wmrQ= X-Google-Smtp-Source: ABdhPJyRsEQrOQy1lLX5VehgZR/9hohIQ3DbP73b+5Tf2xNbq/Gjn08gpBaYkN/pOih0Qi8o9RneFg== X-Received: by 2002:a05:6214:29e4:b0:443:acd1:53bd with SMTP id jv4-20020a05621429e400b00443acd153bdmr12027160qvb.82.1649045876585; Sun, 03 Apr 2022 21:17:56 -0700 (PDT) Received: from localhost.localdomain (dsl-154-119.b2b2c.ca. [66.158.154.119]) by smtp.gmail.com with ESMTPSA id u13-20020a05622a010d00b002e1d653c2e1sm7642015qtw.46.2022.04.03.21.17.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Apr 2022 21:17:56 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 4 Apr 2022 00:17:42 -0400 Message-Id: <20220404041743.11131-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220404041743.11131-1-maxim.cournoyer@gmail.com> References: <20220404041743.11131-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/webkit.scm (webkitgtk): Update to 2.36.0. [source]: Remove the webkitgtk-bind-all-fonts.patch and webkitgtk-canonicalize-paths.patch patches. [arguments]: Use gexp. [tests?]: Add a TODO comment. [configure-flags]: Enable gamepad support, remove nonexistent USE_SYSTEMD option, enable accelerated 2D canvas and mini-browser. [phases]{do-not-disable-new-dtags}: New phase. {help-cmake-find-elogind}: Likewise. {patch-gtk-doc-scan}: Simplify to avoid for-each. Locate docbookx.dtd via search-input-file. {embed-absolute-wpebackend-reference}: Use search-input-file. [native-inputs]: Use new style. [inputs]: Likewise. Add elogind and libmanette. [description]: Adjust indentation. (webkitgtk-with-libsoup2): Re-format comment, fixing spacing. [configure-flags]: Use gexp. [propagated-inputs]: Use modify-inputs to replace libsoup with libsoup-minimal-2. * gnu/packages/patches/webkitgtk-bind-all-fonts.patch: Delete file. * gnu/packages/patches/webkitgtk-canonicalize-paths.patch: Likewise. * gnu/local.mk: De-register them. --- gnu/local.mk | 2 - .../patches/webkitgtk-bind-all-fonts.patch | 25 -- .../webkitgtk-canonicalize-paths.patch | 66 ----- gnu/packages/webkit.scm | 234 ++++++++++-------- 4 files changed, 126 insertions(+), 201 deletions(-) delete mode 100644 gnu/packages/patches/webkitgtk-bind-all-fonts.patch delete mode 100644 gnu/packages/patches/webkitgtk-canonicalize-paths.patch diff --git a/gnu/local.mk b/gnu/local.mk index aac7362475..7f9c2fe1a1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1931,9 +1931,7 @@ dist_patch_DATA = \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ %D%/packages/patches/vtk-fix-freetypetools-build-failure.patch \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ - %D%/packages/patches/webkitgtk-bind-all-fonts.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ - %D%/packages/patches/webkitgtk-canonicalize-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ diff --git a/gnu/packages/patches/webkitgtk-bind-all-fonts.patch b/gnu/packages/patches/webkitgtk-bind-all-fonts.patch deleted file mode 100644 index 27013180c4..0000000000 --- a/gnu/packages/patches/webkitgtk-bind-all-fonts.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream commit: https://github.com/WebKit/WebKit/commit/31ac354cbeecf866f9a38f7b2f8f59f7975d3f6a - -diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp -index ecc804663784..8de174be3c0e 100644 ---- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp -+++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp -@@ -288,6 +288,7 @@ static void bindFonts(Vector& args) - 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)); -@@ -304,6 +305,10 @@ static void bindFonts(Vector& args) - bindIfExists(args, fontHomeConfigDir.get()); - bindIfExists(args, fontData.get()); - bindIfExists(args, fontHomeData.get()); -+ for (auto* dataDir = dataDirs; dataDir && *dataDir; 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/patches/webkitgtk-canonicalize-paths.patch b/gnu/packages/patches/webkitgtk-canonicalize-paths.patch deleted file mode 100644 index 741d534831..0000000000 --- a/gnu/packages/patches/webkitgtk-canonicalize-paths.patch +++ /dev/null @@ -1,66 +0,0 @@ -Upstream commit: https://github.com/WebKit/WebKit/commit/6a87eb254ef57a986a1a6ce9a3a4b66928afeb65 - -diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp -index ecc804663784..a2a1c9d7a4dd 100644 ---- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp -+++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp -@@ -27,7 +27,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -165,6 +164,15 @@ enum class BindFlags { - Device, - }; - -+static void bindSymlinksRealPath(Vector& args, const char* path, const char* bindOption = "--ro-bind") -+{ -+ WTF::String realPath = FileSystem::realPath(path); -+ if (path != realPath) { -+ CString rpath = realPath.utf8(); -+ args.appendVector(Vector({ bindOption, rpath.data(), rpath.data() })); -+ } -+} -+ - static void bindIfExists(Vector& args, const char* path, BindFlags bindFlags = BindFlags::ReadOnly) - { - if (!path || path[0] == '\0') -@@ -177,7 +185,16 @@ static void bindIfExists(Vector& args, const char* path, BindFlags bind - bindType = "--ro-bind-try"; - else - bindType = "--bind-try"; -- args.appendVector(Vector({ bindType, path, path })); -+ -+ // Canonicalize the source path, otherwise a symbolic link could -+ // point to a location outside of the namespace. -+ bindSymlinksRealPath(args, path, bindType); -+ -+ // As /etc is exposed wholesale, do not layer extraneous bind -+ // directives on top, which could fail in the presence of symbolic -+ // links. -+ if (!g_str_has_prefix(path, "/etc/")) -+ args.appendVector(Vector({ bindType, path, path })); - } - - static void bindDBusSession(Vector& args, bool allowPortals) -@@ -410,17 +427,6 @@ static void bindV4l(Vector& args) - })); - } - --static void bindSymlinksRealPath(Vector& args, const char* path) --{ -- char realPath[PATH_MAX]; -- -- if (realpath(path, realPath) && strcmp(path, realPath)) { -- args.appendVector(Vector({ -- "--ro-bind", realPath, realPath, -- })); -- } --} -- - // Translate a libseccomp error code into an error message. libseccomp - // mostly returns negative errno values such as -ENOMEM, but some - // standard errno values are used for non-standard purposes where their diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index f79d6bd4f6..cd19404228 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -27,6 +27,7 @@ (define-module (gnu packages webkit) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix build utils) #:use-module (guix build-system cmake) @@ -41,6 +42,7 @@ (define-module (gnu packages webkit) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages games) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) @@ -239,121 +241,137 @@ (define-public wpewebkit (define-public webkitgtk (package (name "webkitgtk") - (version "2.34.6") + (version "2.36.0") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" "webkitgtk-" version ".tar.xz")) (sha256 (base32 - "1xn1hhd0qaxmjf6vy6664i4mmmjsw9zgrr4w8ni3415d981zvj3b")) - (patches (search-patches "webkitgtk-bind-all-fonts.patch" - "webkitgtk-adjust-bubblewrap-paths.patch" - "webkitgtk-canonicalize-paths.patch")))) + "0kf6avqlq9f74lwzji7l3xlnng5yqarc4ykwsmfmy8q5y6hwqxxq")) + (patches (search-patches + "webkitgtk-adjust-bubblewrap-paths.patch")))) (build-system cmake-build-system) (outputs '("out" "doc" "debug")) (arguments - `(#:tests? #f ; no tests - #:build-type "Release" ; turn off debugging symbols to save space - #:configure-flags (list - "-DPORT=GTK" - "-DENABLE_GTKDOC=ON" ; No doc by default - ;; Requires libmanette, new dependency added in 2.32.0. - ;; TODO Decide if we should enable this - "-DENABLE_GAMEPAD=OFF" - "-DUSE_SYSTEMD=OFF" - (string-append ; uses lib64 by default - "-DLIB_INSTALL_DIR=" - (assoc-ref %outputs "out") "/lib")) - #:make-flags - ;; Never build with unsupported -j1: https://issues.guix.gnu.org/47964#5 - (list "-j" (number->string (max 2 (parallel-job-count)))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'configure-bubblewrap-store-directory - (lambda _ - ;; This phase is a corollary to 'webkitgtk-share-store.patch' to - ;; avoid hard coding /gnu/store, for users with other prefixes. - (let ((store-directory (%store-directory))) - (substitute* - "Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp" - (("@storedir@") store-directory))))) - (add-after 'unpack 'patch-gtk-doc-scan - (lambda* (#:key inputs #:allow-other-keys) - (for-each (lambda (file) - (substitute* file - (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/docbookx.dtd")))) - (find-files "Source" "\\.sgml$")))) - (add-after 'unpack 'embed-absolute-wpebackend-reference - (lambda* (#:key inputs #:allow-other-keys) - (let ((wpebackend-fdo (assoc-ref inputs "wpebackend-fdo"))) - (substitute* "Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp" - (("libWPEBackend-fdo-([\\.0-9]+)\\.so" all version) - (string-append wpebackend-fdo "/lib/" all)))))) - ,@(if (target-x86-64?) - '() - '((add-after 'unpack 'disable-sse2 - (lambda _ - (substitute* "Source/cmake/WebKitCompilerFlags.cmake" - (("WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING") - "FALSE")))))) - (add-after 'install 'move-doc-files - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (mkdir-p (string-append doc "/share")) - (rename-file (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")))))))) + (list + #:tests? #f ;TODO: run test suite + #:build-type "Release" ;turn off debugging symbols to save space + #:configure-flags #~(list + "-DPORT=GTK" + "-DENABLE_GTKDOC=ON" ;disabled by default + "-DENABLE_ACCELERATED_2D_CANVAS=ON" ;disabled by default + "-DENABLE_MINIBROWSER=ON" ;disabled by default + ;; The default lib installation prefix is lib64. + (string-append "-DLIB_INSTALL_DIR=" #$output "/lib")) + ;; The build may fail with -j1 (see: + ;; https://bugs.webkit.org/show_bug.cgi?id=195251). + #:make-flags #~(list "-j" (number->string (max 2 (parallel-job-count)))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'configure-bubblewrap-store-directory + (lambda _ + ;; This phase is a corollary to 'webkitgtk-share-store.patch' to + ;; avoid hard coding /gnu/store, for users with other prefixes. + (let ((store-directory (%store-directory))) + (substitute* + "Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp" + (("@storedir@") store-directory))))) + (add-after 'unpack 'do-not-disable-new-dtags + ;; Ensure the linker uses new dynamic tags as this is what Guix + ;; uses and validates in the validate-runpath phase. + (lambda _ + (substitute* "Source/cmake/OptionsCommon.cmake" + (("if \\(LD_SUPPORTS_DISABLE_NEW_DTAGS\\)") + "if (FALSE)")))) + (add-after 'unpack 'help-cmake-find-elogind + (lambda _ + (substitute* "Source/cmake/FindJournald.cmake" + ;; Otherwise, CMake would throw an error because it relies on + ;; the pkg-config search to locate headers. + (("pkg_check_modules\\(PC_SYSTEMD QUIET libsystemd") + "pkg_check_modules(PC_SYSTEMD QUIET libelogind")))) + (add-after 'unpack 'patch-gtk-doc-scan + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (substitute* (find-files "Source" "\\.sgml$") + (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") + (search-input-file (or native-inputs inputs) + "xml/dtd/docbook/docbookx.dtd"))))) + (add-after 'unpack 'embed-absolute-wpebackend-reference + (lambda* (#:key inputs #:allow-other-keys) + (let ((wpebackend-fdo (assoc-ref inputs "wpebackend-fdo"))) + (substitute* "Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp" + (("libWPEBackend-fdo-[\\.0-9]+\\.so" all) + (search-input-file inputs (string-append "lib/" all))))))) + #$@(if (target-x86-64?) + '() + '((add-after 'unpack 'disable-sse2 + (lambda _ + (substitute* "Source/cmake/WebKitCompilerFlags.cmake" + (("WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING") + "FALSE")))))) + (add-after 'install 'move-doc-files + (lambda* (#:key outputs #:allow-other-keys) + (let ((doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file (string-append #$output "/share/gtk-doc") + (string-append doc "/share/gtk-doc"))))) + (replace 'build + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags))))))) (native-inputs - `(("bison" ,bison) - ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") ; for glib-mkenums, etc. - ("gobject-introspection" ,gobject-introspection) - ("gperf" ,gperf) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("gtk-doc" ,gtk-doc/stable) ; For documentation generation - ("docbook-xml" ,docbook-xml) ; For documentation generation - ("ruby" ,ruby))) + (list bison + gettext-minimal + `(,glib "bin") ;for glib-mkenums, etc. + gobject-introspection + gperf + perl + pkg-config + python-wrapper + gtk-doc/stable ;for documentation generation + docbook-xml ;for documentation generation + ruby)) (propagated-inputs (list gtk+ libsoup)) (inputs - `(("at-spi2-core" ,at-spi2-core) - ("bubblewrap" ,bubblewrap) - ("enchant" ,enchant) - ("geoclue" ,geoclue) - ("gst-plugins-base" ,gst-plugins-base) - ("gtk+-2" ,gtk+-2) - ("harfbuzz" ,harfbuzz) - ("hyphen" ,hyphen) - ("icu4c" ,icu4c) - ("lcms" ,lcms) - ("libgcrypt" ,libgcrypt) - ("libjpeg" ,libjpeg-turbo) - ("libnotify" ,libnotify) - ("libpng" ,libpng) - ("libseccomp" ,libseccomp) - ("libsecret" ,libsecret) - ("libtasn1" ,libtasn1) - ("libwebp" ,libwebp) - ("libwpe" ,libwpe) - ("libxcomposite" ,libxcomposite) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("libxt" ,libxt) - ("mesa" ,mesa) - ("openjpeg" ,openjpeg) - ("sqlite" ,sqlite) - ("woff2" ,woff2) - ("wpebackend-fdo" ,wpebackend-fdo) - ("xdg-dbus-proxy" ,xdg-dbus-proxy))) + (list at-spi2-core + bubblewrap + elogind + enchant + geoclue + gst-plugins-base + gtk+-2 + harfbuzz + hyphen + icu4c + lcms + libgcrypt + libjpeg-turbo + libmanette + libnotify + libpng + libseccomp + libsecret + libtasn1 + libwebp + libwpe + libxcomposite + libxml2 + libxslt + libxt + mesa + openjpeg + sqlite + woff2 + wpebackend-fdo + xdg-dbus-proxy)) (home-page "https://www.webkitgtk.org/") (synopsis "Web content engine for GTK+") - (description - "WebKitGTK+ is a full-featured port of the WebKit rendering engine, + (description "WebKitGTK+ is a full-featured port of the WebKit rendering engine, suitable for projects requiring any kind of web integration, from hybrid HTML/CSS applications to full-fledged web browsers. WebKitGTK+ video playing capabilities can be extended through the use of GStreamer plugins (not @@ -366,17 +384,17 @@ (define-public webkitgtk license:bsd-2 license:bsd-3)))) -;;; Required by gnome-online-accounts; as webkitgtk 2.34 propagates libsoup 3, -;;; which causes the build to fail. -;;; Also required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other -;;; Gnome packages for webkit2gtk-4.0. See also the upstream tracker for -;;; libsoup 3: https://gitlab.gnome.org/GNOME/libsoup/-/issues/218 +;;; Required by gnome-online-accounts as webkitgtk propagates libsoup 3, which +;;; causes the build to fail. Also required by e.g. emacs-next-pgtk, +;;; emacs-xwidgets, and some other GNOME packages for webkit2gtk-4.0. See +;;; also the upstream tracker for libsoup 3: +;;; https://gitlab.gnome.org/GNOME/libsoup/-/issues/218 (define-public webkitgtk-with-libsoup2 (package/inherit webkitgtk (name "webkitgtk-with-libsoup2") (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) - `(cons "-DUSE_SOUP2=ON" ,flags)))) + #~(cons "-DUSE_SOUP2=ON" #$flags)))) (propagated-inputs - (alist-replace "libsoup" (list libsoup-minimal-2) - (package-propagated-inputs webkitgtk))))) + (modify-inputs (package-propagated-inputs webkitgtk) + (replace "libsoup" libsoup-minimal-2))))) From patchwork Mon Apr 4 04:17:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 1367 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 32A7127BBEA; Mon, 4 Apr 2022 05:19:50 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A126727BBE9 for ; Mon, 4 Apr 2022 05:19:49 +0100 (BST) Received: from localhost ([::1]:47194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nbEBw-0006rt-QI for patchwork@mira.cbaines.net; Mon, 04 Apr 2022 00:19:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbEBD-0006fw-2c for guix-patches@gnu.org; Mon, 04 Apr 2022 00:19:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nbEBC-00048X-PE for guix-patches@gnu.org; Mon, 04 Apr 2022 00:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nbEBC-00088Q-LX for guix-patches@gnu.org; Mon, 04 Apr 2022 00:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54703] [PATCH 3/3] gnu: wpewebkit: Update to 2.36.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Apr 2022 04:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54703 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54703@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 54703-submit@debbugs.gnu.org id=B54703.164904589031197 (code B ref 54703); Mon, 04 Apr 2022 04:19:02 +0000 Received: (at 54703) by debbugs.gnu.org; 4 Apr 2022 04:18:10 +0000 Received: from localhost ([127.0.0.1]:50136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbEAL-000871-SD for submit@debbugs.gnu.org; Mon, 04 Apr 2022 00:18:10 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:37649) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbEAH-00086H-9K for 54703@debbugs.gnu.org; Mon, 04 Apr 2022 00:18:05 -0400 Received: by mail-qt1-f178.google.com with SMTP id t19so6796645qtc.4 for <54703@debbugs.gnu.org>; Sun, 03 Apr 2022 21:18:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KO3iyYMJv7oI0Qvph42k5tT8Zq3fPdZtbFNyL2SbqMQ=; b=YL1AezzHj9T+rt6qmZGWP6Y5PR9yXFhHB9wkNnwHvnnz6DGv27PhctwvyyMDCgK0IY VZdPxiq0IAahnNApjW99w98sYKuiBD2RDLeEiu08r6myUYbCt/cx/APImua/IBZBxXjg xKatr1te5fZ6XDvJLn6VLwZybIvdLUAoea3NeQXGrNKK8AXA6c8Gk8oj04MidSQc/Gi+ LVtf1QVdwZukUqDayW5C+8koHyHu/t8WkJHWyTTGCCVhUXJD/9IMnLGFb29erXcAdMzV z14umbJrj/jsymh/mM/FnIjKUmPjuOuQYKoCflzJkkcQrmMWpuXw+ATt0U9JOS24pj5Q wcSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KO3iyYMJv7oI0Qvph42k5tT8Zq3fPdZtbFNyL2SbqMQ=; b=WY3VG3WMs4zb5q7ncMhhSVmj2s8EySa2V/QPavwqf8P1PB5YTGdhTEt4g4VRMru9Oo ogCkSgA8JXhOgArnNbGu+R5bg4bjeYxWq1SgTEdwhnAJcOSH63i6pA7n0ws2avRwwmkr KEXWIzKWy0ku1wQlIz7eRmQ4AvW91r52tUbUE2yY3wpbaWqh7iavKR4dSDwfOqxwL9ka uGLuZBjb5lGfuskx4WR2YxiPlPMvtoVbQ6LCdobBQ6fLzjfAVy/hSfq3cPbMAKp2n2D3 2BP5+YhzLJN15C4iHtEA/faL6VNzmsn3mUooXNRIryFLEW8YeSAHsJ+Y6/zSkkKM38NR clpQ== X-Gm-Message-State: AOAM530IODLhfWUT6WTiWGukhDYN8tb51hCq2+/MrjidJwKiS/v67GdV IGN5+fm2xvGhfY1n+7lIVgv7gW5coRE= X-Google-Smtp-Source: ABdhPJwYj+tRnMShvNwBEP9esd4OJm2xvlhvv3vLOdtbhBz0U/QkxiKQy5BfeAsW4qgVYzCGy8psCw== X-Received: by 2002:a05:622a:30a:b0:2e2:3029:6b8b with SMTP id q10-20020a05622a030a00b002e230296b8bmr16192622qtw.605.1649045879612; Sun, 03 Apr 2022 21:17:59 -0700 (PDT) Received: from localhost.localdomain (dsl-154-119.b2b2c.ca. [66.158.154.119]) by smtp.gmail.com with ESMTPSA id u13-20020a05622a010d00b002e1d653c2e1sm7642015qtw.46.2022.04.03.21.17.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Apr 2022 21:17:59 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 4 Apr 2022 00:17:43 -0400 Message-Id: <20220404041743.11131-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220404041743.11131-1-maxim.cournoyer@gmail.com> References: <20220404041743.11131-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/webkit.scm (wpewebkit): Update to 2.36.0, rewriting package to inherit from webkitgtk. --- gnu/packages/webkit.scm | 126 ++++------------------------------------ 1 file changed, 11 insertions(+), 115 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index cd19404228..bc3ae388f7 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -123,121 +123,6 @@ (define-public wpebackend-fdo engine that uses Wayland for graphics output.") (license license:bsd-2))) -(define-public wpewebkit - (package - (name "wpewebkit") - (version "2.34.3") - (source - (origin - (method url-fetch) - (uri - (string-append "https://wpewebkit.org/releases/" - name "-" version ".tar.xz")) - (sha256 - (base32 "1z20bza01ld4jvi0qx8xsl5y4czaniwpi8hxdjyirj1mrszy8pf3")))) - (build-system cmake-build-system) - (outputs '("out" "doc")) - (arguments - `(#:tests? #f ; XXX: To be enabled - #:configure-flags - (list - "-DPORT=WPE" - ;; XXX: To be enabled. - ;; "-DENABLE_ACCELERATED_2D_CANVAS=ON" - "-DUSE_SYSTEMD=OFF" - "-DENABLE_ENCRYPTED_MEDIA=OFF" - "-DENABLE_GTKDOC=ON" - "-DUSE_GSTREAMER_GL=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'setenv - (lambda _ - (setenv "HOME" "/tmp") - #t)) - (add-after 'unpack 'patch-docbook-xml - (lambda* (#:key inputs #:allow-other-keys) - (for-each - (lambda (file) - (substitute* file - (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/docbookx.dtd")))) - (find-files "Source" "\\.sgml$")) - #t)) - (add-after 'unpack 'patch-cmake - (lambda _ - (substitute* "Source/PlatformWPE.cmake" - (("(Documentation/wpe(-webextensions)?-)\\$\\{WPE_API_VERSION\\}" - all prefix) - (string-append prefix "${WPE_API_DOC_VERSION}")) - (("(html/wpe(-webextensions)?-)\\$\\{WPE_API_VERSION\\}" - all prefix) - (string-append prefix "${WPE_API_DOC_VERSION}"))))) - (add-after 'install 'move-doc-files - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (mkdir-p (string-append doc "/share")) - (rename-file - (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - #t)))))) - (native-inputs - `(("docbook-xml" ,docbook-xml-4.1.2) - ("docbook-xsl" ,docbook-xsl) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc/stable) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("python2" ,python-2.7) - ("ruby" ,ruby))) - (inputs - `(("atk" ,atk) - ("atk-bridge" ,at-spi2-atk) - ("bubblewrap" ,bubblewrap) - ("cairo" ,cairo) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("gperf" ,gperf) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) - ("harfbuzz" ,harfbuzz) - ("icu" ,icu4c) - ("lcms" ,lcms) - ("libepoxy" ,libepoxy) - ("libgcrypt" ,libgcrypt) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libseccomp" ,libseccomp) - ("libtasn1" ,libtasn1) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("mesa" ,mesa) - ("openjpeg" ,openjpeg) - ("sqlite" ,sqlite) - ("webp" ,libwebp) - ("woff2" ,woff2) - ("xdg-dbus-proxy" ,xdg-dbus-proxy) - ("zlib" ,zlib))) - (propagated-inputs - `(("glib" ,glib) - ("libsoup" ,libsoup) - ("wpe" ,libwpe))) - (synopsis "WebKit port optimized for embedded devices") - (description "WPE WebKit allows embedders to create simple and performant -systems based on Web platform technologies. It is designed with hardware -acceleration in mind, leveraging common 3D graphics APIs for best performance.") - (home-page "https://wpewebkit.org/") - (license - (list - ;; Rendering and JavaScript Engines. - license:lgpl2.1+ - ;; Others - license:bsd-2)) - (properties '((cpe-name . "wpe_webkit"))))) - (define-public webkitgtk (package (name "webkitgtk") @@ -398,3 +283,14 @@ (define-public webkitgtk-with-libsoup2 (propagated-inputs (modify-inputs (package-propagated-inputs webkitgtk) (replace "libsoup" libsoup-minimal-2))))) + +(define-public wpewebkit + (package + (inherit webkitgtk) + (name "wpewebkit") + (synopsis "WebKit port optimized for embedded devices") + (description "WPE WebKit allows embedders to create simple and performant +systems based on Web platform technologies. It is designed with hardware +acceleration in mind, leveraging common 3D graphics APIs for best performance.") + (home-page "https://wpewebkit.org/") + (properties '((cpe-name . "wpe_webkit")))))