Date: Thu, 9 Jul 2020 22:21:50 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541830 - in head/devel/qt5-core: . files Message-ID: <202007092221.069MLoqW006338@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adridg Date: Thu Jul 9 22:21:49 2020 New Revision: 541830 URL: https://svnweb.freebsd.org/changeset/ports/541830 Log: Fix an off-by-one in TZ determination For the systems where /etc/localtime is not a symlink, the patch for reading /var/db/zoneinfo was chopping off one letter too many. So you'd end up with "Europe/Amsterda" as timezone, which isn't valid. Modified: head/devel/qt5-core/Makefile head/devel/qt5-core/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp Modified: head/devel/qt5-core/Makefile ============================================================================== --- head/devel/qt5-core/Makefile Thu Jul 9 22:00:50 2020 (r541829) +++ head/devel/qt5-core/Makefile Thu Jul 9 22:21:49 2020 (r541830) @@ -2,6 +2,7 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- Modified: head/devel/qt5-core/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp ============================================================================== --- head/devel/qt5-core/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp Thu Jul 9 22:00:50 2020 (r541829) +++ head/devel/qt5-core/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp Thu Jul 9 22:21:49 2020 (r541830) @@ -18,7 +18,7 @@ + if (newlineIndex < 0) // No newline in file + ianaId = tzcontents; + if (newlineIndex > 2) // Newline, chop it off -+ ianaId = tzcontents.left(newlineIndex-1); ++ ianaId = tzcontents.left(newlineIndex); + } + } + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007092221.069MLoqW006338>