* [bug#56557] [PATCH] k3b: Fix build
@ 2022-07-14 14:08 Thomas Danckaert via Guix-patches
2022-07-14 14:19 ` [bug#56557] [PATCH] gnu: k3b: Add inputs bash-minimal and cdrtools Thomas Danckaert via Guix-patches
2022-07-18 13:54 ` bug#56557: [PATCH] k3b: Fix build Ludovic Courtès
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Danckaert via Guix-patches @ 2022-07-14 14:08 UTC (permalink / raw)
To: 56557
[-- Attachment #1: Type: Text/Plain, Size: 437 bytes --]
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
[-- Attachment #2: 0001-gnu-k3b-Fix-build.patch --]
[-- Type: Text/X-Patch, Size: 1519 bytes --]
From 7adc6413918b633c9879d08a8fce531d67416f85 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.danckaert@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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#56557] [PATCH] gnu: k3b: Add inputs bash-minimal and cdrtools.
2022-07-14 14:08 [bug#56557] [PATCH] k3b: Fix build Thomas Danckaert via Guix-patches
@ 2022-07-14 14:19 ` Thomas Danckaert via Guix-patches
2022-07-18 13:54 ` bug#56557: [PATCH] k3b: Fix build Ludovic Courtès
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Danckaert via Guix-patches @ 2022-07-14 14:19 UTC (permalink / raw)
To: 56557
[-- Attachment #1: Type: Text/Plain, Size: 97 bytes --]
Small improvement as a follow-up. guix lint complained about the
missing bash-minimal.
Thomas
[-- Attachment #2: 0002-gnu-k3b-Add-inputs-bash-minimal-and-cdrtools.patch --]
[-- Type: Text/X-Patch, Size: 1549 bytes --]
From 30b789b945a02e075d151a082bf30bf9fad3d006 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.danckaert@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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#56557: [PATCH] k3b: Fix build
2022-07-14 14:08 [bug#56557] [PATCH] k3b: Fix build Thomas Danckaert via Guix-patches
2022-07-14 14:19 ` [bug#56557] [PATCH] gnu: k3b: Add inputs bash-minimal and cdrtools Thomas Danckaert via Guix-patches
@ 2022-07-18 13:54 ` Ludovic Courtès
1 sibling, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2022-07-18 13:54 UTC (permalink / raw)
To: Thomas Danckaert; +Cc: 56557-done
Hi Thomas,
Long time no see, welcome back! :-)
Thomas Danckaert <post@thomasdanckaert.be> skribis:
>>From 7adc6413918b633c9879d08a8fce531d67416f85 Mon Sep 17 00:00:00 2001
> From: Thomas Danckaert <thomas.danckaert@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@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’.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-18 14:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-14 14:08 [bug#56557] [PATCH] k3b: Fix build Thomas Danckaert via Guix-patches
2022-07-14 14:19 ` [bug#56557] [PATCH] gnu: k3b: Add inputs bash-minimal and cdrtools Thomas Danckaert via Guix-patches
2022-07-18 13:54 ` bug#56557: [PATCH] k3b: Fix build Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.