From: Julian Flake <flake@uni-koblenz.de>
To: 73428@debbugs.gnu.org
Cc: Julian Flake <flake@uni-koblenz.de>, Julian Flake <flake@uni-koblenz.de>
Subject: bug#73428: [PATCH] elogind update to 252.24
Date: Mon, 23 Sep 2024 23:43:23 +0200 [thread overview]
Message-ID: <2f3b1bcc5563fc367792d0a12e652c4a41100b74.1727127785.git.flake@uni-koblenz.de> (raw)
In-Reply-To: <8734lriktu.fsf@uni-koblenz.de>
This is an update to 252.24
Change-Id: Id1ab5f26a9296238724fd9873288ef5630d0a0b5
---
gnu/packages/freedesktop.scm | 6 +-
gnu/packages/patches/elogind-fix-rpath.patch | 60 --------------------
2 files changed, 3 insertions(+), 63 deletions(-)
delete mode 100644 gnu/packages/patches/elogind-fix-rpath.patch
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 993bb84ec6..e1e5e2663c 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -39,6 +39,7 @@
;;; Copyright © 2024 aurtzy <aurtzy@gmail.com>
;;; Copyright © 2024 Dariqq <dariqq@posteo.net>
;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
+;;; Copyright © 2024 Julian Flake <flake@uni-koblenz.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -772,7 +773,7 @@ (define-public libxdg-basedir
(define-public elogind
(package
(name "elogind")
- (version "252.9")
+ (version "252.24")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -781,8 +782,7 @@ (define-public elogind
(file-name (git-file-name name version))
(sha256
(base32
- "049cfv97975x700s7lx4p9i22nv6v7j046iwkspxba7kr5qq7akw"))
- (patches (search-patches "elogind-fix-rpath.patch"))))
+ "06hgcnhk6wbsnhkrqblw23q2x2b6bijzcnqjzfdv9xqzc94pha90"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags
diff --git a/gnu/packages/patches/elogind-fix-rpath.patch b/gnu/packages/patches/elogind-fix-rpath.patch
deleted file mode 100644
index 2a76cc467f..0000000000
--- a/gnu/packages/patches/elogind-fix-rpath.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Retrieved from https://github.com/elogind/elogind/issues/258
-
-From: Mark Hindley <mark@hindley.org.uk>
-Date: Wed, 24 May 2023 10:39:41 +0100
-Subject: Fixup_executable_rpath
-
-./meson.build sets
-
- install_rpath : rootlibexecdir
-
-however src/shared/meson.build sets
-
-libshared = shared_library(
- [snip]
- install_dir : rootpkglibdir
- )
----
- meson.build | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 694a2fd..a575f69 100644
---- a/meson.build
-+++ b/meson.build
-@@ -2903,7 +2903,7 @@ executable('elogind',
- dependencies : [threads,
- libacl,
- libudev],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootlibexecdir)
-
-@@ -2913,7 +2913,7 @@ exe = executable('loginctl',
- link_with : [libshared],
- dependencies : [threads,
- libudev],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootbindir)
- public_programs += [exe]
-@@ -2923,7 +2923,7 @@ exe = executable('elogind-inhibit',
- include_directories : includes,
- link_with : [libshared],
- dependencies : [threads],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootbindir)
- public_programs += [exe]
-@@ -4283,7 +4283,7 @@ executable('elogind-uaccess-command',
- libshared],
- dependencies: [libacl,
- libudev],
-- install_rpath : rootlibexecdir,
-+ install_rpath : rootpkglibdir,
- install : true,
- install_dir : rootlibexecdir)
- #endif // 0
base-commit: 41e408eb1f93d96b549d345e2de74143220b7b76
--
2.46.0
next prev parent reply other threads:[~2024-09-23 21:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-22 18:50 bug#73428: update elogind to 255 Julian Flake
2024-09-23 21:43 ` Julian Flake [this message]
2024-09-23 21:58 ` Julian Flake
2024-09-24 8:59 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
2024-09-24 9:02 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
2024-09-24 10:34 ` Julian Flake
2024-09-24 19:29 ` Julian Flake
2024-09-24 5:18 ` bug#73428: [PATCH v2 0/2] removed reference to deleted patch Julian Flake
2024-09-24 5:18 ` bug#73428: [PATCH v2 1/2] gnu: elogind update to 252.24 Julian Flake
2024-09-24 5:18 ` bug#73428: [PATCH v2 2/2] gnu: elogind: Remove unneeded rpath patch Julian Flake
2024-09-24 5:37 ` bug#73428: update elogind to 255 Julian Flake
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=2f3b1bcc5563fc367792d0a12e652c4a41100b74.1727127785.git.flake@uni-koblenz.de \
--to=flake@uni-koblenz.de \
--cc=73428@debbugs.gnu.org \
/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).