From patchwork Sat Jul 10 07:11:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 31275 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 53A7C27BC81; Sat, 10 Jul 2021 08:13:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DCEB027BC78 for ; Sat, 10 Jul 2021 08:13:12 +0100 (BST) Received: from localhost ([::1]:45780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m27Al-0004WR-Ty for patchwork@mira.cbaines.net; Sat, 10 Jul 2021 03:13:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m27Ad-0004WE-4b for guix-patches@gnu.org; Sat, 10 Jul 2021 03:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48595) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m27Ac-0000Ad-Tk for guix-patches@gnu.org; Sat, 10 Jul 2021 03:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m27Ac-0000ME-NZ for guix-patches@gnu.org; Sat, 10 Jul 2021 03:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49502] [PATCH] gnu: qpdfview: Use qt-build-system. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 10 Jul 2021 07:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49502 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49502@debbugs.gnu.org Cc: Timotej Lazar X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16259011451325 (code B ref -1); Sat, 10 Jul 2021 07:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Jul 2021 07:12:25 +0000 Received: from localhost ([127.0.0.1]:60141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m27A1-0000LJ-ER for submit@debbugs.gnu.org; Sat, 10 Jul 2021 03:12:25 -0400 Received: from lists.gnu.org ([209.51.188.17]:33282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m279y-0000L9-IB for submit@debbugs.gnu.org; Sat, 10 Jul 2021 03:12:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m279y-0004US-9w for guix-patches@gnu.org; Sat, 10 Jul 2021 03:12:22 -0400 Received: from araneo.si ([2001:15c0:2110:3400::2]:34988) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m279v-0008D0-Hh for guix-patches@gnu.org; Sat, 10 Jul 2021 03:12:22 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 589cbd5a for ; Sat, 10 Jul 2021 07:12:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=20180623; bh=uQpLjMN3p4YWwlAtlhQuVsrYY5M=; b=PFpLHFsUwDVFhvRc XKr5RffTDmRn+ca6cLmeWzZk6QXPzhGhGh6lrsTGv/FtoxNPW/3B/A2Euh5whbvu zopsrn7F9FkBYSvUdAq9iLOJd2xHtTIdaM/tVQL7QQYtQ1Ha3IENTRCjIDCNe4HN kuVme+LXHfc5dEfQtzHhUnQnP+pzhvnslcMvx/VhEkA3NUs3Gj+rRlLutEEvK/IP /gdaxt+ZyZrxkNLTLkvOqD5BtSJYObrJqvApQVbtjq60Mbk3JHph8zLvAYO/9CGK 2HGzUy/EFgHtJGS1BENMIzDANzIydrjTv3MviBpsbRLs+cTmGOcTKev9E1eROLBH bdQgcw== Received: by araneo.si (OpenSMTPD) with ESMTPSA id a6be3114 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 10 Jul 2021 07:12:12 +0000 (UTC) From: Timotej Lazar Date: Sat, 10 Jul 2021 09:11:34 +0200 Message-Id: <20210710071134.13796-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2001:15c0:2110:3400::2; envelope-from=timotej.lazar@araneo.si; helo=araneo.si 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_PASS=-0.001, SPF_PASS=-0.001, T_PDS_PRO_TLD=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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This fixes compilation after the recent reorganization of qt-build-system. As a side effect, specifying Qt plugins with environment variables now works. * gnu/packages/pdf.scm (qpdfview): Use qt-build-system. [arguments]: Drop #:modules and #:imported-modules, and the 'qt-wrap phase. Specify that there are no tests. --- gnu/packages/pdf.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 9298332940..4d1b8cddfe 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -839,7 +839,7 @@ program capable of converting PDF into other formats.") (sha256 (base32 "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c")) (patches (search-patches "qpdfview-qt515-compat.patch")))) - (build-system gnu-build-system) + (build-system qt-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs @@ -850,22 +850,14 @@ program capable of converting PDF into other formats.") ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg))) (arguments - `(#:imported-modules ((guix build qt-build-system) - (guix build cmake-build-system) - ,@%gnu-build-system-modules) - #:modules ((guix build utils) - (guix build gnu-build-system) - ((guix build qt-build-system) #:prefix qt:)) + `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases (replace 'configure (lambda _ (substitute* "qpdfview.pri" (("/usr") (assoc-ref %outputs "out"))) - (invoke "qmake" "qpdfview.pro"))) - ;; Otherwise, the user interface will not display any icons. - (add-after 'install 'qt-wrap - (assoc-ref qt:%standard-phases 'qt-wrap))))) + (invoke "qmake" "qpdfview.pro")))))) (home-page "https://launchpad.net/qpdfview") (synopsis "Tabbed document viewer") (description "@command{qpdfview} is a document viewer for PDF, PS and DJVU