mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] qt-everywhere-opensource-src: Removed whitespace error from patch
@ 2024-05-15 15:14 Sven Püschel
  2024-05-21  9:59 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Sven Püschel @ 2024-05-15 15:14 UTC (permalink / raw)
  To: ptxdist; +Cc: Sven Püschel

fixed 'warning: 1 line adds whitespace errors.' when running
'ptxdist extract --git qt5'

Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
 .../0001-CVE-2023-4863-5.15.patch                               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f4462608f..9d5b9fdf3 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
-- 
2.45.0




^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [ptxdist] [APPLIED] qt-everywhere-opensource-src: Removed whitespace error from patch
  2024-05-15 15:14 [ptxdist] [PATCH] qt-everywhere-opensource-src: Removed whitespace error from patch Sven Püschel
@ 2024-05-21  9:59 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2024-05-21  9:59 UTC (permalink / raw)
  To: ptxdist; +Cc: Sven Püschel

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



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-05-21 10:00 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-15 15:14 [ptxdist] [PATCH] qt-everywhere-opensource-src: Removed whitespace error from patch Sven Püschel
2024-05-21  9:59 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox