From unknown Sun Jun 22 08:07:58 2025 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-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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 From unknown Sun Jun 22 08:07:58 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Timotej Lazar Subject: bug#46386: closed (Re: [bug#46386] [PATCH] gnu: qpdfview: Fix qt-5.15 compatibility.) Message-ID: References: <20210208154017.6539-1-timotej.lazar@araneo.si> X-Gnu-PR-Message: they-closed 46386 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 46386@debbugs.gnu.org Date: Tue, 09 Feb 2021 19:54:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1612900442-21892-1" This is a multi-part message in MIME format... ------------=_1612900442-21892-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #46386: [PATCH] gnu: qpdfview: Fix qt-5.15 compatibility. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 46386@debbugs.gnu.org. --=20 46386: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D46386 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1612900442-21892-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 46386-done) by debbugs.gnu.org; 9 Feb 2021 19:53:48 +0000 Received: from localhost ([127.0.0.1]:54697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l9Z51-0005gf-Or for submit@debbugs.gnu.org; Tue, 09 Feb 2021 14:53:47 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:53123) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l9Z4y-0005gR-SF for 46386-done@debbugs.gnu.org; Tue, 09 Feb 2021 14:53:47 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 831C75C0113; Tue, 9 Feb 2021 14:53:39 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Tue, 09 Feb 2021 14:53:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=JDxXSmvHhWEWfcMSLwTFqP4G gmSpriipDKjm+rJS3uI=; b=tkyzdYU8yOwuRLqjQ+EVcQ+Yh4MiQO8J6Sg3ZuMv lH0gRTIZctQ+1DldrDEH7sBu7OeK3dbu8puBdpF/32hUlCXIEC2W0vi3ZKaGYZQT VmpwAdeLhtzmPv1V3bG/mBNh9Qsac5oMFi6HnztoLwW0iPEwb2chenOqJZtIPHAO i74= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=JDxXSm vHhWEWfcMSLwTFqP4GgmSpriipDKjm+rJS3uI=; b=g3Y9A+PWCT2s9HGuoFAiSh LNZFFrFT8whEsM5LGKMCr9lLoC+3JWjBmDoDmDwnRZ2Ofaw9Cgn65oUTvSc3Avqe EUejXG+qt0qFDxcIfQITJxWMUZPVzfFTnyh3vQJEBhh5p2rHtQayfksxN7+Y9IKZ lvSBgvIhi1cFAPB2kKaB//vlRJ4AjYRtdKZ7w/mWByg6sKxO0bmRPQv5BSOTy8ks 21ZnbISZ2FRPPVWxzyfN1lQdTY/k42zuU6h7bAwjOVFlI94nrwg8KQURD5WhpDvd 2Ru4AE7kZaUbjmbtG1FC3C4jOazWz0zJPaheP7dk/1AzTZxVv0Q25dzbBIPsBaNQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrheehgddufedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdortddttddvnecuhfhrohhmpefnvghoucfh rghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtth gvrhhnpefghfejleevteeuvefhheehhfevgfegvedtteetjefhfeefvdfhvddtjeejkedu feenucfkphepuddttddruddurdduieelrdduudeknecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (pool-100-11-169-118.phlapa.fios.verizon.net [100.11.169.118]) by mail.messagingengine.com (Postfix) with ESMTPA id A3BA4108005C; Tue, 9 Feb 2021 14:53:38 -0500 (EST) Date: Tue, 9 Feb 2021 14:53:36 -0500 From: Leo Famulari To: Timotej Lazar Subject: Re: [bug#46386] [PATCH] gnu: qpdfview: Fix qt-5.15 compatibility. Message-ID: References: <20210208154017.6539-1-timotej.lazar@araneo.si> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210208154017.6539-1-timotej.lazar@araneo.si> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 46386-done Cc: 46386-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Mon, Feb 08, 2021 at 04:40:17PM +0100, Timotej Lazar wrote: > * 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. Thank you! I tweaked the patch comments and the commit message and pushed as 1e9f667708ba6fdc4b16fe6851bc0ea0b6306fad ------------=_1612900442-21892-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: qpdfview: Fix qt-5.15 compatibility. 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Timotej Lazar X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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 ------------=_1612900442-21892-1--