[PR PATCH] Fix patch whitespace

[PR PATCH] Fix patch whitespace

[foopub]

[-- Attachment #1: Type: text/plain, Size: 481 bytes --]

There is a new pull request by foopub against master on the void-packages repository

https://github.com/foopub/void-packages master
https://github.com/void-linux/void-packages/pull/33916

Fix patch whitespace
Needed because of https://github.com/void-linux/void-packages/commit/7b4119df5cbc0cc37348164a10c88a32910009d8 
See also https://github.com/void-linux/void-packages/issues/33915


A patch file from https://github.com/void-linux/void-packages/pull/33916.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-33916.patch --]
[-- Type: text/x-diff, Size: 1338 bytes --]

From 1a202697b192e28d12f130d881fc74cf1e23e754 Mon Sep 17 00:00:00 2001
From: foo <krowlaxs@gmail.com>
Date: Fri, 5 Nov 2021 16:16:38 +0000
Subject: [PATCH] Fix patch whitespace

---
 srcpkgs/firefox/patches/fix-i686-ppc-musl.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch b/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch
index 717f3cd2f9c2..38a85b5922cd 100644
--- a/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch
+++ b/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch
@@ -1,11 +1,11 @@
---- a/mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
-+++ b/mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
-@@ -41,7 +41,7 @@
- #define MOZ_STACKWALK_SUPPORTS_MACOSX 0
+--- a/mozglue/misc/StackWalk.cpp	2021-11-05 15:55:03.614609706 +0000
++++ b/mozglue/misc/StackWalk.cpp	2021-10-28 19:03:47.000000000 +0100
+@@ -45,7 +45,7 @@
+ #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
  #endif
- 
--#if (defined(linux) && \
+
+-#if (defined(linux) &&                                            \
 +#if defined(__GLIBC__) && (defined(linux) && \
       ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
        defined(HAVE__UNWIND_BACKTRACE)))
- #define MOZ_STACKWALK_SUPPORTS_LINUX 1
+ #  define MOZ_STACKWALK_SUPPORTS_LINUX 1

Re: Fix patch whitespace

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 234 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33916#issuecomment-962050200

Comment:
Please fix commit title. If you can check it out, `thunderbird` currently has the same patch.

Re: [PR PATCH] [Updated] firefox: fix patch whitespace

[foopub]

[-- Attachment #1: Type: text/plain, Size: 495 bytes --]

There is an updated pull request by foopub against master on the void-packages repository

https://github.com/foopub/void-packages master
https://github.com/void-linux/void-packages/pull/33916

firefox: fix patch whitespace
Needed because of https://github.com/void-linux/void-packages/commit/7b4119df5cbc0cc37348164a10c88a32910009d8 
See also https://github.com/void-linux/void-packages/issues/33915


A patch file from https://github.com/void-linux/void-packages/pull/33916.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-33916.patch --]
[-- Type: text/x-diff, Size: 1347 bytes --]

From cd7d3b11ddc959322d7d86262d83383c2d7c568b Mon Sep 17 00:00:00 2001
From: foo <krowlaxs@gmail.com>
Date: Fri, 5 Nov 2021 16:16:38 +0000
Subject: [PATCH] firefox: fix patch whitespace

---
 srcpkgs/firefox/patches/fix-i686-ppc-musl.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch b/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch
index 717f3cd2f9c2..38a85b5922cd 100644
--- a/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch
+++ b/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch
@@ -1,11 +1,11 @@
---- a/mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
-+++ b/mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
-@@ -41,7 +41,7 @@
- #define MOZ_STACKWALK_SUPPORTS_MACOSX 0
+--- a/mozglue/misc/StackWalk.cpp	2021-11-05 15:55:03.614609706 +0000
++++ b/mozglue/misc/StackWalk.cpp	2021-10-28 19:03:47.000000000 +0100
+@@ -45,7 +45,7 @@
+ #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
  #endif
- 
--#if (defined(linux) && \
+
+-#if (defined(linux) &&                                            \
 +#if defined(__GLIBC__) && (defined(linux) && \
       ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
        defined(HAVE__UNWIND_BACKTRACE)))
- #define MOZ_STACKWALK_SUPPORTS_LINUX 1
+ #  define MOZ_STACKWALK_SUPPORTS_LINUX 1

Re: firefox: fix patch whitespace

[foopub]

[-- Attachment #1: Type: text/plain, Size: 437 bytes --]

New comment by foopub on void-packages repository

https://github.com/void-linux/void-packages/pull/33916#issuecomment-962061941

Comment:
> Please fix commit title. If you can check it out, `thunderbird` currently has the same patch.

mmmm I think a lot of packages might have the same problem in general, firefox-esr  seems to have the same specific patch too... I'm not sure what a good systematic way to fix all of these might be.

Re: firefox: fix patch whitespace

[foopub]

[-- Attachment #1: Type: text/plain, Size: 537 bytes --]

New comment by foopub on void-packages repository

https://github.com/void-linux/void-packages/pull/33916#issuecomment-962066560

Comment:
It's probably worth creating an issue for this, but imo the -l option should be retained for specific filetypes which are whitespace insensitive, such as C family langs, etc. 

Or more simply, only apply it to filetypes which are whitespace sensitive, because those tend to be fewer (only python off the top of my head).

Unless someone has a good way of fixing all of these systematically... 

Re: firefox: fix patch whitespace

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33916#issuecomment-962069806

Comment:
Did you see the patch that prompted this? `-l` caused it to be applied in the wrong place.

Re: firefox: fix patch whitespace

[q66]

[-- Attachment #1: Type: text/plain, Size: 441 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/33916#issuecomment-962073959

Comment:
yeah, `-l` is absolutely wrong and should never be used there; i anticipated there would be some breakage, but i figured patches can just get reviewed and fixed as they are found (there is no good way around this)

you can probably just copy this updated patch into firefox-esr and thunderbird as it is

Re: firefox: fix patch whitespace

[q66]

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/33916#issuecomment-962074340

Comment:
i think the number of bad patches that this breaks should be fairly low though

Re: firefox: fix patch whitespace

[foopub]

[-- Attachment #1: Type: text/plain, Size: 290 bytes --]

New comment by foopub on void-packages repository

https://github.com/void-linux/void-packages/pull/33916#issuecomment-962075627

Comment:
Which patch are you referring to? The firefox one wasn't affected by the whitespace. I'm not sure which patch led to the initial commit to remove `-l`

Re: firefox: fix patch whitespace

[foopub]

[-- Attachment #1: Type: text/plain, Size: 614 bytes --]

New comment by foopub on void-packages repository

https://github.com/void-linux/void-packages/pull/33916#issuecomment-962083489

Comment:
> yeah, `-l` is absolutely wrong and should never be used there; i anticipated there would be some breakage, but i figured patches can just get reviewed and fixed as they are found (there is no good way around this)
> 
> you can probably just copy this updated patch into firefox-esr and thunderbird as it is

Yeah but I just want to be extra sure the builds actually work... You can add more packages to the list https://github.com/void-linux/void-packages/issues/33917

Re: [PR PATCH] [Updated] firefox: fix patch whitespace

[foopub]

[-- Attachment #1: Type: text/plain, Size: 495 bytes --]

There is an updated pull request by foopub against master on the void-packages repository

https://github.com/foopub/void-packages master
https://github.com/void-linux/void-packages/pull/33916

firefox: fix patch whitespace
Needed because of https://github.com/void-linux/void-packages/commit/7b4119df5cbc0cc37348164a10c88a32910009d8 
See also https://github.com/void-linux/void-packages/issues/33915


A patch file from https://github.com/void-linux/void-packages/pull/33916.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-33916.patch --]
[-- Type: text/x-diff, Size: 4101 bytes --]

From cd7d3b11ddc959322d7d86262d83383c2d7c568b Mon Sep 17 00:00:00 2001
From: foo <krowlaxs@gmail.com>
Date: Fri, 5 Nov 2021 16:16:38 +0000
Subject: [PATCH 1/3] firefox: fix patch whitespace

---
 srcpkgs/firefox/patches/fix-i686-ppc-musl.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch b/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch
index 717f3cd2f9c2..38a85b5922cd 100644
--- a/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch
+++ b/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch
@@ -1,11 +1,11 @@
---- a/mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
-+++ b/mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
-@@ -41,7 +41,7 @@
- #define MOZ_STACKWALK_SUPPORTS_MACOSX 0
+--- a/mozglue/misc/StackWalk.cpp	2021-11-05 15:55:03.614609706 +0000
++++ b/mozglue/misc/StackWalk.cpp	2021-10-28 19:03:47.000000000 +0100
+@@ -45,7 +45,7 @@
+ #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
  #endif
- 
--#if (defined(linux) && \
+
+-#if (defined(linux) &&                                            \
 +#if defined(__GLIBC__) && (defined(linux) && \
       ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
        defined(HAVE__UNWIND_BACKTRACE)))
- #define MOZ_STACKWALK_SUPPORTS_LINUX 1
+ #  define MOZ_STACKWALK_SUPPORTS_LINUX 1

From 1590ad529b7c14b6d2e57a2b4b12350b078c135c Mon Sep 17 00:00:00 2001
From: foo <krowlaxs@gmail.com>
Date: Fri, 5 Nov 2021 17:33:34 +0000
Subject: [PATCH 2/3] firefox-esr: fix patch whitespace

---
 .../firefox-esr/patches/fix-i686-ppc-musl.patch    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/firefox-esr/patches/fix-i686-ppc-musl.patch b/srcpkgs/firefox-esr/patches/fix-i686-ppc-musl.patch
index 717f3cd2f9c2..38a85b5922cd 100644
--- a/srcpkgs/firefox-esr/patches/fix-i686-ppc-musl.patch
+++ b/srcpkgs/firefox-esr/patches/fix-i686-ppc-musl.patch
@@ -1,11 +1,11 @@
---- a/mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
-+++ b/mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
-@@ -41,7 +41,7 @@
- #define MOZ_STACKWALK_SUPPORTS_MACOSX 0
+--- a/mozglue/misc/StackWalk.cpp	2021-11-05 15:55:03.614609706 +0000
++++ b/mozglue/misc/StackWalk.cpp	2021-10-28 19:03:47.000000000 +0100
+@@ -45,7 +45,7 @@
+ #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
  #endif
- 
--#if (defined(linux) && \
+
+-#if (defined(linux) &&                                            \
 +#if defined(__GLIBC__) && (defined(linux) && \
       ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
        defined(HAVE__UNWIND_BACKTRACE)))
- #define MOZ_STACKWALK_SUPPORTS_LINUX 1
+ #  define MOZ_STACKWALK_SUPPORTS_LINUX 1

From 7f48061f75adc3c5afbbfe8fb784cd97598cd1f2 Mon Sep 17 00:00:00 2001
From: foo <krowlaxs@gmail.com>
Date: Fri, 5 Nov 2021 17:34:34 +0000
Subject: [PATCH 3/3] thunderbird: fix patch whitespace

---
 .../thunderbird/patches/fix-i686-ppc-musl.patch    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
index 717f3cd2f9c2..38a85b5922cd 100644
--- a/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
+++ b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch
@@ -1,11 +1,11 @@
---- a/mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
-+++ b/mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
-@@ -41,7 +41,7 @@
- #define MOZ_STACKWALK_SUPPORTS_MACOSX 0
+--- a/mozglue/misc/StackWalk.cpp	2021-11-05 15:55:03.614609706 +0000
++++ b/mozglue/misc/StackWalk.cpp	2021-10-28 19:03:47.000000000 +0100
+@@ -45,7 +45,7 @@
+ #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
  #endif
- 
--#if (defined(linux) && \
+
+-#if (defined(linux) &&                                            \
 +#if defined(__GLIBC__) && (defined(linux) && \
       ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
        defined(HAVE__UNWIND_BACKTRACE)))
- #define MOZ_STACKWALK_SUPPORTS_LINUX 1
+ #  define MOZ_STACKWALK_SUPPORTS_LINUX 1

Re: firefox, firefox-esr, thunderbird: fix patch whitespace

[foopub]

[-- Attachment #1: Type: text/plain, Size: 182 bytes --]

New comment by foopub on void-packages repository

https://github.com/void-linux/void-packages/pull/33916#issuecomment-962092863

Comment:
No checks are running for `firefox-esr`?  

Re: firefox, firefox-esr, thunderbird: fix patch whitespace

[q66]

[-- Attachment #1: Type: text/plain, Size: 569 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/33916#issuecomment-962092886

Comment:
> Which patch are you referring to? The firefox one wasn't affected by the whitespace. I'm not sure which patch led to the initial commit to remove `-l`

see the commit message for https://github.com/void-linux/void-packages/commit/7b4119df5cbc0cc37348164a10c88a32910009d8 => https://github.com/void-linux/void-packages/commit/be0665ce5890dbae96a7254815b7ffc662f917de (https://gist.github.com/q66/061a35d2a5771ba87376d016dde7c46f)

Re: [PR PATCH] [Merged]: firefox, firefox-esr, thunderbird: fix patch whitespace

[q66]

[-- Attachment #1: Type: text/plain, Size: 368 bytes --]

There's a merged pull request on the void-packages repository

firefox, firefox-esr, thunderbird: fix patch whitespace
https://github.com/void-linux/void-packages/pull/33916

Description:
Needed because of https://github.com/void-linux/void-packages/commit/7b4119df5cbc0cc37348164a10c88a32910009d8 
See also https://github.com/void-linux/void-packages/issues/33915