GNU bug report logs - #56557
[PATCH] k3b: Fix build

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 56557 in the body.
You can then email your comments to 56557 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Thomas Danckaert <post <at> thomasdanckaert.be>
To: guix-patches <at> gnu.org
Subject: [PATCH] k3b: Fix build
Date: Thu, 14 Jul 2022 16:08:34 +0200 (CEST)

[Message part 1 (text/plain, inline)]

Hi reviewers,

k3b doesn't build anymore on current master due to a mix-up of CMake 
variables.  This patch fixes that.

It's probably a temporary issue because latest versions of k3b have 
updated CMakeLists, but updating to a newer k3b also requires 
updating all KDE Frameworks to version 5.88.  So I hope we can 
include the present fix for now.

It's been a while, hope this patch satisfies the requirements :-)

Sincerely,

Thomas

[0001-gnu-k3b-Fix-build.patch (text/x-patch, inline)]

From 7adc6413918b633c9879d08a8fce531d67416f85 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.danckaert <at> gmail.com>
Date: Thu, 14 Jul 2022 14:21:17 +0200
Subject: [PATCH 1/2] gnu: k3b: Fix build.

* gnu/packages/kde-multimedia.scm (k3b)[phases]: Add phase fix-cmake-taglib in
order to use correct Taglib include and library variables.
---
 gnu/packages/kde-multimedia.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 752f6b499c..bdbf325f15 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -373,6 +373,16 @@ (define-public k3b
                  (("\"(dvdcss)\"" _ library)
                   (string-append "\"" libdvdcss "/lib/" library "\""))))
              #t))
+         (add-before 'configure 'fix-cmake-taglib
+           (lambda _
+             ;; Use the CMake variables provided by FindTaglib from
+             ;; extra-cmake-modules, instead of bundled FindTaglib.cmake:
+             (substitute*
+                 '("plugins/decoder/mp3/CMakeLists.txt"
+                   "plugins/decoder/flac/CMakeLists.txt"
+                   "plugins/project/audiometainforenamer/CMakeLists.txt")
+               (("TAGLIB_INCLUDES") "Taglib_INCLUDE_DIRS")
+               (("TAGLIB_LIBRARIES") "Taglib_LIBRARIES"))))
          (add-after 'qt-wrap 'wrap-path
            (lambda* (#:key inputs outputs #:allow-other-keys)
              ;; Set paths to backend programs.
-- 
2.36.1

Message #8 received at 56557 <at> debbugs.gnu.org (full text, mbox):

From: Thomas Danckaert <post <at> thomasdanckaert.be>
To: 56557 <at> debbugs.gnu.org
Subject: [PATCH] gnu: k3b: Add inputs bash-minimal and cdrtools.
Date: Thu, 14 Jul 2022 16:19:25 +0200 (CEST)

[Message part 1 (text/plain, inline)]

Small improvement as a follow-up.  guix lint complained about the 
missing bash-minimal.

Thomas

[0002-gnu-k3b-Add-inputs-bash-minimal-and-cdrtools.patch (text/x-patch, inline)]

From 30b789b945a02e075d151a082bf30bf9fad3d006 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.danckaert <at> gmail.com>
Date: Thu, 14 Jul 2022 14:44:23 +0200
Subject: [PATCH 2/2] gnu: k3b: Add inputs bash-minimal and cdrtools.

* gnu/packages/kde-multimedia.scm (k3b)[inputs]: Add
bash-minimal (wrap-program is used), add cdrtools.
---
 gnu/packages/kde-multimedia.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index bdbf325f15..265dcef625 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -29,6 +29,7 @@ (define-module (gnu packages kde-multimedia)
   #:use-module (guix gexp)
   #:use-module (gnu packages)
   #:use-module (gnu packages audio)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cdrom)
   #:use-module (gnu packages docbook)
@@ -390,12 +391,14 @@ (define-public k3b
                `("PATH" ":" prefix
                  ,(map (lambda (input)
                          (string-append (assoc-ref inputs input) "/bin"))
-                       '("cdrdao" "dvd+rw-tools" "libburn" "sox"))))
+                       '("cdrdao" "cdrtools" "dvd+rw-tools" "libburn" "sox"))))
              #t)))))
     (native-inputs
      (list extra-cmake-modules pkg-config kdoctools))
     (inputs
-     (list cdrdao
+     (list bash-minimal
+           cdrdao
+           cdrtools
            dvd+rw-tools
            ffmpeg
            flac
-- 
2.36.1

Message #13 received at 56557-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Thomas Danckaert <post <at> thomasdanckaert.be>
Cc: 56557-done <at> debbugs.gnu.org
Subject: Re: bug#56557: [PATCH] k3b: Fix build
Date: Mon, 18 Jul 2022 15:54:02 +0200

Hi Thomas,

Long time no see, welcome back!  :-)

Thomas Danckaert <post <at> thomasdanckaert.be> skribis:

>>From 7adc6413918b633c9879d08a8fce531d67416f85 Mon Sep 17 00:00:00 2001
> From: Thomas Danckaert <thomas.danckaert <at> gmail.com>
> Date: Thu, 14 Jul 2022 14:21:17 +0200
> Subject: [PATCH 1/2] gnu: k3b: Fix build.
>
> * gnu/packages/kde-multimedia.scm (k3b)[phases]: Add phase fix-cmake-taglib in
> order to use correct Taglib include and library variables.

[...]

>>From 30b789b945a02e075d151a082bf30bf9fad3d006 Mon Sep 17 00:00:00 2001
> From: Thomas Danckaert <thomas.danckaert <at> gmail.com>
> Date: Thu, 14 Jul 2022 14:44:23 +0200
> Subject: [PATCH 2/2] gnu: k3b: Add inputs bash-minimal and cdrtools.
>
> * gnu/packages/kde-multimedia.scm (k3b)[inputs]: Add
> bash-minimal (wrap-program is used), add cdrtools.

Applied both, thanks!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.