From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id zDxtOM7plV9peAAA0tVLHw (envelope-from ) for ; Sun, 25 Oct 2020 21:10:38 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id YOutM87plV9zBgAAbx9fmQ (envelope-from ) for ; Sun, 25 Oct 2020 21:10:38 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 730399401BC for ; Sun, 25 Oct 2020 21:10:38 +0000 (UTC) Received: from localhost ([::1]:50948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kWnHh-0003Vb-Dk for larch@yhetil.org; Sun, 25 Oct 2020 17:10:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWnH8-00037G-Hb for guix-patches@gnu.org; Sun, 25 Oct 2020 17:10:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kWnH8-0001Dk-7V for guix-patches@gnu.org; Sun, 25 Oct 2020 17:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kWnH8-00077s-2X for guix-patches@gnu.org; Sun, 25 Oct 2020 17:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44215] [PATCH 2/4] gnu: kpackage: Fix build errors in dependent packages. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Oct 2020 21:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44215 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44215@debbugs.gnu.org X-Debbugs-Original-To: 44215@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160366017927312 (code B ref -1); Sun, 25 Oct 2020 21:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Oct 2020 21:09:39 +0000 Received: from localhost ([127.0.0.1]:37836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWnGk-00076R-P4 for submit@debbugs.gnu.org; Sun, 25 Oct 2020 17:09:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:38548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWnGf-000761-To for submit@debbugs.gnu.org; Sun, 25 Oct 2020 17:09:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWnGf-0002w7-PY for guix-patches@gnu.org; Sun, 25 Oct 2020 17:09:33 -0400 Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:56951) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWnGd-0001BI-U9 for guix-patches@gnu.org; Sun, 25 Oct 2020 17:09:33 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4CK9Zf0wmfz1rvmJ; Sun, 25 Oct 2020 22:09:29 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4CK9Zd5qtGz1qryk; Sun, 25 Oct 2020 22:09:29 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id jQuzbrfhTuiy; Sun, 25 Oct 2020 22:09:28 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-49-174.dynamic.mnet-online.de [188.174.49.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Sun, 25 Oct 2020 22:09:28 +0100 (CET) Received: from thisbe.fritz.box (thisbe.fritz.box [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id E6BE4600A8; Sun, 25 Oct 2020 22:09:22 +0100 (CET) From: Hartmut Goebel Date: Sun, 25 Oct 2020 22:09:20 +0100 Message-Id: X-Mailer: git-send-email 2.21.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=2001:a60:0:28:0:1:25:1; envelope-from=h.goebel@crazy-compilers.com; helo=mail-out.m-online.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/25 17:09:30 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: ERY2UTEF811Z Fix build errors in dependent packages if PREFIX is different from ECM's PREFIX - which is the case in Guix. See for details. * gnu/packages/patches/plasma-framework-fix-KF5PackageMacros.cmake.patch: New file. * packages/kde-frameworks.scm (package)[source]: Use this patch. --- gnu/packages/kde-frameworks.scm | 3 ++- .../kpackage-fix-KF5PackageMacros.cmake.patch | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index cbcb8ff076..febdb1f4f0 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1963,7 +1963,8 @@ covers feedback and persistent events.") "03rp7p7i8ihz5wg58gjs638jk7xbszknfiy2j3r979snc57g95mv")) ;; Default to: external paths/symlinks can be followed by a ;; package - (patches (search-patches "kpackage-allow-external-paths.patch")))) + (patches (search-patches "kpackage-allow-external-paths.patch" + "kpackage-fix-KF5PackageMacros.cmake.patch")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) diff --git a/gnu/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch b/gnu/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch new file mode 100644 index 0000000000..d677f19a70 --- /dev/null +++ b/gnu/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch @@ -0,0 +1,25 @@ +From 668010ebc9fd84d9dc60f90b9a4ebf3c7054977f Mon Sep 17 00:00:00 2001 +From: Hartmut Goebel +Date: Sun, 25 Oct 2020 20:11:13 +0000 +Subject: [PATCH] Fix build errors if PREFIX is different from ECM's PREFIX. + +See for details. +--- + KF5PackageMacros.cmake | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/KF5PackageMacros.cmake b/KF5PackageMacros.cmake +index f4c1d1d..acd3798 100644 +--- a/KF5PackageMacros.cmake ++++ b/KF5PackageMacros.cmake +@@ -1,6 +1,5 @@ + +-find_package(ECM 1.6.0 CONFIG REQUIRED) +-include(${ECM_KDE_MODULE_DIR}/KDEInstallDirs.cmake) ++include(KDEInstallDirs) + + set(KPACKAGE_RELATIVE_DATA_INSTALL_DIR "kpackage") + +-- +GitLab + -- 2.21.3