[arch-commits] Commit in webkit2gtk/repos (10 files)
Jan Steffens
heftig at archlinux.org
Wed Jun 21 11:55:02 UTC 2017
Date: Wednesday, June 21, 2017 @ 11:55:01
Author: heftig
Revision: 299118
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
webkit2gtk/repos/extra-i686/PKGBUILD
(from rev 299117, webkit2gtk/trunk/PKGBUILD)
webkit2gtk/repos/extra-i686/gcc7-memcpy.patch
(from rev 299117, webkit2gtk/trunk/gcc7-memcpy.patch)
webkit2gtk/repos/extra-i686/icu59.patch
(from rev 299117, webkit2gtk/trunk/icu59.patch)
webkit2gtk/repos/extra-x86_64/PKGBUILD
(from rev 299117, webkit2gtk/trunk/PKGBUILD)
webkit2gtk/repos/extra-x86_64/gcc7-memcpy.patch
(from rev 299117, webkit2gtk/trunk/gcc7-memcpy.patch)
webkit2gtk/repos/extra-x86_64/icu59.patch
(from rev 299117, webkit2gtk/trunk/icu59.patch)
Deleted:
webkit2gtk/repos/extra-i686/PKGBUILD
webkit2gtk/repos/extra-i686/icu59.patch
webkit2gtk/repos/extra-x86_64/PKGBUILD
webkit2gtk/repos/extra-x86_64/icu59.patch
--------------------------------+
/PKGBUILD | 116 +++++++++++++++++++++++++++++++++++++++
/icu59.patch | 76 +++++++++++++++++++++++++
extra-i686/PKGBUILD | 56 ------------------
extra-i686/gcc7-memcpy.patch | 34 +++++++++++
extra-i686/icu59.patch | 38 ------------
extra-x86_64/PKGBUILD | 56 ------------------
extra-x86_64/gcc7-memcpy.patch | 34 +++++++++++
extra-x86_64/icu59.patch | 38 ------------
8 files changed, 260 insertions(+), 188 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-06-21 11:43:34 UTC (rev 299117)
+++ extra-i686/PKGBUILD 2017-06-21 11:55:01 UTC (rev 299118)
@@ -1,56 +0,0 @@
-# $Id$
-# Contributor: Eric Bélanger <eric at archlinux.org>
-
-pkgname=webkit2gtk
-pkgver=2.16.3
-pkgrel=1
-pkgdesc="GTK+ Web content engine library"
-arch=(i686 x86_64)
-url="https://webkitgtk.org/"
-license=(custom)
-depends=(libxt libxslt enchant geoclue2 gst-plugins-base-libs
- libsecret libwebp harfbuzz-icu gtk3 libnotify hyphen)
-makedepends=(gtk2 gperf gobject-introspection ruby gtk-doc cmake python python2)
-optdepends=('gtk2: Netscape plugin support'
- 'gst-plugins-base: free media decoding'
- 'gst-plugins-good: media decoding'
- 'gst-libav: nonfree media decoding')
-options=(!emptydirs)
-source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc}
- icu59.patch)
-sha256sums=('204e9131da0101b9bc8765716e70a897121af04b964d9827cd9f20816a77b512'
- 'SKIP'
- 'eb791b9c8dcb84996904846dedf8c3ddf1a5fde32330177f3f0071510bd8ca6d')
-validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3')
-
-prepare() {
- mkdir build
-
- cd webkitgtk-$pkgver
- sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc
- rm -r Source/ThirdParty/gtest/
- #rm -r Source/ThirdParty/qunit/
- patch -Np1 -i ../icu59.patch
-}
-
-build() {
- cd build
- cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=/usr/lib -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \
- -DENABLE_GTKDOC=ON -DPYTHON_EXECUTABLE=/usr/bin/python2 ../webkitgtk-$pkgver
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-
- install -m755 -d "$pkgdir/usr/share/licenses/webkit2gtk"
- cd "$srcdir/webkitgtk-$pkgver/Source"
- for f in $(find -name 'COPYING*' -or -name 'LICENSE*'); do
- echo $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE"
- cat $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE"
- echo "" >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE"
- done
-}
Copied: webkit2gtk/repos/extra-i686/PKGBUILD (from rev 299117, webkit2gtk/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-06-21 11:55:01 UTC (rev 299118)
@@ -0,0 +1,58 @@
+# $Id$
+# Contributor: Eric Bélanger <eric at archlinux.org>
+
+pkgname=webkit2gtk
+pkgver=2.16.4
+pkgrel=1
+pkgdesc="GTK+ Web content engine library"
+arch=(i686 x86_64)
+url="https://webkitgtk.org/"
+license=(custom)
+depends=(libxt libxslt enchant geoclue2 gst-plugins-base-libs
+ libsecret libwebp harfbuzz-icu gtk3 libnotify hyphen)
+makedepends=(gtk2 gperf gobject-introspection ruby gtk-doc cmake python python2)
+optdepends=('gtk2: Netscape plugin support'
+ 'gst-plugins-base: free media decoding'
+ 'gst-plugins-good: media decoding'
+ 'gst-libav: nonfree media decoding')
+options=(!emptydirs)
+source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc}
+ icu59.patch gcc7-memcpy.patch)
+sha256sums=('f9aba4338319bd539785345144e28c8027dc8cb526b2e443e0c8f2c0239f5128'
+ 'SKIP'
+ 'eb791b9c8dcb84996904846dedf8c3ddf1a5fde32330177f3f0071510bd8ca6d'
+ '025e36bef353f850598a9bd9d91bc1aa2e2f75db9f46c252ec2f861726299189')
+validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3')
+
+prepare() {
+ mkdir build
+ cd webkitgtk-$pkgver
+
+ patch -Np1 -i ../icu59.patch
+ patch -Np1 -i ../gcc7-memcpy.patch # https://bugs.webkit.org/show_bug.cgi?id=173407
+
+ sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc
+ rm -r Source/ThirdParty/gtest/
+}
+
+build() {
+ cd build
+ cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=/usr/lib -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \
+ -DENABLE_GTKDOC=ON -DPYTHON_EXECUTABLE=/usr/bin/python2 ../webkitgtk-$pkgver
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+
+ install -m755 -d "$pkgdir/usr/share/licenses/webkit2gtk"
+ cd "$srcdir/webkitgtk-$pkgver/Source"
+ for f in $(find -name 'COPYING*' -or -name 'LICENSE*'); do
+ echo $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE"
+ cat $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE"
+ echo "" >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE"
+ done
+}
Copied: webkit2gtk/repos/extra-i686/gcc7-memcpy.patch (from rev 299117, webkit2gtk/trunk/gcc7-memcpy.patch)
===================================================================
--- extra-i686/gcc7-memcpy.patch (rev 0)
+++ extra-i686/gcc7-memcpy.patch 2017-06-21 11:55:01 UTC (rev 299118)
@@ -0,0 +1,34 @@
+diff -u -r webkitgtk-2.16.4/Source/WTF/wtf/text/StringImpl.h webkitgtk-2.16.4-memcpy/Source/WTF/wtf/text/StringImpl.h
+--- webkitgtk-2.16.4/Source/WTF/wtf/text/StringImpl.h 2017-02-20 17:20:15.000000000 +0100
++++ webkitgtk-2.16.4-memcpy/Source/WTF/wtf/text/StringImpl.h 2017-06-21 09:45:07.835653812 +0200
+@@ -581,29 +581,7 @@
+ // FIXME: Does this really belong in StringImpl?
+ template <typename T> static void copyChars(T* destination, const T* source, unsigned numCharacters)
+ {
+- if (numCharacters == 1) {
+- *destination = *source;
+- return;
+- }
+-
+- if (numCharacters <= s_copyCharsInlineCutOff) {
+- unsigned i = 0;
+-#if (CPU(X86) || CPU(X86_64))
+- const unsigned charsPerInt = sizeof(uint32_t) / sizeof(T);
+-
+- if (numCharacters > charsPerInt) {
+- unsigned stopCount = numCharacters & ~(charsPerInt - 1);
+-
+- const uint32_t* srcCharacters = reinterpret_cast<const uint32_t*>(source);
+- uint32_t* destCharacters = reinterpret_cast<uint32_t*>(destination);
+- for (unsigned j = 0; i < stopCount; i += charsPerInt, ++j)
+- destCharacters[j] = srcCharacters[j];
+- }
+-#endif
+- for (; i < numCharacters; ++i)
+- destination[i] = source[i];
+- } else
+- memcpy(destination, source, numCharacters * sizeof(T));
++ memcpy(destination, source, numCharacters * sizeof(T));
+ }
+
+ ALWAYS_INLINE static void copyChars(UChar* destination, const LChar* source, unsigned numCharacters)
Deleted: extra-i686/icu59.patch
===================================================================
--- extra-i686/icu59.patch 2017-06-21 11:43:34 UTC (rev 299117)
+++ extra-i686/icu59.patch 2017-06-21 11:55:01 UTC (rev 299118)
@@ -1,38 +0,0 @@
---- webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h.orig 2017-02-20 17:20:08.000000000 +0100
-+++ webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h 2017-04-22 14:35:00.926530142 +0200
-@@ -32,6 +32,7 @@
- #include <stdbool.h>
- #endif
- #include <stddef.h> /* for size_t */
-+#include <uchar.h>
-
- #ifdef __cplusplus
- extern "C" {
-@@ -46,7 +47,7 @@
- character. As with all scalar types, endianness depends on the underlying
- architecture.
- */
-- typedef unsigned short JSChar;
-+ typedef char16_t JSChar;
- #else
- typedef wchar_t JSChar;
- #endif
---- webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h.orig 2017-02-20 17:20:17.000000000 +0100
-+++ webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h 2017-04-22 14:35:56.853196170 +0200
-@@ -28,6 +28,7 @@
-
- #include <WebKit/WKBase.h>
- #include <stddef.h>
-+#include <uchar.h>
-
- #ifndef __cplusplus
- #include <stdbool.h>
-@@ -39,7 +40,7 @@
-
- #if !defined(WIN32) && !defined(_WIN32) \
- && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */
-- typedef unsigned short WKChar;
-+ typedef char16_t WKChar;
- #else
- typedef wchar_t WKChar;
- #endif
Copied: webkit2gtk/repos/extra-i686/icu59.patch (from rev 299117, webkit2gtk/trunk/icu59.patch)
===================================================================
--- extra-i686/icu59.patch (rev 0)
+++ extra-i686/icu59.patch 2017-06-21 11:55:01 UTC (rev 299118)
@@ -0,0 +1,38 @@
+--- webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h.orig 2017-02-20 17:20:08.000000000 +0100
++++ webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h 2017-04-22 14:35:00.926530142 +0200
+@@ -32,6 +32,7 @@
+ #include <stdbool.h>
+ #endif
+ #include <stddef.h> /* for size_t */
++#include <uchar.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+@@ -46,7 +47,7 @@
+ character. As with all scalar types, endianness depends on the underlying
+ architecture.
+ */
+- typedef unsigned short JSChar;
++ typedef char16_t JSChar;
+ #else
+ typedef wchar_t JSChar;
+ #endif
+--- webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h.orig 2017-02-20 17:20:17.000000000 +0100
++++ webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h 2017-04-22 14:35:56.853196170 +0200
+@@ -28,6 +28,7 @@
+
+ #include <WebKit/WKBase.h>
+ #include <stddef.h>
++#include <uchar.h>
+
+ #ifndef __cplusplus
+ #include <stdbool.h>
+@@ -39,7 +40,7 @@
+
+ #if !defined(WIN32) && !defined(_WIN32) \
+ && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */
+- typedef unsigned short WKChar;
++ typedef char16_t WKChar;
+ #else
+ typedef wchar_t WKChar;
+ #endif
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-06-21 11:43:34 UTC (rev 299117)
+++ extra-x86_64/PKGBUILD 2017-06-21 11:55:01 UTC (rev 299118)
@@ -1,56 +0,0 @@
-# $Id$
-# Contributor: Eric Bélanger <eric at archlinux.org>
-
-pkgname=webkit2gtk
-pkgver=2.16.3
-pkgrel=1
-pkgdesc="GTK+ Web content engine library"
-arch=(i686 x86_64)
-url="https://webkitgtk.org/"
-license=(custom)
-depends=(libxt libxslt enchant geoclue2 gst-plugins-base-libs
- libsecret libwebp harfbuzz-icu gtk3 libnotify hyphen)
-makedepends=(gtk2 gperf gobject-introspection ruby gtk-doc cmake python python2)
-optdepends=('gtk2: Netscape plugin support'
- 'gst-plugins-base: free media decoding'
- 'gst-plugins-good: media decoding'
- 'gst-libav: nonfree media decoding')
-options=(!emptydirs)
-source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc}
- icu59.patch)
-sha256sums=('204e9131da0101b9bc8765716e70a897121af04b964d9827cd9f20816a77b512'
- 'SKIP'
- 'eb791b9c8dcb84996904846dedf8c3ddf1a5fde32330177f3f0071510bd8ca6d')
-validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3')
-
-prepare() {
- mkdir build
-
- cd webkitgtk-$pkgver
- sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc
- rm -r Source/ThirdParty/gtest/
- #rm -r Source/ThirdParty/qunit/
- patch -Np1 -i ../icu59.patch
-}
-
-build() {
- cd build
- cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=/usr/lib -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \
- -DENABLE_GTKDOC=ON -DPYTHON_EXECUTABLE=/usr/bin/python2 ../webkitgtk-$pkgver
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-
- install -m755 -d "$pkgdir/usr/share/licenses/webkit2gtk"
- cd "$srcdir/webkitgtk-$pkgver/Source"
- for f in $(find -name 'COPYING*' -or -name 'LICENSE*'); do
- echo $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE"
- cat $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE"
- echo "" >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE"
- done
-}
Copied: webkit2gtk/repos/extra-x86_64/PKGBUILD (from rev 299117, webkit2gtk/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-06-21 11:55:01 UTC (rev 299118)
@@ -0,0 +1,58 @@
+# $Id$
+# Contributor: Eric Bélanger <eric at archlinux.org>
+
+pkgname=webkit2gtk
+pkgver=2.16.4
+pkgrel=1
+pkgdesc="GTK+ Web content engine library"
+arch=(i686 x86_64)
+url="https://webkitgtk.org/"
+license=(custom)
+depends=(libxt libxslt enchant geoclue2 gst-plugins-base-libs
+ libsecret libwebp harfbuzz-icu gtk3 libnotify hyphen)
+makedepends=(gtk2 gperf gobject-introspection ruby gtk-doc cmake python python2)
+optdepends=('gtk2: Netscape plugin support'
+ 'gst-plugins-base: free media decoding'
+ 'gst-plugins-good: media decoding'
+ 'gst-libav: nonfree media decoding')
+options=(!emptydirs)
+source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc}
+ icu59.patch gcc7-memcpy.patch)
+sha256sums=('f9aba4338319bd539785345144e28c8027dc8cb526b2e443e0c8f2c0239f5128'
+ 'SKIP'
+ 'eb791b9c8dcb84996904846dedf8c3ddf1a5fde32330177f3f0071510bd8ca6d'
+ '025e36bef353f850598a9bd9d91bc1aa2e2f75db9f46c252ec2f861726299189')
+validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3')
+
+prepare() {
+ mkdir build
+ cd webkitgtk-$pkgver
+
+ patch -Np1 -i ../icu59.patch
+ patch -Np1 -i ../gcc7-memcpy.patch # https://bugs.webkit.org/show_bug.cgi?id=173407
+
+ sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc
+ rm -r Source/ThirdParty/gtest/
+}
+
+build() {
+ cd build
+ cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=/usr/lib -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \
+ -DENABLE_GTKDOC=ON -DPYTHON_EXECUTABLE=/usr/bin/python2 ../webkitgtk-$pkgver
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+
+ install -m755 -d "$pkgdir/usr/share/licenses/webkit2gtk"
+ cd "$srcdir/webkitgtk-$pkgver/Source"
+ for f in $(find -name 'COPYING*' -or -name 'LICENSE*'); do
+ echo $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE"
+ cat $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE"
+ echo "" >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE"
+ done
+}
Copied: webkit2gtk/repos/extra-x86_64/gcc7-memcpy.patch (from rev 299117, webkit2gtk/trunk/gcc7-memcpy.patch)
===================================================================
--- extra-x86_64/gcc7-memcpy.patch (rev 0)
+++ extra-x86_64/gcc7-memcpy.patch 2017-06-21 11:55:01 UTC (rev 299118)
@@ -0,0 +1,34 @@
+diff -u -r webkitgtk-2.16.4/Source/WTF/wtf/text/StringImpl.h webkitgtk-2.16.4-memcpy/Source/WTF/wtf/text/StringImpl.h
+--- webkitgtk-2.16.4/Source/WTF/wtf/text/StringImpl.h 2017-02-20 17:20:15.000000000 +0100
++++ webkitgtk-2.16.4-memcpy/Source/WTF/wtf/text/StringImpl.h 2017-06-21 09:45:07.835653812 +0200
+@@ -581,29 +581,7 @@
+ // FIXME: Does this really belong in StringImpl?
+ template <typename T> static void copyChars(T* destination, const T* source, unsigned numCharacters)
+ {
+- if (numCharacters == 1) {
+- *destination = *source;
+- return;
+- }
+-
+- if (numCharacters <= s_copyCharsInlineCutOff) {
+- unsigned i = 0;
+-#if (CPU(X86) || CPU(X86_64))
+- const unsigned charsPerInt = sizeof(uint32_t) / sizeof(T);
+-
+- if (numCharacters > charsPerInt) {
+- unsigned stopCount = numCharacters & ~(charsPerInt - 1);
+-
+- const uint32_t* srcCharacters = reinterpret_cast<const uint32_t*>(source);
+- uint32_t* destCharacters = reinterpret_cast<uint32_t*>(destination);
+- for (unsigned j = 0; i < stopCount; i += charsPerInt, ++j)
+- destCharacters[j] = srcCharacters[j];
+- }
+-#endif
+- for (; i < numCharacters; ++i)
+- destination[i] = source[i];
+- } else
+- memcpy(destination, source, numCharacters * sizeof(T));
++ memcpy(destination, source, numCharacters * sizeof(T));
+ }
+
+ ALWAYS_INLINE static void copyChars(UChar* destination, const LChar* source, unsigned numCharacters)
Deleted: extra-x86_64/icu59.patch
===================================================================
--- extra-x86_64/icu59.patch 2017-06-21 11:43:34 UTC (rev 299117)
+++ extra-x86_64/icu59.patch 2017-06-21 11:55:01 UTC (rev 299118)
@@ -1,38 +0,0 @@
---- webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h.orig 2017-02-20 17:20:08.000000000 +0100
-+++ webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h 2017-04-22 14:35:00.926530142 +0200
-@@ -32,6 +32,7 @@
- #include <stdbool.h>
- #endif
- #include <stddef.h> /* for size_t */
-+#include <uchar.h>
-
- #ifdef __cplusplus
- extern "C" {
-@@ -46,7 +47,7 @@
- character. As with all scalar types, endianness depends on the underlying
- architecture.
- */
-- typedef unsigned short JSChar;
-+ typedef char16_t JSChar;
- #else
- typedef wchar_t JSChar;
- #endif
---- webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h.orig 2017-02-20 17:20:17.000000000 +0100
-+++ webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h 2017-04-22 14:35:56.853196170 +0200
-@@ -28,6 +28,7 @@
-
- #include <WebKit/WKBase.h>
- #include <stddef.h>
-+#include <uchar.h>
-
- #ifndef __cplusplus
- #include <stdbool.h>
-@@ -39,7 +40,7 @@
-
- #if !defined(WIN32) && !defined(_WIN32) \
- && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */
-- typedef unsigned short WKChar;
-+ typedef char16_t WKChar;
- #else
- typedef wchar_t WKChar;
- #endif
Copied: webkit2gtk/repos/extra-x86_64/icu59.patch (from rev 299117, webkit2gtk/trunk/icu59.patch)
===================================================================
--- extra-x86_64/icu59.patch (rev 0)
+++ extra-x86_64/icu59.patch 2017-06-21 11:55:01 UTC (rev 299118)
@@ -0,0 +1,38 @@
+--- webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h.orig 2017-02-20 17:20:08.000000000 +0100
++++ webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h 2017-04-22 14:35:00.926530142 +0200
+@@ -32,6 +32,7 @@
+ #include <stdbool.h>
+ #endif
+ #include <stddef.h> /* for size_t */
++#include <uchar.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+@@ -46,7 +47,7 @@
+ character. As with all scalar types, endianness depends on the underlying
+ architecture.
+ */
+- typedef unsigned short JSChar;
++ typedef char16_t JSChar;
+ #else
+ typedef wchar_t JSChar;
+ #endif
+--- webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h.orig 2017-02-20 17:20:17.000000000 +0100
++++ webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h 2017-04-22 14:35:56.853196170 +0200
+@@ -28,6 +28,7 @@
+
+ #include <WebKit/WKBase.h>
+ #include <stddef.h>
++#include <uchar.h>
+
+ #ifndef __cplusplus
+ #include <stdbool.h>
+@@ -39,7 +40,7 @@
+
+ #if !defined(WIN32) && !defined(_WIN32) \
+ && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */
+- typedef unsigned short WKChar;
++ typedef char16_t WKChar;
+ #else
+ typedef wchar_t WKChar;
+ #endif
More information about the arch-commits
mailing list