summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOmar Vega Ramos <ovruni@gnu.org.pe>2016-12-02 15:34:39 -0500
committerOmar Vega Ramos <ovruni@gnu.org.pe>2016-12-02 15:34:39 -0500
commit3a41637be0104a349e3151a6ed53eb2ca94f88de (patch)
treef8420c95987830ad5d27aa0203f5092b206590fa
parent8009532d60c066ae89b559d9405eeb0f6d886dee (diff)
downloadabslibre-3a41637be0104a349e3151a6ed53eb2ca94f88de.tar.gz
abslibre-3a41637be0104a349e3151a6ed53eb2ca94f88de.tar.bz2
abslibre-3a41637be0104a349e3151a6ed53eb2ca94f88de.zip
webkitgtk: Add webkitgtk-2.4.9-abs.patch
-rw-r--r--nonprism/webkitgtk/PKGBUILD9
-rw-r--r--nonprism/webkitgtk/webkitgtk-2.4.9-abs.patch26
2 files changed, 33 insertions, 2 deletions
diff --git a/nonprism/webkitgtk/PKGBUILD b/nonprism/webkitgtk/PKGBUILD
index 9160ae9c0..70ba460a9 100644
--- a/nonprism/webkitgtk/PKGBUILD
+++ b/nonprism/webkitgtk/PKGBUILD
@@ -17,12 +17,17 @@ 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)
-sha256sums=('588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7')
+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() (
diff --git a/nonprism/webkitgtk/webkitgtk-2.4.9-abs.patch b/nonprism/webkitgtk/webkitgtk-2.4.9-abs.patch
new file mode 100644
index 000000000..9a1c5f990
--- /dev/null
+++ b/nonprism/webkitgtk/webkitgtk-2.4.9-abs.patch
@@ -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;