From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Tue, 21 May 2024 12:00:04 +0200
Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.96)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1s9MHs-00C4BO-2l
	for lore@lore.pengutronix.de;
	Tue, 21 May 2024 12:00:04 +0200
Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de)
	by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1s9MHs-0004JI-Gk; Tue, 21 May 2024 12:00:04 +0200
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.whiteo.stw.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1s9MGt-0001un-DI; Tue, 21 May 2024 11:59:03 +0200
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1s9MGt-002N7O-09; Tue, 21 May 2024 11:59:03 +0200
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96)
 (envelope-from <mol@pengutronix.de>) id 1s9MGs-003kFh-35;
 Tue, 21 May 2024 11:59:02 +0200
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Tue, 21 May 2024 11:59:02 +0200
Message-Id: <20240521095902.892765-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20240515151438.23189-1-s.pueschel@pengutronix.de>
References: <20240515151438.23189-1-s.pueschel@pengutronix.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] qt-everywhere-opensource-src: Removed
 whitespace error from patch
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <https://metis.pengutronix.de/mailman/options/ptxdist>,
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <https://metis.pengutronix.de/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <https://metis.pengutronix.de/mailman/listinfo/ptxdist>,
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: =?UTF-8?q?Sven=20P=C3=BCschel?= <s.pueschel@pengutronix.de>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de
X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false

Thanks, applied as d63b6290753c43958ff1094fb2f8956a7990b4d1.

Michael

[sent from post-receive hook]

On Tue, 21 May 2024 11:59:02 +0200, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> fixed 'warning: 1 line adds whitespace errors.' when running
> 'ptxdist extract --git qt5'
> 
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20240515151438.23189-1-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/qt-everywhere-opensource-src-5.15.12/0001-CVE-2023-4863-5.15.patch b/patches/qt-everywhere-opensource-src-5.15.12/0001-CVE-2023-4863-5.15.patch
> index f4462608f641..9d5b9fdf3524 100644
> --- a/patches/qt-everywhere-opensource-src-5.15.12/0001-CVE-2023-4863-5.15.patch
> +++ b/patches/qt-everywhere-opensource-src-5.15.12/0001-CVE-2023-4863-5.15.patch
> @@ -424,7 +424,7 @@ index 2b46f5bec641..d72147658721 100644
>   +#include <qglobal.h>
>   +
>  + #include <stddef.h>
> -+ 
> ++
>    #ifdef HAVE_CONFIG_H
>  - #include "src/webp/config.h"
>  - #endif