diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-08-29 12:58:34 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-08-29 12:58:34 +0400 |
| commit | 1a899e9a2aaa8a6a6eb38bc6d5c0497b61fb7d8a (patch) | |
| tree | 724bf26cafe059a78516a998f7a01dc035a29457 | |
| parent | ac19054b5825e461e468af015cb315a4f3714354 (diff) | |
| download | php-1a899e9a2aaa8a6a6eb38bc6d5c0497b61fb7d8a.tar.gz | |
Fixed building the "date" extension (dyson-date.patch)
| -rw-r--r-- | debian/patches/dyson-date.patch | 16 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/debian/patches/dyson-date.patch b/debian/patches/dyson-date.patch new file mode 100644 index 000000000..329fb8846 --- /dev/null +++ b/debian/patches/dyson-date.patch @@ -0,0 +1,16 @@ +Index: php/ext/date/php_date.c +=================================================================== +--- php.orig/ext/date/php_date.c ++++ php/ext/date/php_date.c +@@ -987,7 +987,11 @@ static char* guess_timezone(const timeli + the_time = time(NULL); + ta = php_localtime_r(&the_time, &tmbuf); + if (ta) { ++#ifdef HAVE_TM_GMTOFF + tzid = timelib_timezone_id_from_abbr(ta->tm_zone, ta->tm_gmtoff, ta->tm_isdst); ++#else ++ tzid = timelib_timezone_id_from_abbr("utc", 0, ta->tm_isdst); ++#endif + } + if (! tzid) { + tzid = "UTC"; diff --git a/debian/patches/series b/debian/patches/series index 10a54e5b8..2930711ae 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -46,3 +46,4 @@ php-5.6.0-oldpcre.patch hack-phpdbg-to-explicitly-link-with-libedit.patch php-fpm-getallheaders.patch 0001-Fix-ZEND_MM_ALIGNMENT-on-m64k.patch +dyson-date.patch |