diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-25 09:19:30 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-28 20:15:14 -0400 |
| commit | 30f0fd2176f966a7dbce9b78e089d252b14dbdba (patch) | |
| tree | f761d1fca34bf084bd0f0e6c3de9bcb70defd354 /gnu/packages/patches | |
| parent | 9634b927a8401bc9d111b1405a53ff56c2d2d54a (diff) | |
gnu: webkitgtk: Update to 2.40.0.
The version is re-integrated with the package to allow 'guix refresh -l' to
work.
* gnu/packages/patches/webkitgtk-libelogind.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/webkit.scm (%webkit-version): Delete variable.
(webkitgtk): Update to 2.40.0. Apply new patch.
[arguments]: Add a CMAKE_CXX_FLAGS configure flag. Delete
help-cmake-find-elogind phase.
[native-inputs]: Add unifdef.
[inputs]: Remove gtk+-2. Add libavif.
(wpewebkit): Update to 2.40.0.
(webkitgtk-next) [inputs]: Remove now extraneous gtk+-2 deletion.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/webkitgtk-libelogind.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/gnu/packages/patches/webkitgtk-libelogind.patch b/gnu/packages/patches/webkitgtk-libelogind.patch new file mode 100644 index 0000000000..fa1fbc8783 --- /dev/null +++ b/gnu/packages/patches/webkitgtk-libelogind.patch @@ -0,0 +1,38 @@ +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 + |