]> git.pld-linux.org Git - packages/php.git/blobdiff - php-icu64.patch
projects / packages / php.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- rediff patches, merged duplicate triggers
[packages/php.git] / php-icu64.patch
diff --git a/php-icu64.patch b/php-icu64.patch
index c5154fa4a1857eb9e6ff9cdccf1e8f4623cf4ab4..e9b7efae99e1318de3bac1aa6fcfc5ceb8df4e01 100644 (file)
--- a/php-icu64.patch
+++ b/php-icu64.patch
@@ -1,6 +1,7 @@
---- php-5.5.38.orig/ext/intl/breakiterator/breakiterator_class.cpp     2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/breakiterator/breakiterator_class.cpp  2019-04-18 09:26:37.409910360 +0200
-@@ -38,6 +38,7 @@
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/breakiterator/breakiterator_class.cpp php-5.6.40/ext/intl/breakiterator/breakiterator_class.cpp
+--- php-5.6.40.org/ext/intl/breakiterator/breakiterator_class.cpp      2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/breakiterator/breakiterator_class.cpp  2021-08-23 23:20:40.309048531 +0200
+@@ -38,6 +38,7 @@ extern "C" {
  }
  
  using PHP::CodePointBreakIterator;
@@ -8,8 +9,9 @@
  
  /* {{{ Global variables */
  zend_class_entry *BreakIterator_ce_ptr;
---- php-5.5.38.orig/ext/intl/breakiterator/breakiterator_class.h       2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/breakiterator/breakiterator_class.h    2019-04-18 09:27:25.925787455 +0200
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/breakiterator/breakiterator_class.h php-5.6.40/ext/intl/breakiterator/breakiterator_class.h
+--- php-5.6.40.org/ext/intl/breakiterator/breakiterator_class.h        2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/breakiterator/breakiterator_class.h    2021-08-23 23:20:40.309048531 +0200
 @@ -26,6 +26,8 @@
  
  #ifndef USE_BREAKITERATOR_POINTER
@@ -19,9 +21,10 @@
  #endif
  
  typedef struct {
---- php-5.5.38.orig/ext/intl/breakiterator/breakiterator_methods.cpp   2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/breakiterator/breakiterator_methods.cpp        2019-04-18 09:30:32.998928523 +0200
-@@ -32,6 +32,8 @@
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/breakiterator/breakiterator_methods.cpp php-5.6.40/ext/intl/breakiterator/breakiterator_methods.cpp
+--- php-5.6.40.org/ext/intl/breakiterator/breakiterator_methods.cpp    2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/breakiterator/breakiterator_methods.cpp        2021-08-23 23:20:40.309048531 +0200
+@@ -32,6 +32,8 @@ extern "C" {
  }
  
  using PHP::CodePointBreakIterator;
@@ -30,9 +33,10 @@
  
  U_CFUNC PHP_METHOD(BreakIterator, __construct)
  {
---- php-5.5.38.orig/ext/intl/breakiterator/codepointiterator_internal.cpp      2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/breakiterator/codepointiterator_internal.cpp   2019-04-18 09:24:40.240427586 +0200
-@@ -30,6 +30,7 @@
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/breakiterator/codepointiterator_internal.cpp php-5.6.40/ext/intl/breakiterator/codepointiterator_internal.cpp
+--- php-5.6.40.org/ext/intl/breakiterator/codepointiterator_internal.cpp       2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/breakiterator/codepointiterator_internal.cpp   2021-08-23 23:20:40.309048531 +0200
+@@ -30,6 +30,7 @@ typedef union {
  #define U_ALIGNMENT_OFFSET_UP(ptr) (sizeof(UAlignedMemory) - U_ALIGNMENT_OFFSET(ptr))
  
  using namespace PHP;
@@ -40,8 +44,9 @@
  
  UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CodePointBreakIterator);
  
---- php-5.5.38.orig/ext/intl/breakiterator/codepointiterator_internal.h        2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/breakiterator/codepointiterator_internal.h     2019-04-18 09:25:57.127796222 +0200
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/breakiterator/codepointiterator_internal.h php-5.6.40/ext/intl/breakiterator/codepointiterator_internal.h
+--- php-5.6.40.org/ext/intl/breakiterator/codepointiterator_internal.h 2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/breakiterator/codepointiterator_internal.h     2021-08-23 23:20:40.312381861 +0200
 @@ -18,8 +18,11 @@
  #define CODEPOINTITERATOR_INTERNAL_H
  
@@ -55,11 +60,12 @@
  
  namespace PHP {
  
---- php-5.5.38.orig/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp  2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp       2019-04-18 09:30:55.920130219 +0200
-@@ -25,6 +25,9 @@
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp php-5.6.40/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
+--- php-5.6.40.org/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp   2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp       2021-08-23 23:20:40.312381861 +0200
+@@ -25,6 +25,9 @@ extern "C" {
  
- #include "../ext/intl_convertcpp.h"
+ #include "../intl_convertcpp.h"
  
 +using icu::RuleBasedBreakIterator;
 +using icu::Locale;
@@ -67,9 +73,10 @@
  static inline RuleBasedBreakIterator *fetch_rbbi(BreakIterator_object *bio) {
        return (RuleBasedBreakIterator*)bio->biter;
  }
---- php-5.5.38.orig/ext/intl/calendar/calendar_class.cpp       2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/calendar/calendar_class.cpp    2019-04-18 09:21:08.825998526 +0200
-@@ -34,6 +34,9 @@
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/calendar/calendar_class.cpp php-5.6.40/ext/intl/calendar/calendar_class.cpp
+--- php-5.6.40.org/ext/intl/calendar/calendar_class.cpp        2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/calendar/calendar_class.cpp    2021-08-23 23:20:40.312381861 +0200
+@@ -34,6 +34,9 @@ extern "C" {
  #include <assert.h>
  }
  
@@ -79,8 +86,9 @@
  /* {{{ Global variables */
  zend_class_entry *Calendar_ce_ptr;
  zend_class_entry *GregorianCalendar_ce_ptr;
---- php-5.5.38.orig/ext/intl/calendar/calendar_class.h 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/calendar/calendar_class.h      2019-04-18 08:51:22.553104240 +0200
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/calendar/calendar_class.h php-5.6.40/ext/intl/calendar/calendar_class.h
+--- php-5.6.40.org/ext/intl/calendar/calendar_class.h  2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/calendar/calendar_class.h      2021-08-23 23:20:40.312381861 +0200
 @@ -26,6 +26,8 @@
  
  #ifndef USE_CALENDAR_POINTER
@@ -90,9 +98,10 @@
  #endif
  
  typedef struct {
---- php-5.5.38.orig/ext/intl/calendar/calendar_methods.cpp     2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/calendar/calendar_methods.cpp  2019-04-18 09:21:37.634177141 +0200
-@@ -40,6 +40,8 @@
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/calendar/calendar_methods.cpp php-5.6.40/ext/intl/calendar/calendar_methods.cpp
+--- php-5.6.40.org/ext/intl/calendar/calendar_methods.cpp      2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/calendar/calendar_methods.cpp  2021-08-23 23:20:40.312381861 +0200
+@@ -40,6 +40,8 @@ extern "C" {
  }
  #include "../common/common_enum.h"
  
@@ -101,9 +110,10 @@
  U_CFUNC PHP_METHOD(IntlCalendar, __construct)
  {
        zend_throw_exception( NULL,
---- php-5.5.38.orig/ext/intl/calendar/gregoriancalendar_methods.cpp    2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/calendar/gregoriancalendar_methods.cpp 2019-04-18 09:23:00.341851246 +0200
-@@ -32,6 +32,11 @@
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/calendar/gregoriancalendar_methods.cpp php-5.6.40/ext/intl/calendar/gregoriancalendar_methods.cpp
+--- php-5.6.40.org/ext/intl/calendar/gregoriancalendar_methods.cpp     2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/calendar/gregoriancalendar_methods.cpp 2021-08-23 23:20:40.312381861 +0200
+@@ -32,6 +32,11 @@ extern "C" {
  #include <ext/date/php_date.h>
  }
  
@@ -115,10 +125,11 @@
  static inline GregorianCalendar *fetch_greg(Calendar_object *co) {
        return (GregorianCalendar*)co->ucal;
  }
---- php-5.5.38.orig/ext/intl/common/common_date.cpp    2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/common/common_date.cpp 2019-04-18 08:53:40.357013115 +0200
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/common/common_date.cpp php-5.6.40/ext/intl/common/common_date.cpp
+--- php-5.6.40.org/ext/intl/common/common_date.cpp     2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/common/common_date.cpp 2021-08-23 23:20:40.312381861 +0200
 @@ -17,6 +17,8 @@
- #include "../ext/intl_cppshims.h"
+ #include "../intl_cppshims.h"
  
  #include <unicode/calendar.h>
 +using icu::TimeZone;
@@ -126,9 +137,10 @@
  
  extern "C" {
  #include "../php_intl.h"
---- php-5.5.38.orig/ext/intl/common/common_date.h      2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/common/common_date.h   2019-04-18 09:04:53.802375635 +0200
-@@ -27,6 +27,7 @@
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/common/common_date.h php-5.6.40/ext/intl/common/common_date.h
+--- php-5.6.40.org/ext/intl/common/common_date.h       2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/common/common_date.h   2021-08-23 23:20:40.312381861 +0200
+@@ -27,6 +27,7 @@ U_CDECL_END
  #ifdef __cplusplus
  
  #include <unicode/timezone.h>
@@ -136,9 +148,10 @@
  
  U_CFUNC TimeZone *timezone_convert_datetimezone(int type, void *object, int is_datetime, intl_error *outside_error, const char *func TSRMLS_DC);
  U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
---- php-5.5.38.orig/ext/intl/common/common_enum.h      2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/common/common_enum.h   2019-04-18 08:50:49.214683321 +0200
-@@ -69,6 +69,7 @@
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/common/common_enum.h php-5.6.40/ext/intl/common/common_enum.h
+--- php-5.6.40.org/ext/intl/common/common_enum.h       2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/common/common_enum.h   2021-08-23 23:20:40.312381861 +0200
+@@ -69,6 +69,7 @@ U_CFUNC void zoi_with_current_get_curren
  U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter TSRMLS_DC);
  
  #ifdef __cplusplus
@@ -146,9 +159,10 @@
  U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object TSRMLS_DC);
  #endif
  
---- php-5.5.38.orig/ext/intl/dateformat/dateformat_format_object.cpp   2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/dateformat/dateformat_format_object.cpp        2019-04-18 08:55:34.509673920 +0200
-@@ -33,6 +33,12 @@
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/dateformat/dateformat_format_object.cpp php-5.6.40/ext/intl/dateformat/dateformat_format_object.cpp
+--- php-5.6.40.org/ext/intl/dateformat/dateformat_format_object.cpp    2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/dateformat/dateformat_format_object.cpp        2021-08-23 23:20:40.312381861 +0200
+@@ -33,6 +33,12 @@ extern "C" {
  #include "../common/common_date.h"
  }
  
@@ -161,15 +175,27 @@
  static const DateFormat::EStyle valid_styles[] = {
                DateFormat::kNone,
                DateFormat::kFull,
---- php-5.5.38.orig/ext/intl/dateformat/dateformat_helpers.h   2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/dateformat/dateformat_helpers.h        2019-04-18 09:07:05.049267391 +0200
-@@ -22,11 +22,18 @@
- #endif
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/dateformat/dateformat_helpers.cpp php-5.6.40/ext/intl/dateformat/dateformat_helpers.cpp
+--- php-5.6.40.org/ext/intl/dateformat/dateformat_helpers.cpp  2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/dateformat/dateformat_helpers.cpp      2021-08-23 23:20:40.312381861 +0200
+@@ -28,6 +28,8 @@ extern "C" {
+ #include "../calendar/calendar_class.h"
+ }
  
- #include <unicode/calendar.h>
++using icu::GregorianCalendar;
 +
-+#include <unicode/datefmt.h>
+ int datefmt_process_calendar_arg(zval* calendar_zv,
+                                                                Locale const& locale,
+                                                                const char *func_name,
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/dateformat/dateformat_helpers.h php-5.6.40/ext/intl/dateformat/dateformat_helpers.h
+--- php-5.6.40.org/ext/intl/dateformat/dateformat_helpers.h    2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/dateformat/dateformat_helpers.h        2021-08-23 23:20:40.312381861 +0200
+@@ -23,10 +23,17 @@
+ 
+ #include <unicode/calendar.h>
  
++#include <unicode/datefmt.h>
++
  extern "C" {
  #include "../php_intl.h"
  }
@@ -182,8 +208,9 @@
  int datefmt_process_calendar_arg(zval* calendar_zv,
                                                                 Locale const& locale,
                                                                 const char *func_name,
---- php-5.5.38.orig/ext/intl/intl_convertcpp.h 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/intl_convertcpp.h      2019-04-18 08:49:50.358252987 +0200
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/intl_convertcpp.h php-5.6.40/ext/intl/intl_convertcpp.h
+--- php-5.6.40.org/ext/intl/intl_convertcpp.h  2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/intl_convertcpp.h      2021-08-23 23:20:40.312381861 +0200
 @@ -24,6 +24,7 @@
  #endif
  
@@ -192,8 +219,9 @@
  
  int intl_stringFromChar(UnicodeString &ret, char *str, int32_t str_len, UErrorCode *status);
  
---- php-5.5.38.orig/ext/intl/msgformat/msgformat_helpers.cpp   2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/msgformat/msgformat_helpers.cpp        2019-04-18 09:00:43.482564710 +0200
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/msgformat/msgformat_helpers.cpp php-5.6.40/ext/intl/msgformat/msgformat_helpers.cpp
+--- php-5.6.40.org/ext/intl/msgformat/msgformat_helpers.cpp    2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/msgformat/msgformat_helpers.cpp        2021-08-23 23:20:40.312381861 +0200
 @@ -27,6 +27,7 @@
  #include <unicode/timezone.h>
  #include <unicode/datefmt.h>
@@ -202,7 +230,7 @@
  
  #include <vector>
  
-@@ -76,6 +77,16 @@
+@@ -76,6 +77,16 @@ MessageFormatAdapter::getMessagePattern(
  #endif
  U_NAMESPACE_END
  
@@ -219,9 +247,10 @@
  U_CFUNC int32_t umsg_format_arg_count(UMessageFormat *fmt)
  {
        int32_t fmt_count = 0;
---- php-5.5.38.orig/ext/intl/timezone/timezone_class.cpp       2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/timezone/timezone_class.cpp    2019-04-18 09:01:40.738904566 +0200
-@@ -37,6 +37,8 @@
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/timezone/timezone_class.cpp php-5.6.40/ext/intl/timezone/timezone_class.cpp
+--- php-5.6.40.org/ext/intl/timezone/timezone_class.cpp        2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/timezone/timezone_class.cpp    2021-08-23 23:20:40.312381861 +0200
+@@ -37,6 +37,8 @@ extern "C" {
  #include <ext/date/php_date.h>
  }
  
@@ -230,8 +259,9 @@
  /* {{{ Global variables */
  U_CDECL_BEGIN
  zend_class_entry *TimeZone_ce_ptr = NULL;
---- php-5.5.38.orig/ext/intl/timezone/timezone_class.h 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/timezone/timezone_class.h      2019-04-18 08:58:02.620784547 +0200
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/timezone/timezone_class.h php-5.6.40/ext/intl/timezone/timezone_class.h
+--- php-5.6.40.org/ext/intl/timezone/timezone_class.h  2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/timezone/timezone_class.h      2021-08-23 23:20:40.312381861 +0200
 @@ -29,6 +29,8 @@
  
  #ifndef USE_TIMEZONE_POINTER
@@ -241,8 +271,9 @@
  #endif
  
  typedef struct {
---- php-5.5.38.orig/ext/intl/timezone/timezone_methods.cpp     2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/timezone/timezone_methods.cpp  2019-04-18 09:20:17.116617981 +0200
+diff -urNp -x '*.orig' php-5.6.40.org/ext/intl/timezone/timezone_methods.cpp php-5.6.40/ext/intl/timezone/timezone_methods.cpp
+--- php-5.6.40.org/ext/intl/timezone/timezone_methods.cpp      2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/ext/intl/timezone/timezone_methods.cpp  2021-08-23 23:20:40.312381861 +0200
 @@ -23,6 +23,7 @@
  #include <unicode/locid.h>
  #include <unicode/timezone.h>
@@ -251,7 +282,7 @@
  #include "intl_convertcpp.h"
  
  #include "../common/common_date.h"
-@@ -37,6 +38,9 @@
+@@ -37,6 +38,9 @@ extern "C" {
  }
  #include "common/common_enum.h"
  
@@ -261,15 +292,3 @@
  U_CFUNC PHP_METHOD(IntlTimeZone, __construct)
  {
        zend_throw_exception( NULL,
-
---- php-7.0.33/ext/intl/dateformat/dateformat_helpers.cpp~     2018-12-04 18:22:53.000000000 +0100
-+++ php-7.0.33/ext/intl/dateformat/dateformat_helpers.cpp      2019-10-19 21:29:32.416045611 +0200
-@@ -28,6 +28,8 @@ extern "C" {
- #include "../calendar/calendar_class.h"
- }
- 
-+using icu::GregorianCalendar;
-+
- int datefmt_process_calendar_arg(zval* calendar_zv,
-                                                                Locale const& locale,
-                                                                const char *func_name,
PHP: Hypertext Preprocessor
This page took 0.035238 seconds and 4 git commands to generate.