diff mbox series

package/libglib2: correct upstream status for patch 0001

Message ID 20201209112634.18600-1-patrickdepinguin@gmail.com
State Accepted
Headers show
Series package/libglib2: correct upstream status for patch 0001 | expand

Commit Message

Thomas De Schampheleire Dec. 9, 2020, 11:26 a.m. UTC
From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>

Patch '0001-fix-compile-time-atomic-detection.patch' claims to be Merged but
this is not true. The linked issue is closed with 'Needs information', and
the code itself is effectively not merged.

Clarify the 'Upstream-status' line to make this more clear.

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 package/libglib2/0001-fix-compile-time-atomic-detection.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Note: I leave the actual discussion with upstream to Adam, as he was involved in
the issue before.

Comments

Peter Korsgaard Dec. 14, 2020, 2:49 p.m. UTC | #1
>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:

 > From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
 > Patch '0001-fix-compile-time-atomic-detection.patch' claims to be Merged but
 > this is not true. The linked issue is closed with 'Needs information', and
 > the code itself is effectively not merged.

 > Clarify the 'Upstream-status' line to make this more clear.

 > Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
 > ---
 >  package/libglib2/0001-fix-compile-time-atomic-detection.patch | 2 +-
 >  1 file changed, 1 insertion(+), 1 deletion(-)

 > Note: I leave the actual discussion with upstream to Adam, as he was involved in
 > the issue before.

Committed, thanks.
Peter Korsgaard Dec. 21, 2020, 1:46 p.m. UTC | #2
>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:

 > From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
 > Patch '0001-fix-compile-time-atomic-detection.patch' claims to be Merged but
 > this is not true. The linked issue is closed with 'Needs information', and
 > the code itself is effectively not merged.

 > Clarify the 'Upstream-status' line to make this more clear.

 > Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
 > ---
 >  package/libglib2/0001-fix-compile-time-atomic-detection.patch | 2 +-
 >  1 file changed, 1 insertion(+), 1 deletion(-)

 > Note: I leave the actual discussion with upstream to Adam, as he was involved in
 > the issue before.

Committed to 2020.02.x, 2020.08.x and 2020.11.x, thanks.
diff mbox series

Patch

diff --git a/package/libglib2/0001-fix-compile-time-atomic-detection.patch b/package/libglib2/0001-fix-compile-time-atomic-detection.patch
index 9d2381bb35..d84a1ab460 100644
--- a/package/libglib2/0001-fix-compile-time-atomic-detection.patch
+++ b/package/libglib2/0001-fix-compile-time-atomic-detection.patch
@@ -5,7 +5,7 @@  Subject: [PATCH] Fix compile time atomic detection
 
 Improved compile-time detection of atomic support in the compiler.
 
-Upstream-Status: Merged
+Upstream-Status: 'Needs information'
 See : https://gitlab.gnome.org/GNOME/glib/issues/1063
 
 Signed-off-by: Brendan Heading <brendanheading@gmail.com>