GNU bug report logs - #62987
[PATCH] gnu: webkitgtk: Update 2.40.0 -> 2.40.1

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 62987 in the body.
You can then email your comments to 62987 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Karl Hallsby <karl <at> hallsby.com>
To: guix-patches <at> gnu.org
Cc: Karl Hallsby <karl <at> hallsby.com>
Subject: [PATCH] gnu: webkitgtk: Update 2.40.0 -> 2.40.1
Date: Thu, 20 Apr 2023 23:39:31 -0500

* 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 <maxim.cournoyer <at> gmail.com>
-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
-- 
2.38.1

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Karl Hallsby via Guix-patches via <guix-patches <at> gnu.org>
Cc: 62987-done <at> debbugs.gnu.org, Karl Hallsby <karl <at> hallsby.com>
Subject: Re: [bug#62987] [PATCH] gnu: webkitgtk: Update 2.40.0 -> 2.40.1
Date: Sun, 23 Apr 2023 11:32:14 -0400

On Thu, Apr 20, 2023 at 11:39:31PM -0500, Karl Hallsby via Guix-patches via wrote:
> * 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.

Thanks! I standardized the commit message and pushed as
44905f2795a83a4e4f7d80700497c09f2e9fef3a

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.