From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 4v1WCVmnIWCUZQAA0tVLHw (envelope-from ) for ; Mon, 08 Feb 2021 21:04:25 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id SBCKBFmnIWBINAAAbx9fmQ (envelope-from ) for ; Mon, 08 Feb 2021 21:04:25 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AB1249403AA for ; Mon, 8 Feb 2021 21:04:24 +0000 (UTC) Received: from localhost ([::1]:41254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Dhn-0005eM-FN for larch@yhetil.org; Mon, 08 Feb 2021 16:04:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l98eu-0005Yl-5j for guix-patches@gnu.org; Mon, 08 Feb 2021 10:41:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40168) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l98es-0000Hf-7B for guix-patches@gnu.org; Mon, 08 Feb 2021 10:41:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l98es-0002UK-58 for guix-patches@gnu.org; Mon, 08 Feb 2021 10:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46386] [PATCH] gnu: qpdfview: Fix qt-5.15 compatibility. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Feb 2021 15:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46386 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46386@debbugs.gnu.org Cc: Timotej Lazar X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16127988239508 (code B ref -1); Mon, 08 Feb 2021 15:41:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Feb 2021 15:40:23 +0000 Received: from localhost ([127.0.0.1]:51714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l98eF-0002TI-7k for submit@debbugs.gnu.org; Mon, 08 Feb 2021 10:40:23 -0500 Received: from lists.gnu.org ([209.51.188.17]:38392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l98eD-0002TA-7Y for submit@debbugs.gnu.org; Mon, 08 Feb 2021 10:40:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l98eB-0005Hx-2u for guix-patches@gnu.org; Mon, 08 Feb 2021 10:40:20 -0500 Received: from araneo.si ([2001:15c0:2110:3400::2]:60962) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l98e2-0008JS-RE for guix-patches@gnu.org; Mon, 08 Feb 2021 10:40:18 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 0c292307 for ; Mon, 8 Feb 2021 15:40:05 +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=NsBQKIjjFadvBwN6RLWB99ypwqk=; b=as9BGFviiI4VHBqf MGHxpcrhfNQf3OlV58GEwR6ndln2R/sWRfeV09B7Pji2YaX1sFDkmE+t68pvGX16 3DTyPKekYRAE3yX+TyKQIgsacyy5rrZQ71Lczow927PmUUduTCZveM5190ACb353 D/u4eM0UCGdwkGzgwr2up26RrryAFJMltjxw273yKMK6b1rIo9/ZsaVLdtBo+W5R gDM/p8C/yUoGp/xZMINt2V8Gfz9oHsMlJyqnAbv64o7Sc8oBwmXZgHIYL06TuYU4 mbyKwvNjljPW5IDnHRpIPfpJNl1G7k3GmMbYKkCAjtSHbOjtW3HZanHeVsxxmCGk VW/tYw== Received: by araneo.si (OpenSMTPD) with ESMTPSA id e9dcfa40 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 8 Feb 2021 15:40:04 +0000 (UTC) From: Timotej Lazar Date: Mon, 8 Feb 2021 16:40:17 +0100 Message-Id: <20210208154017.6539-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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_PASS=-0.001, T_SPF_HELO_TEMPERROR=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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 3.74 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=araneo.si header.s=20180623 header.b=as9BGFvi; dmarc=fail reason="SPF not aligned (relaxed)" header.from=araneo.si (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: AB1249403AA X-Spam-Score: 3.74 X-Migadu-Scanner: scn1.migadu.com X-TUID: fCN2Be5ZF4k1 * gnu/packages/pdf.scm (qpdfview)[source]: Add patch to include a missing header. * gnu/packages/patches/qpdfview-qt515-compat.patch: New file, from upstream. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/patches/qpdfview-qt515-compat.patch | 12 ++++++++++++ gnu/packages/pdf.scm | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/qpdfview-qt515-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index ae64a483b5..fe955bb2b7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1562,6 +1562,7 @@ dist_patch_DATA = \ %D%/packages/patches/pypy3-7.3.1-fix-tests.patch \ %D%/packages/patches/qemu-build-info-manual.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ + %D%/packages/patches/qpdfview-qt515-compat.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-absolute-runpath.patch \ diff --git a/gnu/packages/patches/qpdfview-qt515-compat.patch b/gnu/packages/patches/qpdfview-qt515-compat.patch new file mode 100644 index 0000000000..627b8c8907 --- /dev/null +++ b/gnu/packages/patches/qpdfview-qt515-compat.patch @@ -0,0 +1,12 @@ +From . +--- 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 66e920a7bb..3063aa10c0 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -869,7 +869,8 @@ program capable of converting PDF into other formats.") "trunk/" version "/+download/" "qpdfview-" version ".tar.gz")) (sha256 - (base32 "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c")))) + (base32 "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c")) + (patches (search-patches "qpdfview-qt515-compat.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- 2.30.0