From patchwork Thu Jul 14 14:08:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Danckaert X-Patchwork-Id: 40648 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 5506827BBEA; Thu, 14 Jul 2022 15:17:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 089E027BBE9 for ; Thu, 14 Jul 2022 15:17:58 +0100 (BST) Received: from localhost ([::1]:57072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBzfB-0000hB-4B for patchwork@mira.cbaines.net; Thu, 14 Jul 2022 10:17:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBzbP-00061X-E5 for guix-patches@gnu.org; Thu, 14 Jul 2022 10:14:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40774) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oBzbP-0003c5-1w for guix-patches@gnu.org; Thu, 14 Jul 2022 10:14:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oBzbO-00039F-Tw for guix-patches@gnu.org; Thu, 14 Jul 2022 10:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56557] [PATCH] k3b: Fix build Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Jul 2022 14:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56557 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56557@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165780803412062 (code B ref -1); Thu, 14 Jul 2022 14:14:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Jul 2022 14:13:54 +0000 Received: from localhost ([127.0.0.1]:38531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBzbG-00038S-AV for submit@debbugs.gnu.org; Thu, 14 Jul 2022 10:13:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:39912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBzbE-00038K-Dl for submit@debbugs.gnu.org; Thu, 14 Jul 2022 10:13:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBzbC-0005jz-EU for guix-patches@gnu.org; Thu, 14 Jul 2022 10:13:51 -0400 Received: from mail-108-mta61.mxroute.com ([136.175.108.61]:40319) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oBzb7-0003Zz-LN for guix-patches@gnu.org; Thu, 14 Jul 2022 10:13:48 -0400 Received: from filter006.mxroute.com ([140.82.40.27] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta61.mxroute.com (ZoneMTA) with ESMTPSA id 181fd0a41c10000261.001 for (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256); Thu, 14 Jul 2022 14:08:36 +0000 X-Zone-Loop: 0cc479e1a0a561501a8e1ed12cf03558b3be5f638326 X-Originating-IP: [140.82.40.27] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=thomasdanckaert.be; s=x; h=Content-Transfer-Encoding:Content-Type: Mime-Version:From:Subject:To:Message-Id:Date:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ohMTDcP5sdvj61OyZA2gtbA12X1h8l2B9CiKFelpIVM=; b=i08Av1U28TDEPFKTfulY59DVdp kS0aWOSJR3dtOxfOyDZbC1GwocImsgNljMMzwBkjaZg0OoQ6POws/rjhDtMZw85Kjz+0SmSmG/tOH iOx8qd1rw5RKG4xWWdNBd+p8BnzpLPpT4TrExrr1ovDDaXJoXuz3p9JpZvNH3hwsiP47u9kECCfsh C/K+luz03c/ET1mcHanukOucXSSpVB/gY2vl39p9xng/RolxamHT8n/BBBycViIS4qAUubzBiwlan DbLCTiC0nxIbSB70ezEaGkvOYy19ryk+Re1sL2964lxCLYnz7UJ+sFLK6TMZMKkMU5i6kK48VHJzZ oD1PpnsA==; Date: Thu, 14 Jul 2022 16:08:34 +0200 (CEST) Message-Id: <20220714.160834.663497267256384758.post@thomasdanckaert.be> Mime-Version: 1.0 X-AuthUser: post@thomasdanckaert.be Received-SPF: pass client-ip=136.175.108.61; envelope-from=post@thomasdanckaert.be; helo=mail-108-mta61.mxroute.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , X-Patchwork-Original-From: Thomas Danckaert via Guix-patches From: Thomas Danckaert Reply-To: Thomas Danckaert Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 From 7adc6413918b633c9879d08a8fce531d67416f85 Mon Sep 17 00:00:00 2001 From: Thomas Danckaert 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