- PLD merge, more work in progress, release 0.1

[packages/php.git] / php-systzdata.patch

diff --git a/php-systzdata.patch b/php-systzdata.patch
index df06b6f2dc4b2e49db3f8307908958bd8ad09223..a33ef0861e4d54702e0b9a92103deb214aed5c6b 100644 (file)
--- a/php-systzdata.patch
+++ b/php-systzdata.patch
@@ -20,9 +20,8 @@ r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
 r2: add filesystem trawl to set up name alias index
 r1: initial revision
 
-diff -up php-5.6.9RC1/ext/date/lib/parse_tz.c.systzdata php-5.6.9RC1/ext/date/lib/parse_tz.c
---- php-5.6.9RC1/ext/date/lib/parse_tz.c.systzdata     2015-04-30 00:00:18.000000000 +0200
-+++ php-5.6.9RC1/ext/date/lib/parse_tz.c       2015-04-30 06:36:47.019617321 +0200
+--- php-7.0.0RC1/ext/date/lib/parse_tz.c~      2015-08-27 12:06:04.000000000 +0300
++++ php-7.0.0RC1/ext/date/lib/parse_tz.c       2015-08-27 12:08:08.706661229 +0300
 @@ -20,6 +20,16 @@
  
  #include "timelib.h"
@@ -40,11 +39,10 @@ diff -up php-5.6.9RC1/ext/date/lib/parse_tz.c.systzdata php-5.6.9RC1/ext/date/li
  #include <stdio.h>
  
  #ifdef HAVE_LOCALE_H
-@@ -31,7 +41,12 @@
+@@ -43,7 +43,11 @@
  #endif
  
  #define TIMELIB_SUPPORTS_V2DATA
-+
 +#ifndef HAVE_SYSTEM_TZDATA
  #include "timezonedb.h"
 +#endif