Date: Wednesday, January 18, 2017 @ 21:10:39
Author: heftig
Revision: 286950
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
webkitgtk/repos/extra-i686/PKGBUILD
(from rev 286949, webkitgtk/trunk/PKGBUILD)
webkitgtk/repos/extra-i686/webkitgtk-2.4.9-abs.patch
(from rev 286949, webkitgtk/trunk/webkitgtk-2.4.9-abs.patch)
webkitgtk/repos/extra-i686/webkitgtk.install
(from rev 286949, webkitgtk/trunk/webkitgtk.install)
webkitgtk/repos/extra-x86_64/PKGBUILD
(from rev 286949, webkitgtk/trunk/PKGBUILD)
webkitgtk/repos/extra-x86_64/webkitgtk-2.4.9-abs.patch
(from rev 286949, webkitgtk/trunk/webkitgtk-2.4.9-abs.patch)
webkitgtk/repos/extra-x86_64/webkitgtk.install
(from rev 286949, webkitgtk/trunk/webkitgtk.install)
Deleted:
webkitgtk/repos/extra-i686/PKGBUILD
webkitgtk/repos/extra-i686/webkitgtk-2.4.9-abs.patch
webkitgtk/repos/extra-x86_64/PKGBUILD
webkitgtk/repos/extra-x86_64/webkitgtk-2.4.9-abs.patch
----------------------------------------+
/PKGBUILD | 166 +++++++++++++++++++++++++++++++
/webkitgtk-2.4.9-abs.patch | 52 +++++++++
extra-i686/PKGBUILD | 81 ---------------
extra-i686/webkitgtk-2.4.9-abs.patch | 26 ----
extra-i686/webkitgtk.install | 14 ++
extra-x86_64/PKGBUILD | 81 ---------------
extra-x86_64/webkitgtk-2.4.9-abs.patch | 26 ----
extra-x86_64/webkitgtk.install | 14 ++
8 files changed, 246 insertions(+), 214 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-01-18 21:06:40 UTC (rev 286949)
+++ extra-i686/PKGBUILD 2017-01-18 21:10:39 UTC (rev 286950)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andy...@archlinux.org>
-
-pkgbase=webkitgtk
-pkgname=(webkitgtk webkitgtk2)
-pkgver=2.4.11
-pkgrel=3
-pkgdesc="GTK+ Web content engine library"
-arch=(i686 x86_64)
-url="http://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)
-source=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
- webkitgtk-2.4.9-abs.patch)
-sha256sums=('588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7'
- 'ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70')
-
-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
-}
-
-_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() {
- 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 GTK2"
- 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/extra-i686/PKGBUILD (from rev 286949,
webkitgtk/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-01-18 21:10:39 UTC (rev 286950)
@@ -0,0 +1,83 @@
+# $Id$
+# Contributor: Andreas Radke <andy...@archlinux.org>
+
+pkgbase=webkitgtk
+pkgname=(webkitgtk webkitgtk2)
+pkgver=2.4.11
+pkgrel=4
+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=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
+ webkitgtk-2.4.9-abs.patch)
+sha256sums=('588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7'
+ 'ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70')
+
+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
+}
+
+_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"
+}
Deleted: extra-i686/webkitgtk-2.4.9-abs.patch
===================================================================
--- extra-i686/webkitgtk-2.4.9-abs.patch 2017-01-18 21:06:40 UTC (rev
286949)
+++ extra-i686/webkitgtk-2.4.9-abs.patch 2017-01-18 21:10:39 UTC (rev
286950)
@@ -1,26 +0,0 @@
-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/extra-i686/webkitgtk-2.4.9-abs.patch (from rev 286949,
webkitgtk/trunk/webkitgtk-2.4.9-abs.patch)
===================================================================
--- extra-i686/webkitgtk-2.4.9-abs.patch (rev 0)
+++ extra-i686/webkitgtk-2.4.9-abs.patch 2017-01-18 21:10:39 UTC (rev
286950)
@@ -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/extra-i686/webkitgtk.install (from rev 286949,
webkitgtk/trunk/webkitgtk.install)
===================================================================
--- extra-i686/webkitgtk.install (rev 0)
+++ extra-i686/webkitgtk.install 2017-01-18 21:10:39 UTC (rev 286950)
@@ -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
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-01-18 21:06:40 UTC (rev 286949)
+++ extra-x86_64/PKGBUILD 2017-01-18 21:10:39 UTC (rev 286950)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andy...@archlinux.org>
-
-pkgbase=webkitgtk
-pkgname=(webkitgtk webkitgtk2)
-pkgver=2.4.11
-pkgrel=3
-pkgdesc="GTK+ Web content engine library"
-arch=(i686 x86_64)
-url="http://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)
-source=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
- webkitgtk-2.4.9-abs.patch)
-sha256sums=('588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7'
- 'ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70')
-
-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
-}
-
-_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() {
- 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 GTK2"
- 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/extra-x86_64/PKGBUILD (from rev 286949,
webkitgtk/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-01-18 21:10:39 UTC (rev 286950)
@@ -0,0 +1,83 @@
+# $Id$
+# Contributor: Andreas Radke <andy...@archlinux.org>
+
+pkgbase=webkitgtk
+pkgname=(webkitgtk webkitgtk2)
+pkgver=2.4.11
+pkgrel=4
+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=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
+ webkitgtk-2.4.9-abs.patch)
+sha256sums=('588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7'
+ 'ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70')
+
+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
+}
+
+_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"
+}
Deleted: extra-x86_64/webkitgtk-2.4.9-abs.patch
===================================================================
--- extra-x86_64/webkitgtk-2.4.9-abs.patch 2017-01-18 21:06:40 UTC (rev
286949)
+++ extra-x86_64/webkitgtk-2.4.9-abs.patch 2017-01-18 21:10:39 UTC (rev
286950)
@@ -1,26 +0,0 @@
-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/extra-x86_64/webkitgtk-2.4.9-abs.patch (from rev
286949, webkitgtk/trunk/webkitgtk-2.4.9-abs.patch)
===================================================================
--- extra-x86_64/webkitgtk-2.4.9-abs.patch (rev 0)
+++ extra-x86_64/webkitgtk-2.4.9-abs.patch 2017-01-18 21:10:39 UTC (rev
286950)
@@ -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/extra-x86_64/webkitgtk.install (from rev 286949,
webkitgtk/trunk/webkitgtk.install)
===================================================================
--- extra-x86_64/webkitgtk.install (rev 0)
+++ extra-x86_64/webkitgtk.install 2017-01-18 21:10:39 UTC (rev 286950)
@@ -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
+}
