webkit-gtk2:rebuild

2018-02-05 03:12:28 +03:00
parent 6359cffae5
commit 36b3e7800f
3 changed files with 49 additions and 3 deletions
@@ -20,6 +20,7 @@ docs = ["AUTHORS", "ChangeLog", "COPYING.LIB", "THANKS", \
        "LICENSE-LGPL-2", "LICENSE-LGPL-2.1", "LICENSE"]

 def setup():
+    autotools.autoreconf("-fiv")
    shelltools.export("CFLAGS", cflags)
    shelltools.export("CXXFLAGS", cxxflags)
    autotools.configure("--prefix=/usr \
@@ -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
@@ -48,8 +48,8 @@
        </BuildDependencies>
        <Patches>
            <Patch level="1">install-minibrowser.patch</Patch>
-            <Patch level="1">fix-ftbfs-gcc6.patch</Patch>-->
-            <!--<Patch>webkitgtk-2.4.8-gmutexlocker.patch</Patch>-->
+            <Patch level="1">fix-ftbfs-gcc6.patch</Patch>
+            <Patch level="1">icu59.patch</Patch>
        </Patches>
    </Source>

@@ -121,6 +121,13 @@
    </Package>

    <History>
+        <Update release="5">
+            <Date>2018-02-05</Date>
+            <Version>2.4.11</Version>
+            <Comment>Rebuild for new toolchain.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
        <Update release="4">
            <Date>2017-02-27</Date>
            <Version>2.4.11</Version>
@@ -150,4 +157,4 @@
            <Email>ayhanyalcinsoy@pisilinux.org</Email>
        </Update>
    </History>
-</PISI>
+</PISI>