[arch-commits] Commit in webkitgtk/repos (10 files)
Evangelos Foutras
foutrelis at archlinux.org
Wed Apr 26 05:19:29 UTC 2017
Date: Wednesday, April 26, 2017 @ 05:19:28
Author: foutrelis
Revision: 294719
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
webkitgtk/repos/staging-i686/
webkitgtk/repos/staging-i686/PKGBUILD
(from rev 294718, webkitgtk/trunk/PKGBUILD)
webkitgtk/repos/staging-i686/icu59.patch
(from rev 294718, webkitgtk/trunk/icu59.patch)
webkitgtk/repos/staging-i686/webkitgtk-2.4.9-abs.patch
(from rev 294718, webkitgtk/trunk/webkitgtk-2.4.9-abs.patch)
webkitgtk/repos/staging-i686/webkitgtk.install
(from rev 294718, webkitgtk/trunk/webkitgtk.install)
webkitgtk/repos/staging-x86_64/
webkitgtk/repos/staging-x86_64/PKGBUILD
(from rev 294718, webkitgtk/trunk/PKGBUILD)
webkitgtk/repos/staging-x86_64/icu59.patch
(from rev 294718, webkitgtk/trunk/icu59.patch)
webkitgtk/repos/staging-x86_64/webkitgtk-2.4.9-abs.patch
(from rev 294718, webkitgtk/trunk/webkitgtk-2.4.9-abs.patch)
webkitgtk/repos/staging-x86_64/webkitgtk.install
(from rev 294718, webkitgtk/trunk/webkitgtk.install)
------------------------------------------+
staging-i686/PKGBUILD | 86 +++++++++++++++++++++++++++++
staging-i686/icu59.patch | 38 ++++++++++++
staging-i686/webkitgtk-2.4.9-abs.patch | 26 ++++++++
staging-i686/webkitgtk.install | 14 ++++
staging-x86_64/PKGBUILD | 86 +++++++++++++++++++++++++++++
staging-x86_64/icu59.patch | 38 ++++++++++++
staging-x86_64/webkitgtk-2.4.9-abs.patch | 26 ++++++++
staging-x86_64/webkitgtk.install | 14 ++++
8 files changed, 328 insertions(+)
Copied: webkitgtk/repos/staging-i686/PKGBUILD (from rev 294718, webkitgtk/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2017-04-26 05:19:28 UTC (rev 294719)
@@ -0,0 +1,86 @@
+# $Id$
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=webkitgtk
+pkgname=(webkitgtk webkitgtk2)
+pkgver=2.4.11
+pkgrel=5
+pkgdesc="Legacy Web content engine"
+arch=(i686 x86_64)
+url="https://webkitgtk.org/"
+license=(custom)
+depends=(libxt libxslt sqlite libsoup enchant libgl geoclue2 gst-plugins-base-libs
+ libsecret libwebp harfbuzz-icu)
+makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby)
+optdepends=('gst-plugins-base: free media decoding'
+ 'gst-plugins-good: media decoding'
+ 'gst-libav: nonfree media decoding')
+options=(!emptydirs)
+install=webkitgtk.install
+source=(https://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
+ webkitgtk-2.4.9-abs.patch
+ icu59.patch)
+sha256sums=('588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7'
+ 'ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70'
+ 'eb791b9c8dcb84996904846dedf8c3ddf1a5fde32330177f3f0071510bd8ca6d')
+
+prepare() {
+ mkdir build-gtk{,2} path
+ ln -s /usr/bin/python2 path/python
+
+ cd $pkgbase-$pkgver
+ patch -Np1 -i ../webkitgtk-2.4.9-abs.patch
+ patch -Np1 -i ../icu59.patch
+}
+
+_build() (
+ _ver="$1"; shift
+ cd build-${_ver}
+
+ PATH="$srcdir/path:$PATH"
+
+ CXXFLAGS+=" -fno-delete-null-pointer-checks"
+ CFLAGS+=" -fno-delete-null-pointer-checks"
+
+ ../$pkgbase-$pkgver/configure --prefix=/usr \
+ --libexecdir=/usr/lib/webkit${_ver} \
+ --enable-introspection \
+ --disable-webkit2 \
+ --disable-gtk-doc \
+ "$@"
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make all stamp-po
+)
+
+build() {
+ _build gtk
+ _build gtk2 --with-gtk=2.0
+}
+
+package_webkitgtk() {
+ pkgdesc+=" for GTK+ 3"
+ depends+=(gtk3)
+ optdepends+=('gtk2: Netscape plugin support')
+ provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}")
+ conflicts=(webkitgtk3 libwebkit3)
+ replaces=(webkitgtk3 libwebkit3)
+
+ make -C build-gtk -j1 DESTDIR="$pkgdir" install
+ install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \
+ "$pkgdir/usr/share/licenses/webkitgtk/LICENSE"
+}
+
+package_webkitgtk2() {
+ pkgdesc+=" for GTK+ 2"
+ depends+=(gtk2)
+ provides=("libwebkit=${pkgver}")
+ conflicts=(libwebkit)
+ replaces=(libwebkit)
+
+ make -C build-gtk2 -j1 DESTDIR="$pkgdir" install
+ install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \
+ "$pkgdir/usr/share/licenses/webkitgtk2/LICENSE"
+}
Copied: webkitgtk/repos/staging-i686/icu59.patch (from rev 294718, webkitgtk/trunk/icu59.patch)
===================================================================
--- staging-i686/icu59.patch (rev 0)
+++ staging-i686/icu59.patch 2017-04-26 05:19:28 UTC (rev 294719)
@@ -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: webkitgtk/repos/staging-i686/webkitgtk-2.4.9-abs.patch (from rev 294718, webkitgtk/trunk/webkitgtk-2.4.9-abs.patch)
===================================================================
--- staging-i686/webkitgtk-2.4.9-abs.patch (rev 0)
+++ staging-i686/webkitgtk-2.4.9-abs.patch 2017-04-26 05:19:28 UTC (rev 294719)
@@ -0,0 +1,26 @@
+diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp
+--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2015-05-20 03:03:24.000000000 -0600
++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2016-02-07 11:30:42.392686308 -0700
+@@ -85,8 +85,8 @@
+ guint32 eventTime = getEventTime(event);
+
+ if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS)
+- || ((abs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance)
+- && (abs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance)
++ || ((fabs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance)
++ && (fabs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance)
+ && (eventTime - m_previousClickTime < static_cast<guint>(doubleClickTime))
+ && (buttonEvent->button == m_previousClickButton)))
+ m_currentClickCount++;
+diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
+--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2015-05-20 03:03:24.000000000 -0600
++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-02-07 11:49:36.384691005 -0700
+@@ -659,7 +659,7 @@
+ if (!std::isfinite(time))
+ return String::fromUTF8(_("indefinite time"));
+
+- int seconds = static_cast<int>(abs(time));
++ int seconds = static_cast<int>(fabs(time));
+ int days = seconds / (60 * 60 * 24);
+ int hours = seconds / (60 * 60);
+ int minutes = (seconds / 60) % 60;
Copied: webkitgtk/repos/staging-i686/webkitgtk.install (from rev 294718, webkitgtk/trunk/webkitgtk.install)
===================================================================
--- staging-i686/webkitgtk.install (rev 0)
+++ staging-i686/webkitgtk.install 2017-04-26 05:19:28 UTC (rev 294719)
@@ -0,0 +1,14 @@
+post_install() {
+ post_upgrade $1 0
+}
+
+post_upgrade() {
+ if (( $(vercmp $2 2.4.11-4) < 0)); then
+ cat <<END
+
+ > WARNING: WebKitGTK+ 2.4 is known to have many security vulnerabilities that
+ will NOT be fixed. Avoid browsing with it.
+
+END
+ fi
+}
Copied: webkitgtk/repos/staging-x86_64/PKGBUILD (from rev 294718, webkitgtk/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2017-04-26 05:19:28 UTC (rev 294719)
@@ -0,0 +1,86 @@
+# $Id$
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=webkitgtk
+pkgname=(webkitgtk webkitgtk2)
+pkgver=2.4.11
+pkgrel=5
+pkgdesc="Legacy Web content engine"
+arch=(i686 x86_64)
+url="https://webkitgtk.org/"
+license=(custom)
+depends=(libxt libxslt sqlite libsoup enchant libgl geoclue2 gst-plugins-base-libs
+ libsecret libwebp harfbuzz-icu)
+makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby)
+optdepends=('gst-plugins-base: free media decoding'
+ 'gst-plugins-good: media decoding'
+ 'gst-libav: nonfree media decoding')
+options=(!emptydirs)
+install=webkitgtk.install
+source=(https://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
+ webkitgtk-2.4.9-abs.patch
+ icu59.patch)
+sha256sums=('588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7'
+ 'ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70'
+ 'eb791b9c8dcb84996904846dedf8c3ddf1a5fde32330177f3f0071510bd8ca6d')
+
+prepare() {
+ mkdir build-gtk{,2} path
+ ln -s /usr/bin/python2 path/python
+
+ cd $pkgbase-$pkgver
+ patch -Np1 -i ../webkitgtk-2.4.9-abs.patch
+ patch -Np1 -i ../icu59.patch
+}
+
+_build() (
+ _ver="$1"; shift
+ cd build-${_ver}
+
+ PATH="$srcdir/path:$PATH"
+
+ CXXFLAGS+=" -fno-delete-null-pointer-checks"
+ CFLAGS+=" -fno-delete-null-pointer-checks"
+
+ ../$pkgbase-$pkgver/configure --prefix=/usr \
+ --libexecdir=/usr/lib/webkit${_ver} \
+ --enable-introspection \
+ --disable-webkit2 \
+ --disable-gtk-doc \
+ "$@"
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make all stamp-po
+)
+
+build() {
+ _build gtk
+ _build gtk2 --with-gtk=2.0
+}
+
+package_webkitgtk() {
+ pkgdesc+=" for GTK+ 3"
+ depends+=(gtk3)
+ optdepends+=('gtk2: Netscape plugin support')
+ provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}")
+ conflicts=(webkitgtk3 libwebkit3)
+ replaces=(webkitgtk3 libwebkit3)
+
+ make -C build-gtk -j1 DESTDIR="$pkgdir" install
+ install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \
+ "$pkgdir/usr/share/licenses/webkitgtk/LICENSE"
+}
+
+package_webkitgtk2() {
+ pkgdesc+=" for GTK+ 2"
+ depends+=(gtk2)
+ provides=("libwebkit=${pkgver}")
+ conflicts=(libwebkit)
+ replaces=(libwebkit)
+
+ make -C build-gtk2 -j1 DESTDIR="$pkgdir" install
+ install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \
+ "$pkgdir/usr/share/licenses/webkitgtk2/LICENSE"
+}
Copied: webkitgtk/repos/staging-x86_64/icu59.patch (from rev 294718, webkitgtk/trunk/icu59.patch)
===================================================================
--- staging-x86_64/icu59.patch (rev 0)
+++ staging-x86_64/icu59.patch 2017-04-26 05:19:28 UTC (rev 294719)
@@ -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: webkitgtk/repos/staging-x86_64/webkitgtk-2.4.9-abs.patch (from rev 294718, webkitgtk/trunk/webkitgtk-2.4.9-abs.patch)
===================================================================
--- staging-x86_64/webkitgtk-2.4.9-abs.patch (rev 0)
+++ staging-x86_64/webkitgtk-2.4.9-abs.patch 2017-04-26 05:19:28 UTC (rev 294719)
@@ -0,0 +1,26 @@
+diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp
+--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2015-05-20 03:03:24.000000000 -0600
++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2016-02-07 11:30:42.392686308 -0700
+@@ -85,8 +85,8 @@
+ guint32 eventTime = getEventTime(event);
+
+ if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS)
+- || ((abs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance)
+- && (abs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance)
++ || ((fabs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance)
++ && (fabs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance)
+ && (eventTime - m_previousClickTime < static_cast<guint>(doubleClickTime))
+ && (buttonEvent->button == m_previousClickButton)))
+ m_currentClickCount++;
+diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
+--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2015-05-20 03:03:24.000000000 -0600
++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-02-07 11:49:36.384691005 -0700
+@@ -659,7 +659,7 @@
+ if (!std::isfinite(time))
+ return String::fromUTF8(_("indefinite time"));
+
+- int seconds = static_cast<int>(abs(time));
++ int seconds = static_cast<int>(fabs(time));
+ int days = seconds / (60 * 60 * 24);
+ int hours = seconds / (60 * 60);
+ int minutes = (seconds / 60) % 60;
Copied: webkitgtk/repos/staging-x86_64/webkitgtk.install (from rev 294718, webkitgtk/trunk/webkitgtk.install)
===================================================================
--- staging-x86_64/webkitgtk.install (rev 0)
+++ staging-x86_64/webkitgtk.install 2017-04-26 05:19:28 UTC (rev 294719)
@@ -0,0 +1,14 @@
+post_install() {
+ post_upgrade $1 0
+}
+
+post_upgrade() {
+ if (( $(vercmp $2 2.4.11-4) < 0)); then
+ cat <<END
+
+ > WARNING: WebKitGTK+ 2.4 is known to have many security vulnerabilities that
+ will NOT be fixed. Avoid browsing with it.
+
+END
+ fi
+}
More information about the arch-commits
mailing list