From patchwork Fri Apr 21 04:39:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Hallsby X-Patchwork-Id: 49341 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DA8D527BBE9; Fri, 21 Apr 2023 05:40:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8FB4327BBE2 for ; Fri, 21 Apr 2023 05:40:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppiZ2-0004dW-Bf; Fri, 21 Apr 2023 00:40:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppiZ1-0004cx-0p for guix-patches@gnu.org; Fri, 21 Apr 2023 00:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppiZ0-0001yj-NM for guix-patches@gnu.org; Fri, 21 Apr 2023 00:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ppiYz-0002RL-Vj for guix-patches@gnu.org; Fri, 21 Apr 2023 00:40:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62987] [PATCH] gnu: webkitgtk: Update 2.40.0 -> 2.40.1 Resent-From: Karl Hallsby Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Apr 2023 04:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62987 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62987@debbugs.gnu.org Cc: Karl Hallsby X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16820519879351 (code B ref -1); Fri, 21 Apr 2023 04:40:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Apr 2023 04:39:47 +0000 Received: from localhost ([127.0.0.1]:39063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppiYl-0002Ql-0Y for submit@debbugs.gnu.org; Fri, 21 Apr 2023 00:39:47 -0400 Received: from lists.gnu.org ([209.51.188.17]:44874) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppiYj-0002Qd-QZ for submit@debbugs.gnu.org; Fri, 21 Apr 2023 00:39:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppiYj-0004EE-9b for guix-patches@gnu.org; Fri, 21 Apr 2023 00:39:45 -0400 Received: from mail-qt1-x831.google.com ([2607:f8b0:4864:20::831]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppiYh-0001tv-Bt for guix-patches@gnu.org; Fri, 21 Apr 2023 00:39:44 -0400 Received: by mail-qt1-x831.google.com with SMTP id d75a77b69052e-3e8eaa02e17so8270091cf.2 for ; Thu, 20 Apr 2023 21:39:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hallsby.com; s=google; t=1682051982; x=1684643982; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=HMZbkmNRJmAIuAlZ+SJpCf/MiWqiVOR8+bxR0vpiGQE=; b=I9fp4IiMMz1ylNDA4yQB2Exa5sByno7rfMgBhkYMspTpD3olAULnq/BPJqTxC+B22f hND6+FAO/hiGgKsnXSswJ+U9xjbTKgFUWQZQzhVsrEoBPu9/0WPbXfXYqIqG/hdZ0JYs Tmk0VMH1HBqDwNH7WidTpG0uLVqQGOvUU3auOOrgvMHP6HzYu7C+Mhg0Mj2r2L9Wsuzd vnT5GZmMdGs2hnJiRyodBB0DWE4CZkuHBxWYHOu0vSsYghSjwrbJPQKG7FFpaOcupyE/ auhgVzqdHiSrS0/EWN1wlcEEz/QY/VbSwGEcrmBCRV0wuSHYxTms6WUHT3mm8EabCGSI BNBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682051982; x=1684643982; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HMZbkmNRJmAIuAlZ+SJpCf/MiWqiVOR8+bxR0vpiGQE=; b=U+6oyiZxdGZsBvCdopFe7cHwGA2M9Jj9ZmFyah+tO/tu+qPntyIaVpeTh7MKsUViWf vrWoCtuvJNuxx5xECA1lV1TZGftII5GX8ZcbXEOjKKtnZEgSj5MkDAzgIVHpB4a4NgjA OPUDEUEGVJT9oxwDluKShMAGP8AWI/6L/aQTG7GGQ3t2KTP1PTWoV4ZKF4DK8jAYZ5yM EK0SiUgyFZmVl6nSBCy2T1/9dr3lZnNiioc3dWrI4nwdEM6XUtJfC6ORkthKzyS7U+rd 3jt4aTNlx3yu51tHhL/zkoWEtCIU81+svvPgBO5BK2bN1L6jUm1da/jngZmVF1pjldns L4sA== X-Gm-Message-State: AAQBX9fiIeneOIpPzWdooObDKZRJKNefR0BRH1aFlSGAYx9Z1F+rHe5J 1mI5xZRPpom307oNXO2f3Jthw+kL6Yjm5gpSlos= X-Google-Smtp-Source: AKy350bv8rzigmDfAFybAK+0K2Uaqxwc246O3oV1bALMLqX8ItiD+/Jco31s0MLGa5SF5IcFxTNCvg== X-Received: by 2002:ac8:7e89:0:b0:3ef:390d:1b4 with SMTP id w9-20020ac87e89000000b003ef390d01b4mr6117226qtj.9.1682051981937; Thu, 20 Apr 2023 21:39:41 -0700 (PDT) Received: from localhost.localdomain (1459483-v115.1145-static.batvilaa.metronetinc.net. [192.69.181.148]) by smtp.gmail.com with ESMTPSA id dm45-20020a05620a1d6d00b0074cf009f443sm1008327qkb.85.2023.04.20.21.39.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 21:39:41 -0700 (PDT) Date: Thu, 20 Apr 2023 23:39:31 -0500 Message-Id: <88773465b0027feaddcc3bd13f2b21b54e7f0dfd.1682051944.git.karl@hallsby.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::831; envelope-from=karl@hallsby.com; helo=mail-qt1-x831.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Karl Hallsby X-ACL-Warn: , Karl Hallsby via Guix-patches X-Patchwork-Original-From: Karl Hallsby via Guix-patches via From: Karl Hallsby Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/webkit.scm: Update webkitgtk version and remove libelogind patch. * gnu/packages/patches/webkitgtk-libelogind.patch: Remove. This change was upstreamed in commit 6dcdac4b3d5. --- gnu/local.mk | 1 - .../patches/webkitgtk-libelogind.patch | 38 ------------------- gnu/packages/webkit.scm | 7 ++-- 3 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 gnu/packages/patches/webkitgtk-libelogind.patch diff --git a/gnu/local.mk b/gnu/local.mk index 01ffe3fdb6..b31c9afe81 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2006,7 +2006,6 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ - %D%/packages/patches/webkitgtk-libelogind.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ diff --git a/gnu/packages/patches/webkitgtk-libelogind.patch b/gnu/packages/patches/webkitgtk-libelogind.patch deleted file mode 100644 index fa1fbc8783..0000000000 --- a/gnu/packages/patches/webkitgtk-libelogind.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8d46803c09edc2b6d4e35c778a3d2f90e5baad0b Mon Sep 17 00:00:00 2001 -From: Maxim Cournoyer -Date: Sat, 25 Mar 2023 22:55:16 -0400 -Subject: [PATCH] Fallback to elogind when systemd is unavailable at build time - https://bugs.webkit.org/show_bug.cgi?id=254475 - -Reviewed by NOBODY (OOPS!). - -The build system supports elogind, but it only considers the -'libsystemd' library name for the pkg-config lookup and not -'libelogind'. This change makes the build system fallback to search -for libelogind when libsystemd was not found. - -* Source/cmake/FindJournald.cmake [!PC_SYSTEMD_FOUND]: Search for libelogind. ---- - Source/cmake/FindJournald.cmake | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Source/cmake/FindJournald.cmake b/Source/cmake/FindJournald.cmake -index 18dd6b50908c..e0dc9ce1d397 100644 ---- a/Source/cmake/FindJournald.cmake -+++ b/Source/cmake/FindJournald.cmake -@@ -55,6 +55,10 @@ find_package(PkgConfig QUIET) - - # libelogind provides compatible pc and header files - pkg_check_modules(PC_SYSTEMD QUIET libsystemd) -+if (NOT PC_SYSTEMD_FOUND) -+ pkg_check_modules(PC_SYSTEMD QUIET libelogind) -+endif () -+ - set(Journald_COMPILE_OPTIONS ${PC_SYSTEMD_CFLAGS_OTHER}) - set(Journald_VERSION ${PC_SYSTEMD_VERSION}) - - -base-commit: 43ea8744bc6065aad7ae5988e32d31d253905e5f --- -2.39.2 - diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index e5eafcb142..5b2bac7b15 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -127,16 +127,15 @@ (define-public wpebackend-fdo (define-public webkitgtk (package (name "webkitgtk") ; webkit2gtk4 - (version "2.40.0") + (version "2.40.1") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "14xkgamqlshxqw6fcslvw0yzj4y5mvx66b6bn64rwrl9pyhpwq54")) + (base32 "1xky3cy4l5k0nj366pk17lrzy0n0k6plks9sy0g1dllc9yc2drb4")) (patches (search-patches - "webkitgtk-adjust-bubblewrap-paths.patch" - "webkitgtk-libelogind.patch")))) + "webkitgtk-adjust-bubblewrap-paths.patch")))) (build-system cmake-build-system) (outputs '("out" "doc" "debug")) (arguments