From: Karl Hallsby via Guix-patches via <guix-patches@gnu.org>
To: 62987@debbugs.gnu.org
Cc: Karl Hallsby <karl@hallsby.com>
Subject: [bug#62987] [PATCH] gnu: webkitgtk: Update 2.40.0 -> 2.40.1
Date: Thu, 20 Apr 2023 23:39:31 -0500 [thread overview]
Message-ID: <88773465b0027feaddcc3bd13f2b21b54e7f0dfd.1682051944.git.karl@hallsby.com> (raw)
* 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@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
next reply other threads:[~2023-04-21 4:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-21 4:39 Karl Hallsby via Guix-patches via [this message]
2023-04-23 15:32 ` [bug#62987] [PATCH] gnu: webkitgtk: Update 2.40.0 -> 2.40.1 Leo Famulari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=88773465b0027feaddcc3bd13f2b21b54e7f0dfd.1682051944.git.karl@hallsby.com \
--to=guix-patches@gnu.org \
--cc=62987@debbugs.gnu.org \
--cc=karl@hallsby.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).