Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (485328c77154f7fec6b7a1bfc915c24df2b0573a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (485328c77154f7fec6b7a1bfc915c24df2b0573a)
  • Date: Tue, 10 May 2016 18:13:34 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

http/webkitgtk/DETAILS | 4 ++--
http/webkitgtk/HISTORY | 4 ++++
http/webkitgtk/patches/gcc6.patch | 26 ++++++++++++++++++++++++++
3 files changed, 32 insertions(+), 2 deletions(-)

New commits:
commit 485328c77154f7fec6b7a1bfc915c24df2b0573a
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/webkitgtk: version 2.4.11 + gcc 6.1 fix

diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index d18764b..825e298 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,8 +1,8 @@
SPELL=webkitgtk
- VERSION=2.4.10
+ VERSION=2.4.11
SOURCE=webkitgtk-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:09cff437dadfa6ba1b90674ef4d9db558710247559bb8c2894b54a43504428b99465aa5d35bf3323c22827b67711e8dc031d4b63361eb9906c96e2bfd8ee11a8
+
SOURCE_HASH=sha512:2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb
SOURCE_DIRECTORY=$BUILD_DIRECTORY/webkitgtk-$VERSION
WEB_SITE=http://webkitgtk.org/
SECURITY_PATCH=10
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 8a99f57..56598b8 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,7 @@
+2016-05-10 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.11
+ * patches/gcc6.patch: added gcc 6.1 fix from Fedora
+
2016-03-22 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 2.4.10, SECURITY_PATCH++, (CVE-2015-1120,
CVE-2015-1076, CVE-2015-1071, CVE-2015-1081, CVE-2015-1122,
diff --git a/http/webkitgtk/patches/gcc6.patch
b/http/webkitgtk/patches/gcc6.patch
new file mode 100644
index 0000000..1ed6ffc
--- /dev/null
+++ b/http/webkitgtk/patches/gcc6.patch
@@ -0,0 +1,26 @@
+diff -up
webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp.orig
webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp
+--- webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp.orig
2016-04-15 20:59:30.679145001 +0200
++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp
2016-04-15 20:59:41.664149533 +0200
+@@ -85,8 +85,8 @@ int GtkClickCounter::clickCountForGdkBut
+ 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)
++ || ((std::abs(buttonEvent->x - m_previousClickPoint.x()) <
doubleClickDistance)
++ && (std::abs(buttonEvent->y - m_previousClickPoint.y()) <
doubleClickDistance)
+ && (eventTime - m_previousClickTime <
static_cast<guint>(doubleClickTime))
+ && (buttonEvent->button == m_previousClickButton)))
+ m_currentClickCount++;
+diff -up
webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp.orig
webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
+--- webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp.orig
2016-04-16 10:27:25.371996415 +0200
++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
2016-04-16 10:34:52.624007845 +0200
+@@ -659,7 +659,7 @@ String localizedMediaTimeDescription(flo
+ if (!std::isfinite(time))
+ return String::fromUTF8(_("indefinite time"));
+
+- int seconds = static_cast<int>(abs(time));
++ int seconds = abs(static_cast<int>(time));
+ int days = seconds / (60 * 60 * 24);
+ int hours = seconds / (60 * 60);
+ int minutes = (seconds / 60) % 60;



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (485328c77154f7fec6b7a1bfc915c24df2b0573a), Pavel Vinogradov, 05/10/2016

Archive powered by MHonArc 2.6.24.

Top of Page