From unknown Sat Aug 16 23:42:25 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54703] [PATCH 0/3] Update webkitgtk to 2.36.0 and enable new features. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Apr 2022 04:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54703 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54703@debbugs.gnu.org Cc: Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164904576230953 (code B ref -1); Mon, 04 Apr 2022 04:17:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Apr 2022 04:16:02 +0000 Received: from localhost ([127.0.0.1]:50124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbE8H-00082y-P7 for submit@debbugs.gnu.org; Mon, 04 Apr 2022 00:16:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:33740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbE8F-00082j-NN for submit@debbugs.gnu.org; Mon, 04 Apr 2022 00:16:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbE8E-00060B-6N for guix-patches@gnu.org; Mon, 04 Apr 2022 00:15:59 -0400 Received: from [2607:f8b0:4864:20::f33] (port=41732 helo=mail-qv1-xf33.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nbE8A-0003Ol-QL for guix-patches@gnu.org; Mon, 04 Apr 2022 00:15:56 -0400 Received: by mail-qv1-xf33.google.com with SMTP id cs16so862451qvb.8 for ; Sun, 03 Apr 2022 21:15:53 -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=dq33d6INxmq2iaQ5Nsb3YQUXlPiGY+n1wX3mrvyAdas=; b=VqY6oUzq+bwfkEGBvYpq6wfmZVHAVhDuNA1GytCGBXiU5gzdr9pyIPWFFmyzxZuEhw RULiW0SUNBh4LYShxHx4uIygFZZ5UG1GtKgDb2zov05w5GI/GbY5ZdzxXPHjmsBbNIaP +txd+li3F2erUd2WzYmgkRNmkrYLl+R1+brjgWx57gMhZfqtn7ZOvM1UdweKzThrJQGR wEz04YNjo2Lv+1Vgi0FlplwYX79DrJMZ4CFkkmkwVWP1/4dsWX5rdSSatyeTT13rMZnK a/ddLwD9ndY4CRxk6jDm28YruVh441MQJErmo6KoxhXSD/8HARyvbicKLDZ1QCmcWTD6 4xIQ== 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=dq33d6INxmq2iaQ5Nsb3YQUXlPiGY+n1wX3mrvyAdas=; b=BHCx5OvRUhISIXdmwW16MvwP6dTpwvgRYVfvR5K1hUKGSq9TTuHTfYad928JOjwrNL fpvviyNxnXOXd2CPKnNIUc8uaPkS3rmWAeRKHA4KqPO/Bq3CKjTIMs2XA6NLy3y1z8mz vJtpbaYUYkF1QDqZHAO8ENLPoASflP4QbGYLpGuS1PvphFaR3unNy7SPh+N7BN4yM2aq 5mQCWFEjKCDBBned3i0AXKBUnA8wJvTuMrXoKPAkm2GE1WF9ve2NuJ9T3sy6rFYAh7/O /8xNYsHH5uwXL3PqSGcgB6Hs5xaojI95pBQdn4A99nPXBVEVCgQ5OXA5rViBOahvxzvZ rbSQ== X-Gm-Message-State: AOAM533MqVB2ci17ed1Yix1CHfnVR7RMQuNrMEAcGLSnH6wpWdeZfhqv r6ax+YPi00UINJsc0wR1YG64yRtQznI= X-Google-Smtp-Source: ABdhPJyZc2/fgOrQqxyQk8Z0qLUClgvwh7PnsFPlD6OgoKoIShJ6uC8BhnY3e6QzRSJ+MZBK6/vuoQ== X-Received: by 2002:a05:6214:e69:b0:441:75c6:92d with SMTP id jz9-20020a0562140e6900b0044175c6092dmr15849604qvb.99.1649045752409; Sun, 03 Apr 2022 21:15:52 -0700 (PDT) Received: from localhost.localdomain (dsl-154-119.b2b2c.ca. [66.158.154.119]) by smtp.gmail.com with ESMTPSA id d21-20020a05622a101500b002e07151139fsm8095645qte.17.2022.04.03.21.15.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Apr 2022 21:15:51 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 4 Apr 2022 00:15:21 -0400 Message-Id: <20220404041521.11010-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::f33 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::f33; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf33.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello, This started as a simple fix to woff2, but seeing it triggered a rebuild of webkitgtk, I decided to update it at the same time. Thank you! Maxim Cournoyer (3): gnu: woff2: Propagate brotli. gnu: webkitgtk: Update to 2.36.0 and enable extra features. gnu: wpewebkit: Update to 2.36.0. gnu/local.mk | 2 - gnu/packages/fontutils.scm | 9 +- .../patches/webkitgtk-bind-all-fonts.patch | 25 -- .../webkitgtk-canonicalize-paths.patch | 66 ---- gnu/packages/webkit.scm | 360 +++++++----------- 5 files changed, 141 insertions(+), 321 deletions(-) delete mode 100644 gnu/packages/patches/webkitgtk-bind-all-fonts.patch delete mode 100644 gnu/packages/patches/webkitgtk-canonicalize-paths.patch -- 2.34.0 From unknown Sat Aug 16 23:42:25 2025 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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).") -- 2.34.0 From unknown Sat Aug 16 23:42:25 2025 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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))))) -- 2.34.0 From unknown Sat Aug 16 23:42:25 2025 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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"))))) -- 2.34.0 From unknown Sat Aug 16 23:42:25 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54703] [PATCH 3/3] gnu: wpewebkit: Update to 2.36.0. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Apr 2022 06:16: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: Maxim Cournoyer , 54703@debbugs.gnu.org Received: via spool by 54703-submit@debbugs.gnu.org id=B54703.164905290310661 (code B ref 54703); Mon, 04 Apr 2022 06:16:02 +0000 Received: (at 54703) by debbugs.gnu.org; 4 Apr 2022 06:15:03 +0000 Received: from localhost ([127.0.0.1]:50275 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbFzT-0002lt-6f for submit@debbugs.gnu.org; Mon, 04 Apr 2022 02:15:03 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:6630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbFzP-0002l4-QD for 54703@debbugs.gnu.org; Mon, 04 Apr 2022 02:15:01 -0400 Received: from lprikler-laptop.ist.intra (gw.ist.tugraz.at [129.27.202.101]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4KX0qc1Lf8z1LWpd; Mon, 4 Apr 2022 08:14:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4KX0qc1Lf8z1LWpd DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1649052892; bh=tbj8Osuk6zTYXFm6Eudm1xQkQFrjbl5jVtr+hT2IVHE=; h=Subject:From:To:Date:In-Reply-To:References:From; b=HwwBt3QyVH588BFSMFnJ9RCkLKdOrq7susEvo4W8YtSPjgUrRB6c7zjK/Pe6cSbwF Ae2kctPNJHkwDkays45U38IK4Ha4oquSufSuJc08ql3w4qgzO7u2PQ5oXeSE6Hcw1G Zdo87KHlZfuh4Y8kyIqdKe10TAkQ7j/Chu7KurXU= Message-ID: From: Liliana Marie Prikler Date: Mon, 04 Apr 2022 08:14:51 +0200 In-Reply-To: <20220404041743.11131-3-maxim.cournoyer@gmail.com> References: <20220404041743.11131-1-maxim.cournoyer@gmail.com> <20220404041743.11131-3-maxim.cournoyer@gmail.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: waObeELIUl4ypBWmcn/8wQ 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 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Am Montag, dem 04.04.2022 um 00:17 -0400 schrieb Maxim Cournoyer: > * 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"))))) You're not packaging WPEWebkit here, you are packaging WebkitGTK and labelling it WPEWebkit. From unknown Sat Aug 16 23:42:25 2025 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: Tue, 05 Apr 2022 00:27: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: Liliana Marie Prikler Cc: 54703@debbugs.gnu.org Received: via spool by 54703-submit@debbugs.gnu.org id=B54703.16491183885067 (code B ref 54703); Tue, 05 Apr 2022 00:27:02 +0000 Received: (at 54703) by debbugs.gnu.org; 5 Apr 2022 00:26:28 +0000 Received: from localhost ([127.0.0.1]:53347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbX1f-0001Je-OT for submit@debbugs.gnu.org; Mon, 04 Apr 2022 20:26:27 -0400 Received: from mail-qt1-f173.google.com ([209.85.160.173]:35664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbX1d-0001JR-Nb for 54703@debbugs.gnu.org; Mon, 04 Apr 2022 20:26:26 -0400 Received: by mail-qt1-f173.google.com with SMTP id z19so9248372qtw.2 for <54703@debbugs.gnu.org>; Mon, 04 Apr 2022 17:26:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=ir/OPH2vF8s/wW2nvCvSbtsPyfgEXGgho/ASor47nrU=; b=AssOHBA6C5zYXt0ZQKKl79NMAvDDzPm+ST51W9Ivpk49hM1B+4FGBD++FewjM2xgg3 +cYXeckBbnHN+wXNely/qRR9ZSXeSGKRtJzc2DCA3bq+VQguCRElKx7R0Vmb1JhD1JFJ Kyml6MaR+VTLCRstbfkJ3affCSg2ytuQKRILtssRLZr0qnIkJs58HxsuoWV9jVHrAqsI Dc5lPG8JtsTypXhr7QhdMAuMJjBLSbfBzmb+su7kfdehOStXAOvqc5aJB/hYYV9/tZv1 Ucv4Rov3nrZa4nhN+eX0Sw9NGbH1lX0UawZOmnQjvRp1h9VnD0Cugw5unmXBQNehVS/M MfFA== 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:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=ir/OPH2vF8s/wW2nvCvSbtsPyfgEXGgho/ASor47nrU=; b=sq7Y/3fC7d8QNva7LLGlrhJWUZ7mKUdqbSK/8rSlIi4naFLqYvdaANSZTMG3Fy30lD uf7tDWcryfSly7bJtLUKnlOZ8iJjR4fISrjNqGvxUZG806ulB7QECOuAxsyYTGUdXiSg QPlLGwsfKJDUN6+CdAY57iiCW4tRDGfijo/ycpUvUNVf1B7eziwMpxWRris7qh96RSRW 5Q1OMzc5/Z5mupymBQBHZqVhFUTpdoU3/t5xwvFL2Ujgi0Fx+b0JSzKYXVnsqTQYslnu /A4KV9P8pX3cdA+qurWfM/C1Lv1rqfKZg1lRAemouIbhKkRbCwvQ0CjuWCNK2PU8flEw WgPA== X-Gm-Message-State: AOAM532r3DXO0bDE+Tbz8haaQQCJi8hxX5dVqn//ex70bM4zco9OsvPE xZvbkoPzTwXFMDkP6bmorJHXM/QBK+c= X-Google-Smtp-Source: ABdhPJxoz2TawPYvRM+u+ZNugLkjrMrLrrWub1DgScH8xFBQDS7n8B8uEZ6ZKyJFKP1alrgct5ZbTQ== X-Received: by 2002:ac8:5f0f:0:b0:2e2:2dd3:410f with SMTP id x15-20020ac85f0f000000b002e22dd3410fmr872115qta.344.1649118379843; Mon, 04 Apr 2022 17:26:19 -0700 (PDT) Received: from hurd (dsl-154-119.b2b2c.ca. [66.158.154.119]) by smtp.gmail.com with ESMTPSA id d189-20020a3768c6000000b0067b248d6b3bsm7061275qkc.46.2022.04.04.17.26.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 17:26:19 -0700 (PDT) From: Maxim Cournoyer References: <20220404041743.11131-1-maxim.cournoyer@gmail.com> <20220404041743.11131-3-maxim.cournoyer@gmail.com> Date: Mon, 04 Apr 2022 20:26:18 -0400 In-Reply-To: (Liliana Marie Prikler's message of "Mon, 04 Apr 2022 08:14:51 +0200") Message-ID: <87ilroz87p.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Liliana Marie Prikler writes: > Am Montag, dem 04.04.2022 um 00:17 -0400 schrieb Maxim Cournoyer: >> * gnu/packages/webkit.scm (wpewebkit): Update to 2.36.0, rewriting >> package to >> inherit from webkitgtk. [...] >> +(define-public wpewebkit >> +=C2=A0 (package >> +=C2=A0=C2=A0=C2=A0 (inherit webkitgtk) >> +=C2=A0=C2=A0=C2=A0 (name "wpewebkit") >> +=C2=A0=C2=A0=C2=A0 (synopsis "WebKit port optimized for embedded device= s") >> +=C2=A0=C2=A0=C2=A0 (description "WPE WebKit allows embedders to create = simple and >> performant >> +systems based on Web platform technologies.=C2=A0 It is designed with >> hardware >> +acceleration in mind, leveraging common 3D graphics APIs for best >> performance.") >> +=C2=A0=C2=A0=C2=A0 (home-page "https://wpewebkit.org/") >> +=C2=A0=C2=A0=C2=A0 (properties '((cpe-name . "wpe_webkit"))))) > You're not packaging WPEWebkit here, you are packaging WebkitGTK and > labelling it WPEWebkit. Hmm, indeed :-) Thanks for catching that. A v2 will follow. Thank you! Maxim From unknown Sat Aug 16 23:42:25 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54703] [PATCH v2 1/3] gnu: woff2: Propagate brotli. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Apr 2022 00:28: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: liliana.prikler@ist.tugraz.at, Maxim Cournoyer Received: via spool by 54703-submit@debbugs.gnu.org id=B54703.16491184475192 (code B ref 54703); Tue, 05 Apr 2022 00:28:01 +0000 Received: (at 54703) by debbugs.gnu.org; 5 Apr 2022 00:27:27 +0000 Received: from localhost ([127.0.0.1]:53351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbX2d-0001Lf-1j for submit@debbugs.gnu.org; Mon, 04 Apr 2022 20:27:27 -0400 Received: from mail-qt1-f180.google.com ([209.85.160.180]:38423) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbX2b-0001LL-Rv for 54703@debbugs.gnu.org; Mon, 04 Apr 2022 20:27:26 -0400 Received: by mail-qt1-f180.google.com with SMTP id v2so9232036qtc.5 for <54703@debbugs.gnu.org>; Mon, 04 Apr 2022 17:27:25 -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=CtojCWmcoAxaMm3OmwZbix3XZNnUiU0Fh/S6Hk7rW1M=; b=qbJHYgGY0W/TLTFFmNKCkjQ4+arNX4mfW3mWyi57vkiUFqiHwMebgQLZ5NoiYtBb1T Q0A2aA57K8onnNvFIe2gpSqKVVgcALaQJX47Vw6/1o7E2fdH1p9Mc8R/MFpZ1s3aWu5n gSUCfwbqAiyrpcXmmq3zvIpKnEhAxbFyBZHwMzqxM0jAkEbl2CJELeyHmQ8N/QSOJMuz VTPkI6F7M4jP0LTpl8lGobTq/RbG8tQBaZJeizUAv3qJdVCjOANuHRf1zhiXZUS1twTB 7IZwje4/3a1vrQdyEPzuBoqywpZh2xRz0kyXqH637eqFmwCpbGgWExigvPaf0AucZSjy EalQ== 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=CtojCWmcoAxaMm3OmwZbix3XZNnUiU0Fh/S6Hk7rW1M=; b=5l3Ipjy1FrTtY29AlQCTFC/Q8e5RYGxShhqcZ91I71hN2uKKKb43GzHFntPPyw5LST Mi0XeIdTlLe57PlgH82hqQl8wT7IssZ4pMKfeOWicJjK8d+1Z5k5xr1BHTg4R9tU6Tc6 8xUKKSh3Sy54LQ8cl/L5lTzWrXYGBq3s7RKUEawegHymD4reY0zFma2+2ErY0dvR45EH ub2T0UxjS3vKHBPXMQhtlwsD5CIso7SyIRTH2nCqmu9X50cmmyuAcLyBgNy/ny1EzUbo opRr/k8xcx2/xwq9EGC8NN9gEB9yJvvJT5edudXCkNyk+oHIY/AJar5WPSHF5MWM7Bka L7UQ== X-Gm-Message-State: AOAM532HW8nXuClj5Pxnw449idZoThHiABeutvFHZookVAt7mXM4f0EY K9T1nPAzL94fJV8/wC+/DvUw9yfsLPV7JA== X-Google-Smtp-Source: ABdhPJxqwAGAnr/fBRH7KkwbXOEcTkKJK44rzjQ7lPcrP+RhaMtGTCnEPoEYvsjydq1b2ngIxYjBBA== X-Received: by 2002:ac8:4e46:0:b0:2e1:b933:ec06 with SMTP id e6-20020ac84e46000000b002e1b933ec06mr872667qtw.684.1649118440266; Mon, 04 Apr 2022 17:27:20 -0700 (PDT) Received: from localhost.localdomain (dsl-154-119.b2b2c.ca. [66.158.154.119]) by smtp.gmail.com with ESMTPSA id n10-20020a05622a040a00b002e315b9f08asm10315613qtx.35.2022.04.04.17.27.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 17:27:19 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 4 Apr 2022 20:27:03 -0400 Message-Id: <20220405002705.28218-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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).") -- 2.34.0 From unknown Sat Aug 16 23:42:25 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54703] [PATCH v2 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: Tue, 05 Apr 2022 00:28: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: liliana.prikler@ist.tugraz.at, Maxim Cournoyer Received: via spool by 54703-submit@debbugs.gnu.org id=B54703.16491184565220 (code B ref 54703); Tue, 05 Apr 2022 00:28:02 +0000 Received: (at 54703) by debbugs.gnu.org; 5 Apr 2022 00:27:36 +0000 Received: from localhost ([127.0.0.1]:53355 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbX2h-0001M3-Bq for submit@debbugs.gnu.org; Mon, 04 Apr 2022 20:27:36 -0400 Received: from mail-qt1-f171.google.com ([209.85.160.171]:46665) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbX2f-0001LU-1x for 54703@debbugs.gnu.org; Mon, 04 Apr 2022 20:27:30 -0400 Received: by mail-qt1-f171.google.com with SMTP id b18so9192830qtk.13 for <54703@debbugs.gnu.org>; Mon, 04 Apr 2022 17:27:29 -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=fQAsOWhyuetIv2s7+ynG3Pml6U9Cj7XGaRgNRe9421o=; b=Mo9soMQyYqHP1IpcXjP+EG5x+S5Ph1FQU+gl/MtC9Od3voCNR9vHUQL1In2bDPKZBq VGX+cpem71PcywFwbsq5H4TVxM6O1rYXf7K43aDEkMXGqly55L0aKcvi6xGWa7DH4TlJ feuGrmZ72KxPrcwe7EeyFw07yM3pcwrYdPHbRXCqGxWQhWpO2A65xJtOk5D2MuaapyXk Z70QdBrsPXChvl22zO63ryvL/DJHFh9SXKXKmn1zvawTloWtIVbB4ri321naSBmOztOH r8EpehDYBdZ1vyyqdT/O+SLpSDMKHIPg4MWXNSAI0SlBOdxsVIARpKblclnHORygDvb3 i1Uw== 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=fQAsOWhyuetIv2s7+ynG3Pml6U9Cj7XGaRgNRe9421o=; b=8KZQKGs+Ok/Lk5ZwXZFJJrpE006CzsDZOGn7H2plTBz2sFV1Ec0Pr7eAEbEWHkYRw5 0YSA4MdKbAbbd/rfhOq+l8VASRBU6y8JV2CJNUv7YlAx4uEYGMkK8fdG1/TN35Q0RDvQ P1aC8G8QV82pTmlTvcksz8hSTZrf4RJxNOTr33v2izJ9+dJQODfw//BX+WJS7mWHAw7k 8rPdU7B3eU9pbTym/EYwUiBnO0kzpDGJVX1d4crktQHjss46vMn9fxAcg327DKrvlffR +Ycvxpr8lvHdbLeqqehIM0K8o91FRdWKBwepOCt2lZ2QJ0UaUtkmBCEAcDPAh+mGTp+u 7EKQ== X-Gm-Message-State: AOAM533d/tD2AZBv9V2UjiPZZ5QlAdA0t6wha4Y0SKQtIdOfOXerzbri j2oLCwQWgolXw3WDKHhE/fODvN4vUhhgPA== X-Google-Smtp-Source: ABdhPJyNgdJq1EUkGkRRDT1Oghj1fk4PV2DwiuD1ZHUyby4Bq/VWuDAKnsQXf3lfPbbh6rn+a+wi4w== X-Received: by 2002:ac8:5f10:0:b0:2e1:ee89:9cc with SMTP id x16-20020ac85f10000000b002e1ee8909ccmr864298qta.327.1649118443172; Mon, 04 Apr 2022 17:27:23 -0700 (PDT) Received: from localhost.localdomain (dsl-154-119.b2b2c.ca. [66.158.154.119]) by smtp.gmail.com with ESMTPSA id n10-20020a05622a040a00b002e315b9f08asm10315613qtx.35.2022.04.04.17.27.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 17:27:22 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 4 Apr 2022 20:27:04 -0400 Message-Id: <20220405002705.28218-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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?]: Update comment. [build-type]: Add explanatory 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 | 232 ++++++++++-------- 4 files changed, 124 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..f453372b1e 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,135 @@ (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 + ;; The release archive doesn't include the resources/sources needed to + ;; run the various regression tests. + #:tests? #f + ;; When building using the default RelWithDebInfo build type, the final + ;; binaries require 20 GiB of memory to link (even with ld.gold or lld) + ;; and produce 4.6 GiB of debug symbols. + #:build-type "Release" + #: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")))))))) (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 +382,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))))) -- 2.34.0 From unknown Sat Aug 16 23:42:25 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54703] [PATCH v2 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: Tue, 05 Apr 2022 00:28: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: liliana.prikler@ist.tugraz.at, Maxim Cournoyer Received: via spool by 54703-submit@debbugs.gnu.org id=B54703.16491184575228 (code B ref 54703); Tue, 05 Apr 2022 00:28:02 +0000 Received: (at 54703) by debbugs.gnu.org; 5 Apr 2022 00:27:37 +0000 Received: from localhost ([127.0.0.1]:53357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbX2m-0001ME-QD for submit@debbugs.gnu.org; Mon, 04 Apr 2022 20:27:37 -0400 Received: from mail-qt1-f179.google.com ([209.85.160.179]:35742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbX2g-0001LX-DB for 54703@debbugs.gnu.org; Mon, 04 Apr 2022 20:27:30 -0400 Received: by mail-qt1-f179.google.com with SMTP id z19so9249980qtw.2 for <54703@debbugs.gnu.org>; Mon, 04 Apr 2022 17:27:30 -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=+l3r0SE+r3ZP6xyD73PmTZMgOfAPL1XxBAB9V5IAPSU=; b=ZJv8bbbD8QbgluYihigQTEGWHUfawxLqLunoCpnYKZAUZdVomNI1X/sdxkMxw0mtSP lViNWjnaUPu51lHOI1cC3rVNhBxLFhDKmfFZG3tptfk4rHd8KfsXONy59WBazMTWlY1M 3GhkLly1A6ZDYOxBPp0gBE52+qSPSxrPEmX9knhWGcumAOWMs+ZXV84pdU4M70+Rm4fS ju3uYrZ5qQ9JfmRA5SFRksERKxN7TKK+dh0kWtUX24LCgh9jN+nfEc7Q0jxg6NfR3Jg0 tuM+gtRjy7e9W/cwZucl1P9o+27Wc0vJKiIVx1B2uBGT8B2hArdV9l3gKZY11Z6C/Vbt wI5g== 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=+l3r0SE+r3ZP6xyD73PmTZMgOfAPL1XxBAB9V5IAPSU=; b=L7vaV+jPFKt9TrW0FKPVIODvNkN3uq6mNSMNcXWDRqs3rnuVQjvxiyAwaciZzBlUCQ dRXrFId1kgDqk1acHqOICLSY53y1oU2/p9Ca/kSiBOT2/64w2sBBck7UPFkDh8cmT7J5 rIqvUTSrFIiegTtLJWJzqRWYql63B0NbWsa3bXvwMu9Mtj5JIury05c4zsQ/o5cFcUwS 4DSseJDBa/x3JRQRRHh7ybAIZSWILtzo5kFTG85Uxx9wAwPOmCnTj11FA/Bi3VF0IynZ 9jnWTUzCer3ZLYDho0xeL/utpgFw+2Y+2QL8TpKIvcVAKV6IGHGDU3nNawS+dyQR1586 VZwg== X-Gm-Message-State: AOAM530skw5m8QEKSag8qTX5W/CTjErDTCawJ0NAbmoYwW/us7+jU9/W Qv+XGD/b4Pca90wqp+cAqdtfMBeuoN1lKg== X-Google-Smtp-Source: ABdhPJys9qOWDAajjDKJDLhr/k0fAHeRYA4qL34BjoU4Mx/UQhqrLdBqIB2lCsOZuswREtbwWiSYjA== X-Received: by 2002:a05:622a:1a0b:b0:2e1:b574:f50b with SMTP id f11-20020a05622a1a0b00b002e1b574f50bmr894507qtb.156.1649118444769; Mon, 04 Apr 2022 17:27:24 -0700 (PDT) Received: from localhost.localdomain (dsl-154-119.b2b2c.ca. [66.158.154.119]) by smtp.gmail.com with ESMTPSA id n10-20020a05622a040a00b002e315b9f08asm10315613qtx.35.2022.04.04.17.27.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 17:27:24 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 4 Apr 2022 20:27:05 -0400 Message-Id: <20220405002705.28218-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/webkit.scm (%webkit-version): New variable. (wpewebkit): Update to 2.36.0, rewriting package to inherit from webkitgtk. (webkitgtk)[source]: Use %webkit-version, and adjust definition to match that of wpewebkit. --- gnu/packages/webkit.scm | 145 ++++++++-------------------------------- 1 file changed, 27 insertions(+), 118 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index f453372b1e..cfb80f591c 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -123,132 +123,18 @@ (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 %webkit-version "2.36.0") (define-public webkitgtk (package (name "webkitgtk") - (version "2.36.0") + (version %webkit-version) (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" - "webkitgtk-" version ".tar.xz")) + name "-" version ".tar.xz")) (sha256 - (base32 - "0kf6avqlq9f74lwzji7l3xlnng5yqarc4ykwsmfmy8q5y6hwqxxq")) + (base32 "0kf6avqlq9f74lwzji7l3xlnng5yqarc4ykwsmfmy8q5y6hwqxxq")) (patches (search-patches "webkitgtk-adjust-bubblewrap-paths.patch")))) (build-system cmake-build-system) @@ -396,3 +282,26 @@ (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") + (version %webkit-version) + (source (origin + (inherit (package-source webkitgtk)) + (uri (string-append "https://wpewebkit.org/releases/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0nkdx6pckbkhs85z3pidnh4cbp0wfa38lf2qyn0grywvgpwajsh9")))) + (arguments + (substitute-keyword-arguments (package-arguments webkitgtk) + ((#:configure-flags flags) + #~(cons "-DPORT=WPE" + (delete "-DPORT=GTK" #$flags))))) + (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"))))) -- 2.34.0 From unknown Sat Aug 16 23:42:25 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54703] [PATCH v2 2/3] gnu: webkitgtk: Update to 2.36.0 and enable extra features. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Apr 2022 06:00: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: Maxim Cournoyer , 54703@debbugs.gnu.org Received: via spool by 54703-submit@debbugs.gnu.org id=B54703.164913839022634 (code B ref 54703); Tue, 05 Apr 2022 06:00:01 +0000 Received: (at 54703) by debbugs.gnu.org; 5 Apr 2022 05:59:50 +0000 Received: from localhost ([127.0.0.1]:53585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbcEC-0005sp-Ai for submit@debbugs.gnu.org; Tue, 05 Apr 2022 01:59:50 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:3401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbcE8-0005sc-KX for 54703@debbugs.gnu.org; Tue, 05 Apr 2022 01:59:42 -0400 Received: from lprikler-laptop.ist.intra (gw.ist.tugraz.at [129.27.202.101]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4KXcRT6WdMz3xZC; Tue, 5 Apr 2022 07:59:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1649138374; bh=VObLNYLVRuwoyT6viXSHPsOGEZHx9obXio2Wj3cr6P4=; h=Subject:From:To:Date:In-Reply-To:References; b=GNxGYCw5P01OvJ5cKImpYjQpg8iYB/6fVB4jTqVoUOoTLXqGBXKnlUh/chUBsA85y wHVrELbrWRv84PA+7l5PvJGiYWH9dZndq34juAOiuBtYOAK4OTltsZ8A4g7lbG/xq3 nETlFfnGPUA750P4por+QkS45H9LWfnjRdED2lkw= Message-ID: From: Liliana Marie Prikler Date: Tue, 05 Apr 2022 07:59:34 +0200 In-Reply-To: <20220405002705.28218-2-maxim.cournoyer@gmail.com> References: <20220405002705.28218-2-maxim.cournoyer@gmail.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: waObeELIUl4ypBWmcn/8wQ 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 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Montag, dem 04.04.2022 um 20:27 -0400 schrieb Maxim Cournoyer: > * gnu/packages/webkit.scm (webkitgtk): Update to 2.36.0. > [source]: Remove the webkitgtk-bind-all-fonts.patch and > webkitgtk-canonicalize-paths.patch patches. I assume they were upstreamed? > [arguments]: Use gexp. > [tests?]: Update comment. > [build-type]: Add explanatory 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                       | 232 ++++++++++------ > -- >  4 files changed, 124 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..f453372b1e 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,135 @@ (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 > +      ;; The release archive doesn't include the resources/sources > needed to > +      ;; run the various regression tests. > +      #:tests? #f > +      ;; When building using the default RelWithDebInfo build type, > the final > +      ;; binaries require 20 GiB of memory to link (even with > ld.gold or lld) > +      ;; and produce 4.6 GiB of debug symbols. > +      #:build-type "Release" > +      #: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 Rather than saying "disabled by default" we should probably say why we're enabling them if upstream thinks that's unwise to do. > +                           ;; 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. That patch no longer exists AFAICS, so the comment needs to be updated. > +              (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")))))))) >      (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 I think "for documentation" would be enough here. Small nitpick: What's it with all the lacking spaces after the semicolons? > +           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 +382,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))))) Otherwise LGTM. You might however want to wait for more comments, particularly lfam's security advice :) From unknown Sat Aug 16 23:42:25 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54703] [PATCH v3 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: Sat, 09 Apr 2022 14:43: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: liliana.prikler@ist.tugraz.at, Maxim Cournoyer Received: via spool by 54703-submit@debbugs.gnu.org id=B54703.164951536710219 (code B ref 54703); Sat, 09 Apr 2022 14:43:01 +0000 Received: (at 54703) by debbugs.gnu.org; 9 Apr 2022 14:42:47 +0000 Received: from localhost ([127.0.0.1]:38428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndCIY-0002el-Ue for submit@debbugs.gnu.org; Sat, 09 Apr 2022 10:42:47 -0400 Received: from mail-qk1-f169.google.com ([209.85.222.169]:35506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndCIX-0002eW-Rk for 54703@debbugs.gnu.org; Sat, 09 Apr 2022 10:42:46 -0400 Received: by mail-qk1-f169.google.com with SMTP id t207so5685611qke.2 for <54703@debbugs.gnu.org>; Sat, 09 Apr 2022 07:42:45 -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=lIXilkIWpvqUSXxIlZk8AV5t1nvF0aJUPdnofI59BkOZKFbGrgD2dbBCPeTS9T7WeR bKdabmeq0fQopSBAx5iaVt5Fc6hjYykgoBpQnjuB6a+dalmBcc8wk0T1g790jlHqSOid qaXCwnFMv+4BRPZD3StDMZs2z+x+UKpPxslqn7suUrPrXoxGsfHCKpwrTIKUWVzUs3uT ew8F5il3fsdVno3WGumc8IZ5LzRqNM1KZcWQu9/nogc7zJ+XJw6cR8/7P/B8bX++Qbyu 3shoTbLg8ET9cl060zmuQpHUkrxlgxB5pyC9AMkMB0Mp6DawfEb6BCp2ogx8wEFb494D hQfQ== 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=Te2/N/rlpp7+8HaKMAkSKco7k8avA7yHgjqMUWKHJsKz4ToBASJWyX3bu/GXLX/afy s+6Lace6VmQkPNsw4pqwn5SK0mQ6VTubZzIk9MpLux+2uqMLKm5iP55JTtqTQzqFeDM0 X4ECEUDX56Jh2vBXGlnFEja4g89CI1rrk2BSdVhZULldSwx2FTTHY/Ivpkxr+/9ojFjc nnTve8aeog738xj6eLZNH580NVDC+VCwh39vKWO1IMmhqKzYQurKMGtZIZdoccJV+edf 2rOCP6jBI3d+UH+U46TXm+BmJIkvnABi+MBE/WeR8A4NeHGRfs0pMvo8EJCSdP+n4mrT zoag== X-Gm-Message-State: AOAM533ACW/cB8DprVEeWolrfBusA69Wo5PxzpbUPNeQH2OwJdMjR7kP kIyC+PAFLVCs55EUjvQ8IrPgUjU77mI= X-Google-Smtp-Source: ABdhPJwj7uC/7d2owMOWYzRCX2J64ucDgn5+R1cTw/gZqeruIqeO++DQ/eSc/hrbP32rh1fqxfZfIw== X-Received: by 2002:a05:620a:1a20:b0:67e:cf1:b42 with SMTP id bk32-20020a05620a1a2000b0067e0cf10b42mr16648320qkb.143.1649515359970; Sat, 09 Apr 2022 07:42:39 -0700 (PDT) Received: from localhost.localdomain (dsl-157-27.b2b2c.ca. [66.158.157.27]) by smtp.gmail.com with ESMTPSA id s12-20020a05622a018c00b002e1cd88645dsm20956746qtw.74.2022.04.09.07.42.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Apr 2022 07:42:39 -0700 (PDT) From: Maxim Cournoyer Date: Sat, 9 Apr 2022 10:42:18 -0400 Message-Id: <20220409144220.12158-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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).") -- 2.34.0 From unknown Sat Aug 16 23:42:25 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54703] [PATCH v3 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: Sat, 09 Apr 2022 14:43: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: liliana.prikler@ist.tugraz.at, Maxim Cournoyer Received: via spool by 54703-submit@debbugs.gnu.org id=B54703.164951538110261 (code B ref 54703); Sat, 09 Apr 2022 14:43:02 +0000 Received: (at 54703) by debbugs.gnu.org; 9 Apr 2022 14:43:01 +0000 Received: from localhost ([127.0.0.1]:38432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndCIf-0002f5-5U for submit@debbugs.gnu.org; Sat, 09 Apr 2022 10:43:01 -0400 Received: from mail-qk1-f171.google.com ([209.85.222.171]:41600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndCId-0002ej-Bz for 54703@debbugs.gnu.org; Sat, 09 Apr 2022 10:42:52 -0400 Received: by mail-qk1-f171.google.com with SMTP id 75so4254053qkk.8 for <54703@debbugs.gnu.org>; Sat, 09 Apr 2022 07:42:51 -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=vqNIER6NiZzIS/dCi3i+fNcDQjLICxVF9QZ93yuhhI8=; b=QlG8NsK7dbIlldaOPNUbSyefFaACEAI+cXS4h5NGRQpxbcACFOsZriqv5QVy/b5xG9 HXwdsRW0+Q45dSupRWcBvsHu0uuDUnKeuh5V1RISP4nhPCYuOUd0JLEwG1cN5AXCOfwi zc52tRN84eBzyMyaWuF4U/K5bdi58WPaHFY/TvxHv9turOeZFgR7El4DCl3v0Rc5qKjc DPTCjKkcgx/E5dB6uIVmDsshSkaUoOhyeJvrhGKNcE7LZvpW6/HfVODIsDQVuBrhI1mr Ik+pC3DGJapywugJx66pAza5gHxoBa5qB8PygiPrrkmQ0n01la0NjGR1HXZdo6wfbz8f lfYQ== 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=vqNIER6NiZzIS/dCi3i+fNcDQjLICxVF9QZ93yuhhI8=; b=C2vuwnqrFjT3temcVl10+BI4iUDSah7PLq2XTq7bntqXJweOIxfYCCqArFgbhmOtyJ pyNRgHPFWlj8kjQOVpqi4SkEfX0EbPBxx2/o/jOh/qvWgShNbmATc4a6Xsh6K38BOJlC 45GhZSOZqPfR3AueFMkYsHRFNXKZ3uJ2JhUIXgMQC0qyew0nlPhVu2OosRZnVRYyPF+j 4rY1FAyLRjtWrjNE8SHNtcuZUf0zCayYpKf1nJ7N30REHY56eEceyDtCh8wqggzSQ3KS K0vdSYUgREgjekabTltxFOoiprfnfikEo+XQDe3XmkK97QKPrR9ru3zYFkMV7gshcqdt XrjQ== X-Gm-Message-State: AOAM532D8aXTCFBrQzxEGzTrmU5obCaAMpKXH0u0FeyQiYAdMXIM0qn6 i4XGA1/NqHFGs5Bd750HK3/cljm9PJg= X-Google-Smtp-Source: ABdhPJzspNvAsXta7vx3VDkul9rddYwDC8yOzwpvwcNg+7Rlf6zVtRpmGSs2L+7q2CW0nBrIbn7M4Q== X-Received: by 2002:a05:620a:2404:b0:699:d171:ae5 with SMTP id d4-20020a05620a240400b00699d1710ae5mr16440062qkn.724.1649515365392; Sat, 09 Apr 2022 07:42:45 -0700 (PDT) Received: from localhost.localdomain (dsl-157-27.b2b2c.ca. [66.158.157.27]) by smtp.gmail.com with ESMTPSA id s12-20020a05622a018c00b002e1cd88645dsm20956746qtw.74.2022.04.09.07.42.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Apr 2022 07:42:45 -0700 (PDT) From: Maxim Cournoyer Date: Sat, 9 Apr 2022 10:42:19 -0400 Message-Id: <20220409144220.12158-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220409144220.12158-1-maxim.cournoyer@gmail.com> References: <20220409144220.12158-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.6 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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?]: Update com [...] Content analysis details: (1.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (maxim.cournoyer[at]gmail.com) 1.6 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: ambrevar.xyz (xyz)] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.222.171 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.222.171 listed in wl.mailspike.net] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.6 (/) * 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?]: Update comment. [build-type]: Add explanatory comment. [configure-flags]: Enable gamepad support, remove nonexistent USE_SYSTEMD option and enable 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 | 241 ++++++++++-------- 4 files changed, 132 insertions(+), 202 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 b842f311ab..b91e4939ee 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1929,9 +1929,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..9c87c02388 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Marius Bakke -;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021, 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -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,142 @@ (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 + ;; The release archive doesn't include the resources/sources needed to + ;; run the various regression tests. + #:tests? #f + ;; When building using the default RelWithDebInfo build type, the final + ;; binaries require 20 GiB of memory to link (even with ld.gold or lld) + ;; and produce 4.6 GiB of debug symbols. + #:build-type "Release" + #:configure-flags #~(list + "-DPORT=GTK" + ;; GTKDOC will be removed upstream soon in favor of + ;; gi-docgen; it is normally disabled because the + ;; doc is rather expensive to build. + "-DENABLE_GTKDOC=ON" + ;; The minibrowser, not built by default, is a good + ;; tool to validate the good operation of + ;; webkitgtk. + "-DENABLE_MINIBROWSER=ON" + ;; 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 works in tandem with + ;; webkitgtk-adjust-bubblewrap-paths.patch and avoids 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")))))))) (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 + ;; These are required to build the documentation. + gtk-doc/stable + docbook-xml + 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 +389,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))))) -- 2.34.0 From unknown Sat Aug 16 23:42:25 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54703] [PATCH v3 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: Sat, 09 Apr 2022 14:43: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: liliana.prikler@ist.tugraz.at, Maxim Cournoyer Received: via spool by 54703-submit@debbugs.gnu.org id=B54703.164951538210276 (code B ref 54703); Sat, 09 Apr 2022 14:43:02 +0000 Received: (at 54703) by debbugs.gnu.org; 9 Apr 2022 14:43:02 +0000 Received: from localhost ([127.0.0.1]:38434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndCIn-0002fS-E5 for submit@debbugs.gnu.org; Sat, 09 Apr 2022 10:43:01 -0400 Received: from mail-qk1-f172.google.com ([209.85.222.172]:33362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndCIe-0002es-Ec for 54703@debbugs.gnu.org; Sat, 09 Apr 2022 10:42:53 -0400 Received: by mail-qk1-f172.google.com with SMTP id s4so7076770qkh.0 for <54703@debbugs.gnu.org>; Sat, 09 Apr 2022 07:42:52 -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=r1uuLgo1iPimU8AaHV60gFmZeCNMTnQqHe3Z3LvEatM=; b=pgfAklWJeCq+mVN68kiH52fhe/KGHyPEpqt+dn9kU1gLEPHokODbuU109e6PSZ/CQ7 kWPKqVachk9eZQeojWnApMvWteBe7QtGHUvT4XCBpP/XrT1161DvNtKyyMKYZNFlLpfP kW3gx3SUhpzw20a3hA23Iz348JsG/at34T9u+Jun2hgIu+gpoH2Hme+2ico2jJofYmTG qlcDNWXgalqgB3PgzCTFYbGrxEuDcRG9H6HuEYAzlbLZTNoLWjpQvL68ltf5r5erxm+A zEoiAEVYBW+1YHrwfhufrApdq8/pflEfB5AoWkt592NQwxO0nJoFNDVzodD961n8D1Qs 2rrg== 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=r1uuLgo1iPimU8AaHV60gFmZeCNMTnQqHe3Z3LvEatM=; b=qFZOwybMXbPVTwwBFOLdLfaN3ABo1H7idOkp4gXbJCV6vef42Qxj6OWvpB402E2T5y qMUA76zOhGVK/qd3cS/gMyEljg66N9Ep8rttlLmgZPnrzIXM45hr7/rIZnQ9u7KnoG/T VAbWXpbGcebgE4OsVp11ZsIAaDPobeOgQuUQT1G8XLfkGvsbbZAQY4eV6cqRBT/OCbP3 pwR5NXSVWKbNkhgYv1mdj7LP52vQbEHDsOQVfd5rsbab+xleyNYnpssEfxwK37vLom5y Ct6hNKTTAd3WXiNHY2L1FSrmc7mAqvT1nN+Q/W7QpAHgW/7yoPaLRE9IIjxogKGpZcvZ DkfA== X-Gm-Message-State: AOAM5311UZ3hILqMtlkVDO3zAq2z3aBbivWZ9C0XoOKqWLWvOUgkcAoW MGmxHcvkbjRYPm7TWKTD0yg9WO4NCFQ= X-Google-Smtp-Source: ABdhPJw2isAMG1yGgxTDl3jBv86xRMl5HBFZ0dItvEIbCU5dsEylSlyC/AQ67KHoLN99wyjRYvkiug== X-Received: by 2002:a37:6004:0:b0:69b:dd65:3f36 with SMTP id u4-20020a376004000000b0069bdd653f36mr5073427qkb.487.1649515366722; Sat, 09 Apr 2022 07:42:46 -0700 (PDT) Received: from localhost.localdomain (dsl-157-27.b2b2c.ca. [66.158.157.27]) by smtp.gmail.com with ESMTPSA id s12-20020a05622a018c00b002e1cd88645dsm20956746qtw.74.2022.04.09.07.42.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Apr 2022 07:42:46 -0700 (PDT) From: Maxim Cournoyer Date: Sat, 9 Apr 2022 10:42:20 -0400 Message-Id: <20220409144220.12158-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220409144220.12158-1-maxim.cournoyer@gmail.com> References: <20220409144220.12158-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/webkit.scm (%webkit-version): New variable. (wpewebkit): Update to 2.36.0, rewriting package to inherit from webkitgtk. (webkitgtk)[source]: Use %webkit-version, and adjust definition to match that of wpewebkit. --- gnu/packages/webkit.scm | 145 ++++++++-------------------------------- 1 file changed, 27 insertions(+), 118 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 9c87c02388..476c33a1cd 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -123,132 +123,18 @@ (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 %webkit-version "2.36.0") (define-public webkitgtk (package (name "webkitgtk") - (version "2.36.0") + (version %webkit-version) (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" - "webkitgtk-" version ".tar.xz")) + name "-" version ".tar.xz")) (sha256 - (base32 - "0kf6avqlq9f74lwzji7l3xlnng5yqarc4ykwsmfmy8q5y6hwqxxq")) + (base32 "0kf6avqlq9f74lwzji7l3xlnng5yqarc4ykwsmfmy8q5y6hwqxxq")) (patches (search-patches "webkitgtk-adjust-bubblewrap-paths.patch")))) (build-system cmake-build-system) @@ -403,3 +289,26 @@ (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") + (version %webkit-version) + (source (origin + (inherit (package-source webkitgtk)) + (uri (string-append "https://wpewebkit.org/releases/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0nkdx6pckbkhs85z3pidnh4cbp0wfa38lf2qyn0grywvgpwajsh9")))) + (arguments + (substitute-keyword-arguments (package-arguments webkitgtk) + ((#:configure-flags flags) + #~(cons "-DPORT=WPE" + (delete "-DPORT=GTK" #$flags))))) + (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"))))) -- 2.34.0 From unknown Sat Aug 16 23:42:25 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Maxim Cournoyer Subject: bug#54703: closed (Re: bug#54703: [PATCH 0/3] Update webkitgtk to 2.36.0 and enable new features.) Message-ID: References: <87tuaxwood.fsf_-_@gmail.com> <20220404041521.11010-1-maxim.cournoyer@gmail.com> X-Gnu-PR-Message: they-closed 54703 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 54703@debbugs.gnu.org Date: Wed, 13 Apr 2022 05:15:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1649826902-26344-1" This is a multi-part message in MIME format... ------------=_1649826902-26344-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #54703: [PATCH 0/3] Update webkitgtk to 2.36.0 and enable new features. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 54703@debbugs.gnu.org. --=20 54703: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D54703 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1649826902-26344-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 54703-done) by debbugs.gnu.org; 13 Apr 2022 05:14:04 +0000 Received: from localhost ([127.0.0.1]:51286 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1neVKN-0006pQ-UB for submit@debbugs.gnu.org; Wed, 13 Apr 2022 01:14:04 -0400 Received: from mail-qv1-f41.google.com ([209.85.219.41]:44606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1neVKM-0006op-34 for 54703-done@debbugs.gnu.org; Wed, 13 Apr 2022 01:14:02 -0400 Received: by mail-qv1-f41.google.com with SMTP id ke15so795129qvb.11 for <54703-done@debbugs.gnu.org>; Tue, 12 Apr 2022 22:14:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=P50s/+5DIQyjdBuWRrk5t92sRZZTP6pHflnTKp+V+4M=; b=Fzgv1o9J252QKTeJ5MEPEKZCM6SqW83IUmq7TYY8vXW/eDf7i3cej3zbUYcNXI7QsA mydvMm+ybgvrSFSAQVIMeH2zmmGwYn1/WIcgbnoxeKZmi9x9mQWic7/IWluyAeoUpofb nynd1EdG4mtKpJmLLL6R64HwRV/urQ29MYBpS0hbU50Qgx1B/F2kdCbLxKyQnbSgtqa6 dupBmyjU4ApH+2KAx3+TkPtrvzFz+1P8P3REpECmaBtg2Aop5j52NgJR2seqZ9rIMFBX MZMAwki11JUJzYgebfVCfyGq4ZAM0rHo59eKU/Fhh8kI2bUqg0XQ6LaRcimjutJKbTUY qaRg== 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:references:date:in-reply-to :message-id:user-agent:mime-version; bh=P50s/+5DIQyjdBuWRrk5t92sRZZTP6pHflnTKp+V+4M=; b=oekyyhyzMmDj84UV7d1qM0Wo5ewtw7SqPlkPoyC4M016kqdvNm50z0kTGcz9p2Diz9 fUTSqQRNUuFxdja5V2nNevGGSAZM8FNr/dVqvmma/PK67R3/ZFD+2SrNg1OPEGEZLzFM mqKXuPzKq2UkoxFFhWAyrkUo0MlPss6B2SgF6WFQDyLon3IMbd5r4gt582Uu+haiW7lh OopPYsvmJKnqbeC5HM1b91YcvMXrclZbYtuB6920jWuk2WcalZ+MDi9KjXEhTwmcOEJt vdzHtgpmkv4ATvAKQAt8SvLQVjPCSksJ65rg4ZzD0B8u2zxQuTo24wVATmsg3VKoQ07i vmgQ== X-Gm-Message-State: AOAM530en6Iq2C56FCMyIVAeg3lbxvbgYoZw+SwWOsTQPvN3UoV9KYVa PD4Z4bIYW9AnHbBCKDrbpQMTo+si8qqyAg== X-Google-Smtp-Source: ABdhPJyaqwnG+4cdAnTsKh64baVFzcZANUHJ8bD6W0yDQnpSOeCKtS+CBKY7mHxRqM6e051+xc/c9w== X-Received: by 2002:a05:6214:118e:b0:444:548a:ca59 with SMTP id t14-20020a056214118e00b00444548aca59mr6910623qvv.85.1649826836579; Tue, 12 Apr 2022 22:13:56 -0700 (PDT) Received: from hurd (dsl-10-148-242.b2b2c.ca. [72.10.148.242]) by smtp.gmail.com with ESMTPSA id x20-20020ac85f14000000b002e1ee1c56c3sm29435642qta.76.2022.04.12.22.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 22:13:55 -0700 (PDT) From: Maxim Cournoyer To: 54703-done@debbugs.gnu.org Subject: Re: bug#54703: [PATCH 0/3] Update webkitgtk to 2.36.0 and enable new features. References: <20220409144220.12158-1-maxim.cournoyer@gmail.com> <20220409144220.12158-3-maxim.cournoyer@gmail.com> Date: Wed, 13 Apr 2022 01:13:54 -0400 In-Reply-To: <20220409144220.12158-3-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Sat, 9 Apr 2022 10:42:20 -0400") Message-ID: <87tuaxwood.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54703-done Cc: liliana.prikler@ist.tugraz.at X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Maxim Cournoyer writes: > * gnu/packages/webkit.scm (%webkit-version): New variable. > (wpewebkit): Update to 2.36.0, rewriting package to inherit from webkitgtk. > (webkitgtk)[source]: Use %webkit-version, and adjust definition to match that > of wpewebkit. I've gone ahead and submitted this series as 7bd5394bf8564920a4e647563dc8c0092858f8dd. Closing. Thank you! Maxim ------------=_1649826902-26344-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 4 Apr 2022 04:16:02 +0000 Received: from localhost ([127.0.0.1]:50124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbE8H-00082y-P7 for submit@debbugs.gnu.org; Mon, 04 Apr 2022 00:16:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:33740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbE8F-00082j-NN for submit@debbugs.gnu.org; Mon, 04 Apr 2022 00:16:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbE8E-00060B-6N for guix-patches@gnu.org; Mon, 04 Apr 2022 00:15:59 -0400 Received: from [2607:f8b0:4864:20::f33] (port=41732 helo=mail-qv1-xf33.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nbE8A-0003Ol-QL for guix-patches@gnu.org; Mon, 04 Apr 2022 00:15:56 -0400 Received: by mail-qv1-xf33.google.com with SMTP id cs16so862451qvb.8 for ; Sun, 03 Apr 2022 21:15:53 -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=dq33d6INxmq2iaQ5Nsb3YQUXlPiGY+n1wX3mrvyAdas=; b=VqY6oUzq+bwfkEGBvYpq6wfmZVHAVhDuNA1GytCGBXiU5gzdr9pyIPWFFmyzxZuEhw RULiW0SUNBh4LYShxHx4uIygFZZ5UG1GtKgDb2zov05w5GI/GbY5ZdzxXPHjmsBbNIaP +txd+li3F2erUd2WzYmgkRNmkrYLl+R1+brjgWx57gMhZfqtn7ZOvM1UdweKzThrJQGR wEz04YNjo2Lv+1Vgi0FlplwYX79DrJMZ4CFkkmkwVWP1/4dsWX5rdSSatyeTT13rMZnK a/ddLwD9ndY4CRxk6jDm28YruVh441MQJErmo6KoxhXSD/8HARyvbicKLDZ1QCmcWTD6 4xIQ== 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=dq33d6INxmq2iaQ5Nsb3YQUXlPiGY+n1wX3mrvyAdas=; b=BHCx5OvRUhISIXdmwW16MvwP6dTpwvgRYVfvR5K1hUKGSq9TTuHTfYad928JOjwrNL fpvviyNxnXOXd2CPKnNIUc8uaPkS3rmWAeRKHA4KqPO/Bq3CKjTIMs2XA6NLy3y1z8mz vJtpbaYUYkF1QDqZHAO8ENLPoASflP4QbGYLpGuS1PvphFaR3unNy7SPh+N7BN4yM2aq 5mQCWFEjKCDBBned3i0AXKBUnA8wJvTuMrXoKPAkm2GE1WF9ve2NuJ9T3sy6rFYAh7/O /8xNYsHH5uwXL3PqSGcgB6Hs5xaojI95pBQdn4A99nPXBVEVCgQ5OXA5rViBOahvxzvZ rbSQ== X-Gm-Message-State: AOAM533MqVB2ci17ed1Yix1CHfnVR7RMQuNrMEAcGLSnH6wpWdeZfhqv r6ax+YPi00UINJsc0wR1YG64yRtQznI= X-Google-Smtp-Source: ABdhPJyZc2/fgOrQqxyQk8Z0qLUClgvwh7PnsFPlD6OgoKoIShJ6uC8BhnY3e6QzRSJ+MZBK6/vuoQ== X-Received: by 2002:a05:6214:e69:b0:441:75c6:92d with SMTP id jz9-20020a0562140e6900b0044175c6092dmr15849604qvb.99.1649045752409; Sun, 03 Apr 2022 21:15:52 -0700 (PDT) Received: from localhost.localdomain (dsl-154-119.b2b2c.ca. [66.158.154.119]) by smtp.gmail.com with ESMTPSA id d21-20020a05622a101500b002e07151139fsm8095645qte.17.2022.04.03.21.15.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Apr 2022 21:15:51 -0700 (PDT) From: Maxim Cournoyer To: guix-patches@gnu.org Subject: [PATCH 0/3] Update webkitgtk to 2.36.0 and enable new features. Date: Mon, 4 Apr 2022 00:15:21 -0400 Message-Id: <20220404041521.11010-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::f33 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::f33; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf33.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello, This started as a simple fix to woff2, but seeing it triggered a rebuild of webkitgtk, I decided to update it at the same time. Thank you! Maxim Cournoyer (3): gnu: woff2: Propagate brotli. gnu: webkitgtk: Update to 2.36.0 and enable extra features. gnu: wpewebkit: Update to 2.36.0. gnu/local.mk | 2 - gnu/packages/fontutils.scm | 9 +- .../patches/webkitgtk-bind-all-fonts.patch | 25 -- .../webkitgtk-canonicalize-paths.patch | 66 ---- gnu/packages/webkit.scm | 360 +++++++----------- 5 files changed, 141 insertions(+), 321 deletions(-) delete mode 100644 gnu/packages/patches/webkitgtk-bind-all-fonts.patch delete mode 100644 gnu/packages/patches/webkitgtk-canonicalize-paths.patch -- 2.34.0 ------------=_1649826902-26344-1--