From patchwork Wed Jun 17 10:50:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 22758 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 97E5127BBE3; Wed, 17 Jun 2020 11:55:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3D93827BBE1 for ; Wed, 17 Jun 2020 11:55:24 +0100 (BST) Received: from localhost ([::1]:60594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlVj1-0000YK-Pc for patchwork@mira.cbaines.net; Wed, 17 Jun 2020 06:55:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlVep-0002Fm-KC for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38960) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlVeo-0003I9-Fh for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jlVeo-0001cB-F5 for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41911] [PATCH 3/5] gnu: k3b: Add inputs for libraries loaded at runtime. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Jun 2020 10:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41911 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41911@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 41911-submit@debbugs.gnu.org id=B41911.15923910226126 (code B ref 41911); Wed, 17 Jun 2020 10:51:02 +0000 Received: (at 41911) by debbugs.gnu.org; 17 Jun 2020 10:50:22 +0000 Received: from localhost ([127.0.0.1]:50501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlVe9-0001ae-ST for submit@debbugs.gnu.org; Wed, 17 Jun 2020 06:50:22 -0400 Received: from araneo.si ([90.157.193.204]:50812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlVe6-0001Zq-FN for 41911@debbugs.gnu.org; Wed, 17 Jun 2020 06:50:18 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 5edb3114 for <41911@debbugs.gnu.org>; Wed, 17 Jun 2020 10:50:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=20180623; bh=ZzF/Nzw1 YM0yskvzpocB4pfQKtM=; b=FqT0bHroPjdVttCiMUV9RJYJTfSfXPpcDCW/fP12 StVgbqzNdN0c2wwD/O828f58I0QIV4BeBDiabD3DtthRQ/xXOhTh4SZNduNN0ahF rGMtPpfUyeLmUHXopxV1yuk++ms465H+AFyWcXV2VwzBHCwbrYhoaoUzz7ROpXqd 1U8dCL04l2NhUxNEMFw6xD4Hz6aYaVNhTtCcH1YLKJLWkx8kRUUucTiV5AJl3azf KcGIpOEssePwTv+jLbbGKyDvYMmJoXhmoOtwuRlPYRsFrkDKZmLld668pEnLHOwy x6FA98FGM3uGylRwfCH575HEk2x+8cUTVg4zevUHQrE3lA== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 611276d0 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 17 Jun 2020 10:50:13 +0000 (UTC) From: Timotej Lazar Date: Wed, 17 Jun 2020 12:50:06 +0200 Message-Id: <20200617105008.11348-3-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200617105008.11348-1-timotej.lazar@araneo.si> References: <20200617105008.11348-1-timotej.lazar@araneo.si> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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)