From: Timotej Lazar <timotej.lazar@araneo.si>
To: 41911@debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar@araneo.si>
Subject: [bug#41911] [PATCH 3/5] gnu: k3b: Add inputs for libraries loaded at runtime.
Date: Wed, 17 Jun 2020 12:50:06 +0200 [thread overview]
Message-ID: <20200617105008.11348-3-timotej.lazar@araneo.si> (raw)
In-Reply-To: <20200617105008.11348-1-timotej.lazar@araneo.si>
Patch the source to load these from absolute paths. Actual loading is done by
the Qt library, so we cannot use k3b’s runpath.
* gnu/packages/kde-multimedia.scm (k3b)[inputs]: Add libcdio-paranoia and
libdvdcss.
[arguments]<#:phases>[set-absolute-library-paths]: New phase.
---
gnu/packages/kde-multimedia.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 654aecd858..9fab19f1f6 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -300,6 +300,19 @@ This package is part of the KDE multimedia module.")
(arguments
`(#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'set-absolute-library-paths
+ (lambda _
+ ;; Set absolute paths for dlopened libraries. We can’t use k3b’s
+ ;; runpath as they are loaded by the Qt library.
+ (let ((libcdio-paranoia (assoc-ref %build-inputs "libcdio-paranoia"))
+ (libdvdcss (assoc-ref %build-inputs "libdvdcss")))
+ (substitute* "libk3b/tools/k3bcdparanoialib.cpp"
+ (("\"(cdio_cdda|cdio_paranoia)\"" _ library)
+ (string-append "\"" libcdio-paranoia "/lib/" library "\"")))
+ (substitute* "libk3b/tools/k3blibdvdcss.cpp"
+ (("\"(dvdcss)\"" _ library)
+ (string-append "\"" libdvdcss "/lib/" library "\""))))
+ #t))
(add-after 'qt-wrap 'wrap-path
(lambda _
;; Set paths to backend programs.
@@ -335,6 +348,8 @@ This package is part of the KDE multimedia module.")
("kxmlgui" ,kxmlgui)
("lame" ,lame)
("libburn" ,libburn)
+ ("libcdio-paranoia" ,libcdio-paranoia)
+ ("libdvdcss" ,libdvdcss)
("libdvdread" ,libdvdread)
;; TODO: LibFuzzer
("libiconv" ,libiconv)
--
2.26.2
next prev parent reply other threads:[~2020-06-17 10:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 10:47 [bug#41911] [PATCH 0/5] Add missing inputs for k3b Timotej Lazar
2020-06-17 10:50 ` [bug#41911] [PATCH 1/5] gnu: Add cdrdao Timotej Lazar
2020-06-17 10:50 ` [bug#41911] [PATCH 2/5] gnu: k3b: Add inputs for external programs Timotej Lazar
2020-06-17 10:50 ` Timotej Lazar [this message]
2020-06-17 10:50 ` [bug#41911] [PATCH 4/5] gnu: k3b: Note the runtime dependency on udisks-service Timotej Lazar
2020-06-17 10:50 ` [bug#41911] [PATCH 5/5] gnu: k3b: Update to 20.04.2 Timotej Lazar
2020-06-21 15:41 ` bug#41911: [PATCH 0/5] Add missing inputs for k3b Ludovic Courtès
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=20200617105008.11348-3-timotej.lazar@araneo.si \
--to=timotej.lazar@araneo.si \
--cc=41911@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).