[arch-commits] Commit in qt5-webkit-ng/repos (7 files)
Antonio Rojas
arojas at archlinux.org
Wed Jun 14 16:46:46 UTC 2017
Date: Wednesday, June 14, 2017 @ 16:46:45
Author: arojas
Revision: 298824
archrelease: copy trunk to extra-i686
Added:
qt5-webkit-ng/repos/extra-i686/
qt5-webkit-ng/repos/extra-i686/PKGBUILD
(from rev 298823, qt5-webkit-ng/trunk/PKGBUILD)
qt5-webkit-ng/repos/extra-i686/qt5-webkit-icu59.patch
(from rev 298823, qt5-webkit-ng/trunk/qt5-webkit-icu59.patch)
qt5-webkit-ng/repos/extra-i686/qt5-webkit-ng-functional.patch
(from rev 298823, qt5-webkit-ng/trunk/qt5-webkit-ng-functional.patch)
qt5-webkit-ng/repos/extra-i686/qt5-webkit-ng-gcc7.patch
(from rev 298823, qt5-webkit-ng/trunk/qt5-webkit-ng-gcc7.patch)
qt5-webkit-ng/repos/extra-i686/qt5-webkit-ng-i686-linking.patch
(from rev 298823, qt5-webkit-ng/trunk/qt5-webkit-ng-i686-linking.patch)
qt5-webkit-ng/repos/extra-i686/qt5-webkit-ng-no-expansion-to-defined.patch
(from rev 298823, qt5-webkit-ng/trunk/qt5-webkit-ng-no-expansion-to-defined.patch)
---------------------------------------------+
PKGBUILD | 57 ++++++++++++++++++++++++++
qt5-webkit-icu59.patch | 38 +++++++++++++++++
qt5-webkit-ng-functional.patch | 40 ++++++++++++++++++
qt5-webkit-ng-gcc7.patch | 12 +++++
qt5-webkit-ng-i686-linking.patch | 14 ++++++
qt5-webkit-ng-no-expansion-to-defined.patch | 12 +++++
6 files changed, 173 insertions(+)
Copied: qt5-webkit-ng/repos/extra-i686/PKGBUILD (from rev 298823, qt5-webkit-ng/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-06-14 16:46:45 UTC (rev 298824)
@@ -0,0 +1,57 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=qt5-webkit-ng
+_qtver=5.212.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(x86_64 i686)
+url='https://github.com/annulen/webkit/wiki'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='Classes for a WebKit2 based implementation and a new QML API (maintained fork)'
+depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite gst-plugins-base hyphen)
+makedepends=(cmake ruby gperf python2 qt5-doc qt5-tools)
+optdepends=('gst-plugins-good: Webm codec support')
+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-no-expansion-to-defined.patch qt5-webkit-ng-i686-linking.patch)
+sha256sums=('bf8637ad44efd781893c60a932256f435f538bea63333a7f438b897500044d98'
+ 'e1306e696ad7125fa00083aa966be0ea6fe6de555c9e1d119957f208f258edfe'
+ '58ecbd8708f5afe4e974fdcd6c1f32fea61ccc55dc9bb711768f2d0da6963fb8'
+ 'c85344edcc23930c0190b2f8ec3847bf8bdbbf7f1d4fa877c502e354e5f4233e'
+ '8f46bca6d2cb99701cfd82302da0a5c19ce09c73c5ed625a27b77e0d0146c0b4'
+ '2b494dcd22db8d50b3b4ddbc73639f089041681575fbc435e600788e7e2a6525')
+
+prepare() {
+ 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
+ patch -p1 -i ../qt5-webkit-ng-no-expansion-to-defined.patch
+# Fix i686 linking
+ patch -p1 -i ../qt5-webkit-ng-i686-linking.patch
+}
+
+build() {
+ cd build
+
+ cmake ../webkit-qtwebkit-$pkgver-alpha \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DPORT=Qt \
+ -DENABLE_TOOLS=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+
+ install -d "$pkgdir"/usr/share/licenses
+ ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
+}
Copied: qt5-webkit-ng/repos/extra-i686/qt5-webkit-icu59.patch (from rev 298823, qt5-webkit-ng/trunk/qt5-webkit-icu59.patch)
===================================================================
--- extra-i686/qt5-webkit-icu59.patch (rev 0)
+++ extra-i686/qt5-webkit-icu59.patch 2017-06-14 16:46:45 UTC (rev 298824)
@@ -0,0 +1,38 @@
+--- 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
Copied: qt5-webkit-ng/repos/extra-i686/qt5-webkit-ng-functional.patch (from rev 298823, qt5-webkit-ng/trunk/qt5-webkit-ng-functional.patch)
===================================================================
--- extra-i686/qt5-webkit-ng-functional.patch (rev 0)
+++ extra-i686/qt5-webkit-ng-functional.patch 2017-06-14 16:46:45 UTC (rev 298824)
@@ -0,0 +1,40 @@
+--- webkit-qtwebkit-tp5/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h.orig 2017-06-01 06:14:55.587195469 +0000
++++ webkit-qtwebkit-tp5/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h 2017-06-01 06:15:23.040491577 +0000
+@@ -32,6 +32,7 @@
+ #include <wtf/Optional.h>
+ #include <wtf/RefCounted.h>
+ #include <wtf/text/WTFString.h>
++#include <functional>
+
+ namespace Inspector {
+
+--- webkit-qtwebkit-tp5/Source/WebCore/css/CSSValue.h.orig 2017-06-01 07:48:18.099623726 +0000
++++ webkit-qtwebkit-tp5/Source/WebCore/css/CSSValue.h 2017-06-01 07:48:41.542925091 +0000
+@@ -27,6 +27,7 @@
+ #include <wtf/RefCounted.h>
+ #include <wtf/RefPtr.h>
+ #include <wtf/TypeCasts.h>
++#include <functional>
+
+ namespace WebCore {
+
+--- webkit-qtwebkit-tp5/Source/WebCore/css/StyleSheetContents.h.orig 2017-06-01 08:33:31.792577087 +0000
++++ webkit-qtwebkit-tp5/Source/WebCore/css/StyleSheetContents.h 2017-06-01 08:33:44.715892348 +0000
+@@ -30,6 +30,7 @@
+ #include <wtf/Vector.h>
+ #include <wtf/text/AtomicStringHash.h>
+ #include <wtf/text/TextPosition.h>
++#include <functional>
+
+ namespace WebCore {
+
+--- webkit-qtwebkit-tp5/Source/WebCore/loader/ResourceLoader.h.orig 2017-06-01 09:47:50.463011889 +0000
++++ webkit-qtwebkit-tp5/Source/WebCore/loader/ResourceLoader.h 2017-06-01 09:48:21.976300680 +0000
+@@ -35,6 +35,7 @@
+ #include "ResourceRequest.h"
+ #include "ResourceResponse.h"
+ #include <wtf/Forward.h>
++#include <functional>
+
+ namespace WTF {
+ class SchedulePair;
Copied: qt5-webkit-ng/repos/extra-i686/qt5-webkit-ng-gcc7.patch (from rev 298823, qt5-webkit-ng/trunk/qt5-webkit-ng-gcc7.patch)
===================================================================
--- extra-i686/qt5-webkit-ng-gcc7.patch (rev 0)
+++ extra-i686/qt5-webkit-ng-gcc7.patch 2017-06-14 16:46:45 UTC (rev 298824)
@@ -0,0 +1,12 @@
+Index: /trunk/Source/JavaScriptCore/runtime/JSArrayBufferView.h
+===================================================================
+--- trunk/Source/JavaScriptCore/runtime/JSArrayBufferView.h (revision 211433)
++++ trunk/Source/JavaScriptCore/runtime/JSArrayBufferView.h (revision 211434)
+@@ -168,5 +168,5 @@
+ void neuter();
+
+- void* vector()
++ void* vector() const
+ {
+ return m_vector.getPredicated(
+ this,
Copied: qt5-webkit-ng/repos/extra-i686/qt5-webkit-ng-i686-linking.patch (from rev 298823, qt5-webkit-ng/trunk/qt5-webkit-ng-i686-linking.patch)
===================================================================
--- extra-i686/qt5-webkit-ng-i686-linking.patch (rev 0)
+++ extra-i686/qt5-webkit-ng-i686-linking.patch 2017-06-14 16:46:45 UTC (rev 298824)
@@ -0,0 +1,14 @@
+diff --git a/Source/JavaScriptCore/runtime/JSTypedArrayViewConstructor.cpp
+b/Source/JavaScriptCore/runtime/JSTypedArrayViewConstructor.cpp
+index bf99dbc8718..5c038c502bc 100644
+--- a/Source/JavaScriptCore/runtime/JSTypedArrayViewConstructor.cpp
++++ b/Source/JavaScriptCore/runtime/JSTypedArrayViewConstructor.cpp
+@@ -35,6 +35,7 @@
+ #include "JSObject.h"
+ #include "JSTypedArrayViewPrototype.h"
+ #include "JSTypedArrays.h"
++#include "TypedArrayInlines.h"
+
+ namespace JSC {
+
+
Copied: qt5-webkit-ng/repos/extra-i686/qt5-webkit-ng-no-expansion-to-defined.patch (from rev 298823, qt5-webkit-ng/trunk/qt5-webkit-ng-no-expansion-to-defined.patch)
===================================================================
--- extra-i686/qt5-webkit-ng-no-expansion-to-defined.patch (rev 0)
+++ extra-i686/qt5-webkit-ng-no-expansion-to-defined.patch 2017-06-14 16:46:45 UTC (rev 298824)
@@ -0,0 +1,12 @@
+diff -up webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7 webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake
+--- webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7 2017-02-21 09:57:13.168916004 +0100
++++ webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake 2017-02-21 09:58:12.811563156 +0100
+@@ -41,6 +41,8 @@ if (COMPILER_IS_GCC_OR_CLANG)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined")
+ endif ()
+
+ if (COMPILER_IS_CLANG AND CMAKE_GENERATOR STREQUAL "Ninja")
More information about the arch-commits
mailing list