From patchwork Fri Feb 24 16:35:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 47271 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 DCCCE16BD9; Fri, 24 Feb 2023 16:36:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 643AB16BF0 for ; Fri, 24 Feb 2023 16:36:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVb3E-0002Ng-M2; Fri, 24 Feb 2023 11:36:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVb3C-0002M3-RH for guix-patches@gnu.org; Fri, 24 Feb 2023 11:36:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVb3C-0003m7-11 for guix-patches@gnu.org; Fri, 24 Feb 2023 11:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVb3B-00035U-RU for guix-patches@gnu.org; Fri, 24 Feb 2023 11:36:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61761] [PATCH 1/2] gnu: qpdfview: Update to 0.5.0. References: <20230224163240.18571-1-timotej.lazar@araneo.si> In-Reply-To: <20230224163240.18571-1-timotej.lazar@araneo.si> Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Feb 2023 16:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61761 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61761@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 61761-submit@debbugs.gnu.org id=B61761.167725652011799 (code B ref 61761); Fri, 24 Feb 2023 16:36:01 +0000 Received: (at 61761) by debbugs.gnu.org; 24 Feb 2023 16:35:20 +0000 Received: from localhost ([127.0.0.1]:38075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVb2W-00034E-73 for submit@debbugs.gnu.org; Fri, 24 Feb 2023 11:35:20 -0500 Received: from araneo.si ([90.157.193.204]:34742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVb2U-000344-F5 for 61761@debbugs.gnu.org; Fri, 24 Feb 2023 11:35:18 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 73ebc405 for <61761@debbugs.gnu.org>; Fri, 24 Feb 2023 16:35:15 +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=sb1zFD3e7ix2HzN04/pK4FzD7T8=; b=LU3KFEX37fKhGvBa PCqR/PQ6cerCgRno7TNHBimaqrt2AVy2QIGT9nqAoiRb77PaIL3YzKJH3+UE2gdP KCFpZ65OV1DLTm2kkJv6iXD6sBhOq3FIxCE8BkMpVw3EM8NS1DjlTKgIp3c6ssa9 IKcevT2ZwrCOC//UCdejPHlxMnNALojkY4eT9lCnZVoZ1rzuDM8Cx5yCnSSQ56Fi Z+BZvIYzqrzKk1hGR9pIwG2RnyU+ImB6fNusBlVkiUwt+FJPiDAC7jDwPRQc0lkP /VV0k9NLPmXzQaF1TeNxUHRJuThqC618f1xEfXhpKQNTfP+BFlFrLsxuQcIxU/tW vlvkeQ== Received: by araneo.si (OpenSMTPD) with ESMTPSA id bf452c2c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 24 Feb 2023 16:35:15 +0000 (UTC) From: Timotej Lazar Date: Fri, 24 Feb 2023 17:35:02 +0100 Message-Id: <20230224163502.21716-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pdf.scm (qpdfview): Update to 0.5.0. * gnu/packages/patches/qpdfview-qt515-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/qpdfview-qt515-compat.patch | 17 ----------------- gnu/packages/pdf.scm | 7 +++---- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 gnu/packages/patches/qpdfview-qt515-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0838f66618..9ae37a9bb4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1770,7 +1770,6 @@ dist_patch_DATA = \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qemu-glibc-2.30.patch \ %D%/packages/patches/qemu-fix-agent-paths.patch \ - %D%/packages/patches/qpdfview-qt515-compat.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qtbase-absolute-runpath.patch \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ diff --git a/gnu/packages/patches/qpdfview-qt515-compat.patch b/gnu/packages/patches/qpdfview-qt515-compat.patch deleted file mode 100644 index 1fbf5ec3f1..0000000000 --- a/gnu/packages/patches/qpdfview-qt515-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix compatibility with Qt 5.15. - -Patch copied from upstream source repository: - -https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104 - ---- a/sources/model.h 2017-04-19 21:01:25 +0000 -+++ b/sources/model.h 2020-06-09 06:24:11 +0000 -@@ -24,6 +24,7 @@ - #define DOCUMENTMODEL_H - - #include -+#include - #include - #include - #include - diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index c040afcae7..9926739973 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -888,16 +888,15 @@ (define-public qpdf (define-public qpdfview (package (name "qpdfview") - (version "0.4.18") + (version "0.5.0") (source (origin (method url-fetch) (uri (string-append "https://launchpad.net/qpdfview/" "trunk/" version "/+download/" - "qpdfview-" version ".tar.gz")) + "qpdfview-" (version-major+minor version) ".tar.gz")) (sha256 - (base32 "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c")) - (patches (search-patches "qpdfview-qt515-compat.patch")))) + (base32 "16dy341927r2s1dza7g8ci1jyypfc4a6yfcvg9sxvjv1li0c9vs4")))) (build-system qt-build-system) (native-inputs (list pkg-config))