[arch-commits] Commit in qt5-webkit-ng/trunk (PKGBUILD qt5-webkit-icu59.patch)

[Antonio Rojas]

    Date: Wednesday, June 14, 2017 @ 17:06:37
  Author: arojas
Revision: 298827

ICU patch is no longer needed

Modified:
  qt5-webkit-ng/trunk/PKGBUILD
Deleted:
  qt5-webkit-ng/trunk/qt5-webkit-icu59.patch

------------------------+
 PKGBUILD               |    5 +----
 qt5-webkit-icu59.patch |   38 --------------------------------------
 2 files changed, 1 insertion(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-14 17:04:43 UTC (rev 298826)
+++ PKGBUILD	2017-06-14 17:06:37 UTC (rev 298827)
@@ -14,10 +14,9 @@
 conflicts=(qt5-webkit)
 provides=(qt5-webkit)
 source=("https://github.com/annulen/webkit/archive/qtwebkit-$pkgver-alpha.tar.gz"
-        qt5-webkit-icu59.patch qt5-webkit-ng-gcc7.patch qt5-webkit-ng-functional.patch
+        qt5-webkit-ng-gcc7.patch qt5-webkit-ng-functional.patch
         qt5-webkit-ng-no-expansion-to-defined.patch qt5-webkit-ng-i686-linking.patch)
 sha256sums=('bf8637ad44efd781893c60a932256f435f538bea63333a7f438b897500044d98'
-            'e1306e696ad7125fa00083aa966be0ea6fe6de555c9e1d119957f208f258edfe'
             '58ecbd8708f5afe4e974fdcd6c1f32fea61ccc55dc9bb711768f2d0da6963fb8'
             'c85344edcc23930c0190b2f8ec3847bf8bdbbf7f1d4fa877c502e354e5f4233e'
             '8f46bca6d2cb99701cfd82302da0a5c19ce09c73c5ed625a27b77e0d0146c0b4'
@@ -27,8 +26,6 @@
   mkdir -p build
 
   cd webkit-qtwebkit-$pkgver-alpha
-# Fix build with ICU 59 (PLD linux)
-  patch -p1 -i ../qt5-webkit-icu59.patch
 # Fix build with GCC 7
   patch -p1 -i ../qt5-webkit-ng-gcc7.patch
   patch -p1 -i ../qt5-webkit-ng-functional.patch

Deleted: qt5-webkit-icu59.patch
===================================================================
--- qt5-webkit-icu59.patch	2017-06-14 17:04:43 UTC (rev 298826)
+++ qt5-webkit-icu59.patch	2017-06-14 17:06:37 UTC (rev 298827)
@@ -1,38 +0,0 @@
---- qtwebkit-opensource-src-5.5.1/Source/JavaScriptCore/API/JSStringRef.h.orig	2015-10-13 06:37:10.000000000 +0200
-+++ qtwebkit-opensource-src-5.5.1/Source/JavaScriptCore/API/JSStringRef.h	2017-04-24 12:26:42.495345570 +0200
-@@ -32,6 +32,7 @@
- #include <stdbool.h>
- #endif
- #include <stddef.h> /* for size_t */
-+#include <uchar.h>
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -43,7 +44,7 @@
- @typedef JSChar
- @abstract A Unicode character.
- */
--    typedef unsigned short JSChar;
-+    typedef char16_t JSChar;
- #else
-     typedef wchar_t JSChar;
- #endif
---- qtwebkit-opensource-src-5.5.1/Source/WebKit2/Shared/API/c/WKString.h.orig	2015-10-13 06:37:12.000000000 +0200
-+++ qtwebkit-opensource-src-5.5.1/Source/WebKit2/Shared/API/c/WKString.h	2017-04-24 12:27:33.432011867 +0200
-@@ -31,6 +31,7 @@
- #ifndef __cplusplus
- #include <stdbool.h>
- #endif
-+#include <uchar.h>
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -38,7 +39,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