Date: Monday, September 18, 2017 @ 09:46:32 Author: jgc Revision: 305781
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64 Added: webkit2gtk/repos/gnome-unstable-i686/ webkit2gtk/repos/gnome-unstable-i686/PKGBUILD (from rev 305780, webkit2gtk/trunk/PKGBUILD) webkit2gtk/repos/gnome-unstable-i686/gcc7.patch (from rev 305780, webkit2gtk/trunk/gcc7.patch) webkit2gtk/repos/gnome-unstable-i686/icu59.patch (from rev 305780, webkit2gtk/trunk/icu59.patch) webkit2gtk/repos/gnome-unstable-x86_64/ webkit2gtk/repos/gnome-unstable-x86_64/PKGBUILD (from rev 305780, webkit2gtk/trunk/PKGBUILD) webkit2gtk/repos/gnome-unstable-x86_64/gcc7.patch (from rev 305780, webkit2gtk/trunk/gcc7.patch) webkit2gtk/repos/gnome-unstable-x86_64/icu59.patch (from rev 305780, webkit2gtk/trunk/icu59.patch) -----------------------------------+ gnome-unstable-i686/PKGBUILD | 49 ++++++++++++++++++++++++++++++++++++ gnome-unstable-i686/gcc7.patch | 47 ++++++++++++++++++++++++++++++++++ gnome-unstable-i686/icu59.patch | 38 +++++++++++++++++++++++++++ gnome-unstable-x86_64/PKGBUILD | 49 ++++++++++++++++++++++++++++++++++++ gnome-unstable-x86_64/gcc7.patch | 47 ++++++++++++++++++++++++++++++++++ gnome-unstable-x86_64/icu59.patch | 38 +++++++++++++++++++++++++++ 6 files changed, 268 insertions(+) Copied: webkit2gtk/repos/gnome-unstable-i686/PKGBUILD (from rev 305780, webkit2gtk/trunk/PKGBUILD) =================================================================== --- gnome-unstable-i686/PKGBUILD (rev 0) +++ gnome-unstable-i686/PKGBUILD 2017-09-18 09:46:32 UTC (rev 305781) @@ -0,0 +1,49 @@ +# $Id$ +# Contributor: Eric Bélanger <e...@archlinux.org> + +pkgname=webkit2gtk +pkgver=2.18.0 +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 gst-plugins-bad + libsecret libwebp harfbuzz-icu gtk3 libnotify hyphen) +makedepends=(gtk2 gperf gobject-introspection ruby gtk-doc cmake python python2 ninja) +optdepends=('gtk2: Netscape plugin support' + 'gst-plugins-base: free media decoding' + 'gst-plugins-good: media decoding' + 'gst-libav: nonfree media decoding') +source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc}) +sha256sums=('b583e46a3de36a3e80ba33b084ead60512a2046aca01ff61e50e519436e5038d' + 'SKIP') +validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3') + +prepare() { + mkdir build + cd webkitgtk-$pkgver + + sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc + rm -r Source/ThirdParty/gtest/ +} + +build() { + cd build + cmake -G Ninja -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 + ninja +} + +package() { + cd build + DESTDIR="$pkgdir" ninja install + + cd ../webkitgtk-$pkgver/Source + while IFS= read -d $'\0' -r _f; do + echo "### $_f ###"; cat "$_f"; echo + done < <(find . -name 'COPYING*' -or -name 'LICENSE*' -print0) \ + | install -Dm644 /dev/stdin "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} Copied: webkit2gtk/repos/gnome-unstable-i686/gcc7.patch (from rev 305780, webkit2gtk/trunk/gcc7.patch) =================================================================== --- gnome-unstable-i686/gcc7.patch (rev 0) +++ gnome-unstable-i686/gcc7.patch 2017-09-18 09:46:32 UTC (rev 305781) @@ -0,0 +1,47 @@ +diff -u -r webkitgtk-2.16.5/Source/cmake/OptionsCommon.cmake webkitgtk-2.16.5-gcc7/Source/cmake/OptionsCommon.cmake +--- webkitgtk-2.16.5/Source/cmake/OptionsCommon.cmake 2017-05-06 10:48:27.000000000 +0200 ++++ webkitgtk-2.16.5-gcc7/Source/cmake/OptionsCommon.cmake 2017-06-27 13:15:26.858090686 +0200 +@@ -38,7 +38,9 @@ + define_property(TARGET PROPERTY FOLDER INHERITED BRIEF_DOCS "folder" FULL_DOCS "IDE folder name") + + if (COMPILER_IS_GCC_OR_CLANG) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined -Wno-implicit-fallthrough") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined -Wno-implicit-fallthrough") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y") + endif () +diff -u -r webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h +--- webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h 2017-02-20 17:20:15.000000000 +0100 ++++ webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h 2017-06-27 13:13:57.801527350 +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) Copied: webkit2gtk/repos/gnome-unstable-i686/icu59.patch (from rev 305780, webkit2gtk/trunk/icu59.patch) =================================================================== --- gnome-unstable-i686/icu59.patch (rev 0) +++ gnome-unstable-i686/icu59.patch 2017-09-18 09:46:32 UTC (rev 305781) @@ -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 Copied: webkit2gtk/repos/gnome-unstable-x86_64/PKGBUILD (from rev 305780, webkit2gtk/trunk/PKGBUILD) =================================================================== --- gnome-unstable-x86_64/PKGBUILD (rev 0) +++ gnome-unstable-x86_64/PKGBUILD 2017-09-18 09:46:32 UTC (rev 305781) @@ -0,0 +1,49 @@ +# $Id$ +# Contributor: Eric Bélanger <e...@archlinux.org> + +pkgname=webkit2gtk +pkgver=2.18.0 +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 gst-plugins-bad + libsecret libwebp harfbuzz-icu gtk3 libnotify hyphen) +makedepends=(gtk2 gperf gobject-introspection ruby gtk-doc cmake python python2 ninja) +optdepends=('gtk2: Netscape plugin support' + 'gst-plugins-base: free media decoding' + 'gst-plugins-good: media decoding' + 'gst-libav: nonfree media decoding') +source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc}) +sha256sums=('b583e46a3de36a3e80ba33b084ead60512a2046aca01ff61e50e519436e5038d' + 'SKIP') +validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3') + +prepare() { + mkdir build + cd webkitgtk-$pkgver + + sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc + rm -r Source/ThirdParty/gtest/ +} + +build() { + cd build + cmake -G Ninja -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 + ninja +} + +package() { + cd build + DESTDIR="$pkgdir" ninja install + + cd ../webkitgtk-$pkgver/Source + while IFS= read -d $'\0' -r _f; do + echo "### $_f ###"; cat "$_f"; echo + done < <(find . -name 'COPYING*' -or -name 'LICENSE*' -print0) \ + | install -Dm644 /dev/stdin "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} Copied: webkit2gtk/repos/gnome-unstable-x86_64/gcc7.patch (from rev 305780, webkit2gtk/trunk/gcc7.patch) =================================================================== --- gnome-unstable-x86_64/gcc7.patch (rev 0) +++ gnome-unstable-x86_64/gcc7.patch 2017-09-18 09:46:32 UTC (rev 305781) @@ -0,0 +1,47 @@ +diff -u -r webkitgtk-2.16.5/Source/cmake/OptionsCommon.cmake webkitgtk-2.16.5-gcc7/Source/cmake/OptionsCommon.cmake +--- webkitgtk-2.16.5/Source/cmake/OptionsCommon.cmake 2017-05-06 10:48:27.000000000 +0200 ++++ webkitgtk-2.16.5-gcc7/Source/cmake/OptionsCommon.cmake 2017-06-27 13:15:26.858090686 +0200 +@@ -38,7 +38,9 @@ + define_property(TARGET PROPERTY FOLDER INHERITED BRIEF_DOCS "folder" FULL_DOCS "IDE folder name") + + if (COMPILER_IS_GCC_OR_CLANG) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined -Wno-implicit-fallthrough") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined -Wno-implicit-fallthrough") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y") + endif () +diff -u -r webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h +--- webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h 2017-02-20 17:20:15.000000000 +0100 ++++ webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h 2017-06-27 13:13:57.801527350 +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) Copied: webkit2gtk/repos/gnome-unstable-x86_64/icu59.patch (from rev 305780, webkit2gtk/trunk/icu59.patch) =================================================================== --- gnome-unstable-x86_64/icu59.patch (rev 0) +++ gnome-unstable-x86_64/icu59.patch 2017-09-18 09:46:32 UTC (rev 305781) @@ -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