From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mike Rosset Subject: bug#38148: [PATCH 4/5] gnu: python-pyqt: Improved qprinter.h substitutition comment Date: Tue, 14 Jan 2020 03:06:38 -0800 Message-ID: <20200114110639.14059-3-mike.rosset@gmail.com> References: <20200114110459.13912-1-mike.rosset@gmail.com> <20200114110639.14059-1-mike.rosset@gmail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:49624) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irK3L-00088G-1a for bug-guix@gnu.org; Tue, 14 Jan 2020 06:08:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irK3H-0001O4-Ff for bug-guix@gnu.org; Tue, 14 Jan 2020 06:08:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54741) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1irK3H-0001Nv-D2 for bug-guix@gnu.org; Tue, 14 Jan 2020 06:08:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1irK3H-0004J6-9F for bug-guix@gnu.org; Tue, 14 Jan 2020 06:08:03 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20200114110639.14059-1-mike.rosset@gmail.com> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane-mx.org@gnu.org Sender: "bug-Guix" To: 38148@debbugs.gnu.org Cc: mike.rosset@gmail.com * gnu/packages/qt.scm (python-pyqt)[comments]: And python-pyqtwebengine now uses mkdir-p instead of a system call. --- gnu/packages/qt.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index fcb297e99c..611c38a443 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1948,8 +1948,8 @@ module provides support functions to the automatically generated code.") ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases - ;; When building python-pyqtwebengine can not be - ;; included. Here we substitute the full path to the header in the + ;; When building python-pyqtwebengine, can not be + ;; included. Here we substitute the full path to the header in the ;; store. (add-before 'configure 'substitute-source (lambda* (#:key inputs #:allow-other-keys) @@ -2025,7 +2025,6 @@ contain over 620 classes.") ("qtsvg" ,qtsvg) ("qtdeclarative" ,qtdeclarative) ("qtwebchannel" ,qtwebchannel) - ("qtwebengine" ,qtwebengine) ("python-pyqt" ,python-pyqt) ("qtwebengine" ,qtwebengine))) (arguments @@ -2044,14 +2043,13 @@ contain over 620 classes.") (last (string-split python #\-))) (python-major+minor (string-join - (take (string-split python-version #\.) 2) - ".")) + (take (string-split python-version #\.) 2) ".")) (lib (string-append out "/lib/python" python-major+minor "/site-packages/PyQt5")) (stubs (string-append lib "/PyQt5"))) - (system* "mkdir" "-p" sipdir) + (mkdir-p sipdir) (invoke "python" "configure.py" "-w" "--no-dist-info" @@ -2072,8 +2070,7 @@ contain over 620 classes.") from pkgutil import extend_path __path__ = extend_path(__path__, __name__) "))) - #t))) - ))) + #t)))))) (home-page "https://www.riverbankcomputing.com/software/pyqtwebengine/intro") (synopsis "Python bindings for QtWebEngine") (description -- 2.24.1