From patchwork Wed Jan 2 09:58:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Meiyo Peng X-Patchwork-Id: 621 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 6057B169A6; Wed, 2 Jan 2019 10:00:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id D44261697B for ; Wed, 2 Jan 2019 10:00:14 +0000 (GMT) Received: from localhost ([127.0.0.1]:43364 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gedJu-00057S-C0 for patchwork@mira.cbaines.net; Wed, 02 Jan 2019 05:00:14 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gedJm-00054r-Fi for guix-patches@gnu.org; Wed, 02 Jan 2019 05:00:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gedJj-0005px-3P for guix-patches@gnu.org; Wed, 02 Jan 2019 05:00:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:38484) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gedJi-0005pt-VF for guix-patches@gnu.org; Wed, 02 Jan 2019 05:00:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gedJi-0003at-Tp for guix-patches@gnu.org; Wed, 02 Jan 2019 05:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33951] [PATCH] gnu: cmake-extra-modules: Fix QTPLUGINDIR. Resent-From: Meiyo Peng Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Jan 2019 10:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33951 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33951@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154642317013743 (code B ref -1); Wed, 02 Jan 2019 10:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Jan 2019 09:59:30 +0000 Received: from localhost ([127.0.0.1]:44308 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gedJB-0003Za-KS for submit@debbugs.gnu.org; Wed, 02 Jan 2019 04:59:29 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gedJ9-0003ZQ-F8 for submit@debbugs.gnu.org; Wed, 02 Jan 2019 04:59:27 -0500 Received: from lists.gnu.org ([208.118.235.17]:32860) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gedJ8-0005Hu-41 for submit@debbugs.gnu.org; Wed, 02 Jan 2019 04:59:26 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gedJ7-0004jW-3k for guix-patches@gnu.org; Wed, 02 Jan 2019 04:59:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gedJ3-00059i-7D for guix-patches@gnu.org; Wed, 02 Jan 2019 04:59:25 -0500 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:34360) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gedIz-00056R-MI for guix-patches@gnu.org; Wed, 02 Jan 2019 04:59:19 -0500 Received: by mail-pf1-x444.google.com with SMTP id h3so14996931pfg.1 for ; Wed, 02 Jan 2019 01:59:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=2MkSjNKoP7G3vZRXlKgCTmzN2z42/+XyHmZSROcvT/4=; b=MzlDTLrqZcjJDLg12VRu/ptHkyK1NNpfMI95hk1hqpcE3eyLIMDDLDCNC3YXGI3fcC cZpH8FcRk4PI9xtfTVsLyy71eNZno0SJ98IHwYwGo9b5sUTDZwY9cwEctD09ZBEukbUe 1CoU91rePMH7zIO4MYwA84Td9YR39EZuzT97hj/BYikjVkR/nhR9vBehvSHWg+zr8J+P QXFPj1Q9wNIeHSV8BOqkLcBBhH1J/q4K6YZ2wPDkt6pvfjqklCNfiPX8WpRW67xnIYFz yTSUsj+arFvQRAqen2Xlc56ogk1nH/X6OK/NyzpKCH/GJ0VCj/XXgSZoj2mHEMuLwDNC LbNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=2MkSjNKoP7G3vZRXlKgCTmzN2z42/+XyHmZSROcvT/4=; b=VXcwI4CQhhI0FcCffUIcxHPsMoC/kyufmsUqPazNzD2AmXETKcrhjkK5a0f6xh4FBi y8729NHGHN8knoI0uOW4hxhB/NZXBKDd506O87mwtEMT2FUbwCS/yJw40iadF54+fwAG LaLNozO9UVQ0mD2siUJyamZBtRZa7A0/9g+EdNMqRcz7zcoMX1nH/k5lujC9+aCWWgAD YI6D3fHLR9UXCjTznjJ5OAG17CuhuI4/FToM9cFgs+Q7P17yA3a5RuWylHGflqzb8Yk3 GFuywRoWphl8qtknVwV6oYeILkOrPlVCfStwPsCazdxRNy4LGckFU8kjr0W38CjbxVQw d4dA== X-Gm-Message-State: AA+aEWZSx0cii22lro2kVG8Q+31b71A5GE0BEM3XKSgbZZgjSNIOlsLQ eGD4PLuUyG/R28fBIv6u/mJ3GCbokyk= X-Google-Smtp-Source: AFSGD/XP1GzZwhFysbW04DGiZOmpwAQNJ94sh5Ea0NW/ykr7Gf9yWkKw7PYsN8X2aF1jjA1Uv3CBTA== X-Received: by 2002:a62:61c3:: with SMTP id v186mr44219101pfb.55.1546423154626; Wed, 02 Jan 2019 01:59:14 -0800 (PST) Received: from dinosaur (144.34.217.65.16clouds.com. [144.34.217.65]) by smtp.gmail.com with ESMTPSA id m198sm84460302pga.10.2019.01.02.01.59.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 02 Jan 2019 01:59:13 -0800 (PST) From: Meiyo Peng Date: Wed, 02 Jan 2019 17:58:57 +0800 Message-ID: <87k1jns7mm.fsf@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, This patch fixes the regular expression for QTPLUGINDIR. The source code of "kde-modules/KDEInstallDirs.cmake" has been changed by upstream in recent releases. This regular expression bug caused dependent packages install qt plugins into a wrong directory. --- Meiyo Peng https://www.pengmeiyu.com/ From a242fed166b0939365a6e6f3259c65471dc01db7 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Sat, 29 Dec 2018 00:06:00 +0800 Subject: [PATCH] gnu: cmake-extra-modules: Fix QTPLUGINDIR. * gnu/packages/kde-frameworks.scm (cmake-extra-modules)[arguments]: Fix QTPLUGINDIR. --- gnu/packages/kde-frameworks.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 6c1854379..5c21a7fb7 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Meiyo Peng ;;; ;;; This file is part of GNU Guix. ;;; @@ -98,7 +99,7 @@ (("\"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 \"\\$\\{_pluginsDirParent\\}\" \"plugins\"") "_define_relative(QTPLUGINDIR LIBDIR \"qt5/plugins\"") ;; Install imports into lib/qt5/imports (("_define_relative\\(QTQUICKIMPORTSDIR QTPLUGINDIR \"imports\"") -- 2.20.1