From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id uWiUBk7TI1+aUgAA0tVLHw (envelope-from ) for ; Fri, 31 Jul 2020 08:16:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id ICr6AU7TI18WXAAA1q6Kng (envelope-from ) for ; Fri, 31 Jul 2020 08:16:14 +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 89C509404C7 for ; Fri, 31 Jul 2020 08:16:13 +0000 (UTC) Received: from localhost ([::1]:49434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k1QD4-0007JL-Nn for larch@yhetil.org; Fri, 31 Jul 2020 04:16:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1QCw-0007JB-5v for guix-patches@gnu.org; Fri, 31 Jul 2020 04:16:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53985) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k1QCv-0003mJ-T2 for guix-patches@gnu.org; Fri, 31 Jul 2020 04:16:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k1QCv-0006s6-N7 for guix-patches@gnu.org; Fri, 31 Jul 2020 04:16:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42626] [PATCH] gnu: qtimageformats: fix build. Resent-From: Michael Rohleder Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 Jul 2020 08:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42626 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42626@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159618332826367 (code B ref -1); Fri, 31 Jul 2020 08:16:01 +0000 Received: (at submit) by debbugs.gnu.org; 31 Jul 2020 08:15:28 +0000 Received: from localhost ([127.0.0.1]:37298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k1QCO-0006rD-J4 for submit@debbugs.gnu.org; Fri, 31 Jul 2020 04:15:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:51882) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k1QCM-0006r5-Jw for submit@debbugs.gnu.org; Fri, 31 Jul 2020 04:15:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1QCM-0007Bp-EX for guix-patches@gnu.org; Fri, 31 Jul 2020 04:15:26 -0400 Received: from wp224.webpack.hosteurope.de ([2a01:488:42:1000:50ed:84e7::]:59698) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1QCK-0003ir-9J for guix-patches@gnu.org; Fri, 31 Jul 2020 04:15:26 -0400 Received: from www.rohleder.de ([37.61.204.227]); authenticated by wp224.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1k1QCG-0005pL-U3; Fri, 31 Jul 2020 10:15:20 +0200 Received: from [192.168.1.3] (helo=micha) by www.rohleder.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1k1QCF-0005I1-MF for guix-patches@gnu.org; Fri, 31 Jul 2020 10:15:20 +0200 From: Michael Rohleder X-PGP-Fingerprint: 755E 2DE5 D0D5 85C5 2E78 2830 7C7A FFBE FEF2 CB25 X-PGP-Key: https://www.rohleder.de/~mike/pgpkey.asc Date: Fri, 31 Jul 2020 10:15:08 +0200 Message-ID: <87ft98drsj.fsf@rohleder.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-bounce-key: webpack.hosteurope.de;mike@rohleder.de;1596183324;746b3885; X-HE-SMSGID: 1k1QCG-0005pL-U3 Received-SPF: permerror client-ip=2a01:488:42:1000:50ed:84e7::; envelope-from=mike@rohleder.de; helo=wp224.webpack.hosteurope.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/31 03:21:05 X-ACL-Warn: Detected OS = ??? X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) 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-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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-Spam-Score: -3.11 X-TUID: AX9ec7or1wLr --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain nefix reported on IRC that qtimageformats doesnt build. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-qtimageformats-fix-build.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH] gnu: qtimageformats: fix build. From=203c74b590d6578bc5a6f9ac84cc8e0339ffee9175 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 31 Jul 2020 10:11:49 +0200 Subject: [PATCH] gnu: qtimageformats: fix build. * gnu/packages/qt.scm (qtimageformats): fix build. =2D-- gnu/packages/qt.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 4b3af757f9..053f744037 100644 =2D-- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -18,6 +18,7 @@ ;;; Copyright =C2=A9 2020 Kei Kebreau ;;; Copyright =C2=A9 2020 TomZ ;;; Copyright =C2=A9 2020 Jonathan Brielmaier +;;; Copyright =C2=A9 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -712,6 +713,15 @@ HostData=3Dlib/qt5 '(begin (delete-file-recursively "src/3rdparty") #t)))) + (arguments + (substitute-keyword-arguments (package-arguments qtsvg) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'fix-build + (lambda _ (substitute* "src/plugins/imageformats/jp2/qjp2hand= ler.cpp" + (("^#include ") + "#include \n#include ")) + #t)))))) (native-inputs `()) (inputs `(("jasper" ,jasper) =2D-=20 2.28.0 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable =2D-=20 some people are so poor that the only thing they have is money. --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEdV4t5dDVhcUueCgwfHr/vv7yyyUFAl8j0wwACgkQfHr/vv7y yyW7ewf/Q1P+Czja6vKIw/tQZPr7urkLYkUFknxm7CpIEM74kI5IG6arwg9FpXxA 7dGzwy+3Ho8wuXQtYDsQziJ2+M2GblDfe8mILcM+fOoDw97HwOEPm9c29Q0WpT9N gZUY3VMqqKznVeWw7qqvLQ+OjRBYCLNKoNaLoqjYg27F596qgcpQcH3WU7zcWzmh W6xWMB8of2Cj9om8Tn4HH1do29/bEU4N+L87CTS05C4Ifr0F1IpCA3fULw3w+Pry qIBMCYUu+s+ep94/7XjBBrtxoI59wx1I/B0WBUroXmQ2bkwTlyWg9lLYDkXuv0jN Em3JPFZbjw8jmZMXGBIQNbBGNR2iCg== =03Dw -----END PGP SIGNATURE----- --==-=-=--