aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/qtbase-use-TZDIR.patch
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/patches/qtbase-use-TZDIR.patch')
-rw-r--r--gnu/packages/patches/qtbase-use-TZDIR.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/patches/qtbase-use-TZDIR.patch
index 11c737d844..b6c377b133 100644
--- a/gnu/packages/patches/qtbase-use-TZDIR.patch
+++ b/gnu/packages/patches/qtbase-use-TZDIR.patch
@@ -4,8 +4,8 @@ important to be able to update it fast.
Based on a patch fron NixOS.
===================================================================
---- qtbase-opensource-src-5.9.4.orig/src/corelib/tools/qtimezoneprivate_tz.cpp
-+++ qtbase-opensource-src-5.9.4/src/corelib/tools/qtimezoneprivate_tz.cpp
+--- qtbase-opensource-src-5.14.2.orig/src/corelib/time/qtimezoneprivate_tz.cpp
++++ qtbase-opensource-src-5.15.2/src/corelib/time/qtimezoneprivate_tz.cpp
@@ -70,7 +70,11 @@
// Parse zone.tab table, assume lists all installed zones, if not will need to read directories
static QTzTimeZoneHash loadTzTimeZones()
title='2015-04-17 09:54:11 -0400'>2015-04-17Merge branch 'master' into core-updates...Conflicts: gnu-system.am gnu/packages/gstreamer.scm Mark H Weaver 2015-04-16gnu: Add libgtextutils....* gnu/packages/textutils.scm (libgtextutils): New variable. Ricardo Wurmus 2015-04-15gnu: recode: Fix tests....* gnu/packages/textutils.scm (recode): Rename phase 'fix-setup-py to 'pre-check. Set LD_LIBRARY_PATH to "$(pwd)/src/.libs" in pre-check phase. 宋文武 2015-03-23gnu: Add utf8proc....* gnu/packages/textutils.scm (utf8proc): New variable. Ricardo Wurmus 2015-03-10gnu: enca: Run tests sequentially....* gnu/packages/textutils.scm (enca)[arguments]: New field. Fixes build issue visible at <http://hydra.gnu.org/build/308913>. Ludovic Courtès 2015-03-09gnu: Add enca....* gnu/packages/textutils.scm (enca): New variable. Taylan Ulrich Bayırlı/Kammer 2015-03-09gnu: Add recode....* gnu/packages/textutils.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. Taylan Ulrich Bayırlı/Kammer