From 3ac3785347d8b9a057277ed77b7ffae353c5ac0d Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 9 Oct 2024 13:34:34 -0400
Subject: [PATCH] ICUTimeConversion: Remove special casing in _FillTmValues for
 GMT.

This basically reverts the changes in this function back to before
5b4d5ef89794bc57bcc0a0647af53d66ba0f6ee8.

As c686c2216cbe49683cdfe81b878748252ab9eb0e is left intact, #19047
is still fixed regardless.
---
 src/system/libroot/add-ons/icu/ICUTimeConversion.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/system/libroot/add-ons/icu/ICUTimeConversion.cpp b/src/system/libroot/add-ons/icu/ICUTimeConversion.cpp
index bb67f4e005..1417f57369 100644
--- a/src/system/libroot/add-ons/icu/ICUTimeConversion.cpp
+++ b/src/system/libroot/add-ons/icu/ICUTimeConversion.cpp
@@ -253,11 +253,7 @@ ICUTimeConversion::_FillTmValues(const TimeZone* icuTimeZone,
 	if (!U_SUCCESS(icuStatus))
 		return B_ERROR;
 
-	if (tmOut->tm_gmtoff == 0)
-		tmOut->tm_zone = (char*)"GMT";
-	else
-		tmOut->tm_zone = fDataBridge->addrOfTZName[tmOut->tm_isdst ? 1 : 0];
-
+	tmOut->tm_zone = fDataBridge->addrOfTZName[tmOut->tm_isdst ? 1 : 0];
 	return B_OK;
 }