[Pkg-php-commits] [php/debian-sid] Refreshed use_embedded_timezonedb.patch

[Ondřej Surý]

---
 debian/patches/use_embedded_timezonedb.patch |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/patches/use_embedded_timezonedb.patch b/debian/patches/use_embedded_timezonedb.patch
index d3f96b3..bf7eab6 100644
--- a/debian/patches/use_embedded_timezonedb.patch
+++ b/debian/patches/use_embedded_timezonedb.patch
@@ -8,8 +8,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
 
---- php.orig/ext/date/lib/parse_tz.c
-+++ php/ext/date/lib/parse_tz.c
+--- a/ext/date/lib/parse_tz.c
++++ b/ext/date/lib/parse_tz.c
 @@ -24,6 +24,16 @@
  
  #include "timelib.h"
@@ -258,8 +258,8 @@ r1: initial revision
  
  static ttinfo* fetch_timezone_offset(timelib_tzinfo *tz, timelib_sll ts, timelib_sll *transition_time)
  {
---- php.orig/ext/date/lib/timelib.h
-+++ php/ext/date/lib/timelib.h
+--- a/ext/date/lib/timelib.h
++++ b/ext/date/lib/timelib.h
 @@ -32,6 +32,10 @@
  
  #define TIMELIB_SPECIAL_WEEKDAY  0x01
@@ -271,8 +271,8 @@ r1: initial revision
  #ifndef LONG_MAX
  #define LONG_MAX 2147483647L
  #endif
---- php.orig/ext/date/lib/timelib.m4
-+++ php/ext/date/lib/timelib.m4
+--- a/ext/date/lib/timelib.m4
++++ b/ext/date/lib/timelib.m4
 @@ -78,3 +78,17 @@ stdlib.h
  
  dnl Check for strtoll, atoll
@@ -291,10 +291,10 @@ r1: initial revision
 +   fi
 +fi
 +
---- php.orig/ext/date/php_date.c
-+++ php/ext/date/php_date.c
-@@ -599,6 +599,11 @@ static char* guess_timezone(const timeli
- 	if (DATEG(default_timezone) && (strlen(DATEG(default_timezone)) > 0) && timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) {
+--- a/ext/date/php_date.c
++++ b/ext/date/php_date.c
+@@ -608,6 +608,11 @@ static char* guess_timezone(const timeli
+ 	} else if (*DATEG(default_timezone) && timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) {
  		return DATEG(default_timezone);
  	}
 +#ifdef TIMELIB_SYSTEM_TZID
-- 
1.6.3.3