From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZz2X-0003Nd-Hw for guix-patches@gnu.org; Thu, 20 Dec 2018 09:11:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZz2U-00042R-ES for guix-patches@gnu.org; Thu, 20 Dec 2018 09:11:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:51353) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gZz2U-00042M-Ap for guix-patches@gnu.org; Thu, 20 Dec 2018 09:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gZz2U-0002ZY-5W for guix-patches@gnu.org; Thu, 20 Dec 2018 09:11:02 -0500 Subject: [bug#33812] [PATCH 1/2] gnu: extra-cmake-modules: Fix install-path for plugins. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZz1p-0003I1-T4 for guix-patches@gnu.org; Thu, 20 Dec 2018 09:10:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZz1m-0003V7-PF for guix-patches@gnu.org; Thu, 20 Dec 2018 09:10:21 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:41289) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gZz1m-0003TQ-Gc for guix-patches@gnu.org; Thu, 20 Dec 2018 09:10:18 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43LDDS1DfPz1r02N for ; Thu, 20 Dec 2018 15:10:16 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43LDDS15dFz1qsJM for ; Thu, 20 Dec 2018 15:10:16 +0100 (CET) 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 XTwfUS_b7b_P for ; Thu, 20 Dec 2018 15:10:15 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-83-171-166-189.dynamic.mnet-online.de [83.171.166.189]) (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 for ; Thu, 20 Dec 2018 15:10:15 +0100 (CET) Received: from hermia.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 8E78D60198 for ; Thu, 20 Dec 2018 15:17:19 +0100 (CET) From: Hartmut Goebel Date: Thu, 20 Dec 2018 15:17:19 +0100 Message-Id: <20181220141719.19950-1-h.goebel@crazy-compilers.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33812@debbugs.gnu.org The respective entry changed for kde-frameworks 5.46. * gnu/packages/kde-frameworks.scm(krunner)[#phases]: Change substitute for QTPLUGINDIR. --- gnu/packages/kde-frameworks.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 49c986483..8997f0522 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -98,8 +98,10 @@ (("\"lib64\"") "\"lib\"") ;; TODO: Base the following on values taken from Qt ;; Install plugins into lib/qt5/plugins - (("_define_relative\\(QTPLUGINDIR LIBDIR \"plugins\"") - "_define_relative(QTPLUGINDIR LIBDIR \"qt5/plugins\"") + ;; TODO: Check if this is okay for Android, too + ;; (see comment in KDEInstallDirs.cmake) + (("_define_relative\\(QTPLUGINDIR \"\\$\\{_pluginsDirParent}\" \"plugins\"") + "_define_relative(QTPLUGINDIR \"${_pluginsDirParent}\" \"qt5/plugins\"") ;; Install imports into lib/qt5/imports (("_define_relative\\(QTQUICKIMPORTSDIR QTPLUGINDIR \"imports\"") "_define_relative(QTQUICKIMPORTSDIR LIBDIR \"qt5/imports\"") -- 2.13.7