[arch-commits] Commit in qt5-webkit/trunk (4 files)

Antonio Rojas arojas at archlinux.org
Thu Jun 15 11:57:05 UTC 2017


    Date: Thursday, June 15, 2017 @ 11:57:04
  Author: arojas
Revision: 298857

Update to 5.212.0 branch

Added:
  qt5-webkit/trunk/qt5-webkit-gcc7.patch
  qt5-webkit/trunk/qt5-webkit-i686-linking.patch
Modified:
  qt5-webkit/trunk/PKGBUILD
Deleted:
  qt5-webkit/trunk/qt5-webkit-icu59.patch

-------------------------------+
 PKGBUILD                      |   55 ++++++++++++++++++------------
 qt5-webkit-gcc7.patch         |   12 ++++++
 qt5-webkit-i686-linking.patch |   14 +++++++
 qt5-webkit-icu59.patch        |   73 ----------------------------------------
 4 files changed, 59 insertions(+), 95 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-15 11:16:32 UTC (rev 298856)
+++ PKGBUILD	2017-06-15 11:57:04 UTC (rev 298857)
@@ -1,50 +1,61 @@
 # $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-webkit
-_qtver=5.9.0
+_qtver=5.212.0-alpha
 pkgver=${_qtver/-/}
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url='http://qt-project.org/'
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
+license=(GPL3 LGPL3 FDL custom)
 pkgdesc='Classes for a WebKit2 based implementation and a new QML API'
-depends=('qt5-location' 'qt5-sensors' 'qt5-webchannel' 'libwebp' 'libxslt' 'libxcomposite' 'gst-plugins-base')
-makedepends=('ruby' 'gperf' 'python' 'qt5-doc' 'qt5-tools')
+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=('qt')
-groups=('qt' 'qt5')
+conflicts=(qt5-webkit-ng)
+replaces=(qt5-webkit-ng)
+groups=(qt qt5)
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
-source=("http://download.qt.io/community_releases/${pkgver%.*}/${_qtver}-final/qtwebkit-opensource-src-${_qtver}.tar.xz"
-        qt5-webkit-icu59.patch)
-sha256sums=('8dad193b740055a998312e04a040f2e32a923c0823b2d239b24eab08276a4e04'
-            '3bc9c7202f5cb055311ffb8a14145cef89060c00002f4cd5b4f4bf210bd56295')
+source=("https://github.com/annulen/webkit/releases/download/qtwebkit-$_qtver/qtwebkit-$_qtver.tar.xz"
+        qt5-webkit-functional.patch::"https://github.com/qt/qtwebkit/commit/c119ecc7.patch"
+        qt5-webkit-no-expansion-to-defined.patch::"https://github.com/annulen/webkit/commit/a4d1f641.patch"
+        qt5-webkit-gcc7.patch qt5-webkit-i686-linking.patch)
+sha256sums=('f70fea4623a0f1df6ec535358f9c431d6ead9c04742a85258aaabcd0805d2719'
+            'e9dd2a6d5682a788666b8a1dd078e079f8460a512096fb0381b48226e95e3d1f'
+            '60eafaf42e5cd81805b74c29564b6504092d69bf0083c728d113af9d1740b3c1'
+            '58ecbd8708f5afe4e974fdcd6c1f32fea61ccc55dc9bb711768f2d0da6963fb8'
+            '2b494dcd22db8d50b3b4ddbc73639f089041681575fbc435e600788e7e2a6525')
 
 prepare() {
   mkdir -p build
 
-# Fix build with ICU 59 (PLD linux)
-  cd ${_pkgfqn}
-  patch -p1 -i ../qt5-webkit-icu59.patch
+  cd qtwebkit-$_qtver
+# Fix build with GCC 7
+  sed -e '/ChangeLog/d' -i ../*.patch
+  patch -p1 -i ../qt5-webkit-gcc7.patch
+  patch -p1 -i ../qt5-webkit-functional.patch
+  patch -p1 -i ../qt5-webkit-no-expansion-to-defined.patch
+# Fix i686 linking
+  patch -p1 -i ../qt5-webkit-i686-linking.patch
 }
 
 build() {
-  cd build  
+  cd build
 
-  qmake ../${_pkgfqn}
+  cmake ../qtwebkit-$_qtver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DPORT=Qt \
+    -DENABLE_TOOLS=OFF
   make
-  make docs
 }
 
 package() {
   cd build
-  make INSTALL_ROOT="$pkgdir" install install_docs
+  make DESTDIR="$pkgdir" install
 
-  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-  find "$pkgdir/usr/lib" -type f -name '*.prl' \
-    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
   install -d "$pkgdir"/usr/share/licenses
   ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
 }

Added: qt5-webkit-gcc7.patch
===================================================================
--- qt5-webkit-gcc7.patch	                        (rev 0)
+++ qt5-webkit-gcc7.patch	2017-06-15 11:57:04 UTC (rev 298857)
@@ -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,

Added: qt5-webkit-i686-linking.patch
===================================================================
--- qt5-webkit-i686-linking.patch	                        (rev 0)
+++ qt5-webkit-i686-linking.patch	2017-06-15 11:57:04 UTC (rev 298857)
@@ -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 {
+ 
+

Deleted: qt5-webkit-icu59.patch
===================================================================
--- qt5-webkit-icu59.patch	2017-06-15 11:16:32 UTC (rev 298856)
+++ qt5-webkit-icu59.patch	2017-06-15 11:57:04 UTC (rev 298857)
@@ -1,73 +0,0 @@
-diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
-index ead844f..e62cfd4 100644
---- a/Source/WTF/wtf/Compiler.h
-+++ b/Source/WTF/wtf/Compiler.h
-@@ -61,6 +61,7 @@
- #define WTF_COMPILER_SUPPORTS_HAS_TRIVIAL_DESTRUCTOR __has_feature(has_trivial_destructor)
- #define WTF_COMPILER_SUPPORTS_CXX_STRONG_ENUMS __has_feature(cxx_strong_enums)
- #define WTF_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS __has_feature(cxx_reference_qualified_functions)
-+#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES !defined(_LIBCPP_HAS_NO_UNICODE_CHARS)
- 
- #endif
- 
-@@ -142,6 +143,7 @@
- #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1
- #endif
- #if GCC_VERSION_AT_LEAST(4, 5, 0)
-+#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES 1
- #define WTF_COMPILER_SUPPORTS_CXX_EXPLICIT_CONVERSIONS 1
- #endif
- #if GCC_VERSION_AT_LEAST(4, 6, 0)
-diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h
-index b9e46bc..876fa45 100644
---- a/Source/WTF/wtf/TypeTraits.h
-+++ b/Source/WTF/wtf/TypeTraits.h
-@@ -75,6 +75,10 @@ namespace WTF {
- #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
-     template<> struct IsInteger<wchar_t>            { static const bool value = true; };
- #endif
-+#if COMPILER_SUPPORTS(CXX_NEW_CHAR_TYPES)
-+    template<> struct IsInteger<char16_t>           { static const bool value = true; };
-+    template<> struct IsInteger<char32_t>           { static const bool value = true; };
-+#endif
- 
-     template<typename T> struct IsFloatingPoint     { static const bool value = false; };
-     template<> struct IsFloatingPoint<float>        { static const bool value = true; };
----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



More information about the arch-commits mailing list