- added icu patch (fixes build with icu 59 in C++11 mode)

- release 6

diff --git a/apache-mod_pagespeed-icu.patch b/apache-mod_pagespeed-icu.patch
new file mode 100644 (file)
index 0000000..d8c9f4c
--- /dev/null
+++ b/apache-mod_pagespeed-icu.patch
@@ -0,0 +1,14 @@
+--- modpagespeed-1.9.32.4/third_party/chromium/src/base/strings/string16.h.orig        2015-07-14 01:17:07.000000000 +0200
++++ modpagespeed-1.9.32.4/third_party/chromium/src/base/strings/string16.h     2017-04-26 20:58:21.381527688 +0200
+@@ -46,7 +46,11 @@
+ 
+ namespace base {
+ 
++#if (__cplusplus >= 201103L)
++typedef char16_t char16;
++#else
+ typedef uint16 char16;
++#endif
+ 
+ // char16 versions of the functions required by string16_char_traits; these
+ // are based on the wide character functions of similar names ("w" or "wcs"

diff --git a/apache-mod_pagespeed.spec b/apache-mod_pagespeed.spec
index 6314f2c413076527a31ac3952a4471bc4e61df78..e70bd6f9d313c86e65f40a6a454df766e73e8f4a 100644 (file)
--- a/apache-mod_pagespeed.spec
+++ b/apache-mod_pagespeed.spec
@@ -52,9 +52,11 @@ Name:                apache-mod_%{mod_name}
 # beta: 1.9.32.x-beta
 # stable: 1.9.32.x-stable
 Version:       1.9.32.4
-Release:       5
+Release:       6
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
+#Source0Download: https://github.com/pagespeed/mod_pagespeed/releases
+#Source0:      https://github.com/pagespeed/mod_pagespeed/archive/%{version}/mod_pagespeed-%{version}.tar.gz
 Source0:       modpagespeed-%{version}.tar.xz
 # Source0-md5: c6740a5de9cb7f20f0cf29c8835f6f95
 Source1:       get-source.sh
@@ -66,6 +68,7 @@ Patch4:               no-dev-stdout.patch
 Patch5:                apache24-config.patch
 Patch6:                no-force-xxbit.patch
 Patch7:                no-arch-opt.patch
+Patch8:                %{name}-icu.patch
 URL:           https://developers.google.com/speed/pagespeed/module
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.2
@@ -123,6 +126,7 @@ site is maintained.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %if 0
 sh -x %{_sourcedir}/clean-source.sh
@@ -130,6 +134,7 @@ sh -x %{_sourcedir}/clean-source.sh
 
 %{__rm} -r third_party/icu/source
 %{__rm} -r third_party/icu/genfiles
+# third_party_chromium uses "third_party/icu/..." includes
 install -d third_party/icu/source/{common,i18n}
 ln -s %{_includedir}/unicode third_party/icu/source/i18n/unicode
 ln -s %{_includedir}/unicode third_party/icu/source/common/unicode