From 3b35e86a89ad362e6d8cfb8284f4e982ab463db4 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@gnome.org>
Date: Aug 22 2014 17:49:21 +0000
Subject: Fix rendering of checked toggle buttons


---

diff --git a/webkitgtk-2.5.3-toggle-buttons.patch b/webkitgtk-2.5.3-toggle-buttons.patch
new file mode 100644
index 0000000..742a4e2
--- /dev/null
+++ b/webkitgtk-2.5.3-toggle-buttons.patch
@@ -0,0 +1,30 @@
+2014-08-21  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [GTK] Toggle buttons visually broken with GTK+ 3.13.7
+        https://bugs.webkit.org/show_bug.cgi?id=136130
+
+        Reviewed by NOBODY (OOPS!).
+
+        No new tests. Hopefully covered by existing tests, and our tests only
+        run with GTK+ 3.6 anyway.
+
+        * platform/gtk/RenderThemeGtk3.cpp:
+        (WebCore::paintToggle): use GTK_STATE_FLAG_CHECKED when compiling for
+        GTK+ 3.13.7 and above to ensure toggle buttons display as toggled.
+
+diff --git a/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp b/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp
+index 3630c43dffde59c6ea843c35a37e8e94611e4ae5..6d811a1747ac3ca7ff376bb6a0fcb02273c335d3 100644
+--- a/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp
++++ b/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp
+@@ -253,7 +253,11 @@ static void paintToggle(const RenderThemeGtk* theme, GType widgetType, const Ren
+     if (theme->isIndeterminate(renderObject))
+         flags |= GTK_STATE_FLAG_INCONSISTENT;
+     else if (theme->isChecked(renderObject))
++#if GTK_CHECK_VERSION(3, 13, 7)
++        flags |= GTK_STATE_FLAG_CHECKED;
++#else
+         flags |= GTK_STATE_FLAG_ACTIVE;
++#endif
+     if (theme->isPressed(renderObject))
+         flags |= GTK_STATE_FLAG_SELECTED;
+     gtk_style_context_set_state(context, static_cast<GtkStateFlags>(flags));
diff --git a/webkitgtk4.spec b/webkitgtk4.spec
index 80d1dcf..b2cad2c 100644
--- a/webkitgtk4.spec
+++ b/webkitgtk4.spec
@@ -7,13 +7,16 @@
 
 Name:           webkitgtk4
 Version:        2.5.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK+ Web content engine library
 
 License:        LGPLv2
 URL:            http://www.webkitgtk.org/
 Source0:        http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 
+# https://bugs.webkit.org/show_bug.cgi?id=136130
+Patch0:         webkitgtk-2.5.3-toggle-buttons.patch
+
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  bison
 BuildRequires:  cairo-devel
@@ -66,6 +69,7 @@ files for developing applications that use %{name}.
 
 %prep
 %setup -q -n webkitgtk-%{version}
+%patch0 -p1 -b .toggle-buttons
 
 # Remove bundled libraries
 rm -rf Source/ThirdParty/leveldb/
@@ -139,6 +143,9 @@ make %{?_smp_mflags} -C %{_target_platform}
 %{_datadir}/gir-1.0/WebKit2WebExtension-4.0.gir
 
 %changelog
+* Fri Aug 22 2014 Michael Catanzaro <mcatanzaro@gnome.org> - 2.5.3-4
+- Add webkitgtk-2.5.3-toggle-buttons.patch
+
 * Thu Aug 21 2014 Kalev Lember <kalevlember@gmail.com> - 2.5.3-3
 - More package review fixes (#1131284)
 - Correct the license tag to read LGPLv2