From 9aab700055a7bb81a6f3164b7c34476a72e61fd2 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Dec 27 2016 18:56:11 +0000
Subject: Switch to webKitTwoOnly branch and webkit2. Fixes bugs #1375821 #1172120

Add support for system wide crypto with gnutls. Fixes bug #1348218

---

diff --git a/.gitignore b/.gitignore
index 7024636..6df5e5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ midori-0.2.6.tar.bz2
 /midori_0.5.9_all_.tar.bz2
 /midori_0.5.10_all_.tar.bz2
 /midori_0.5.11_all_.tar.bz2
+/midori-0.5.12.tar.bz2
diff --git a/midori.spec b/midori.spec
index 0fe0903..b788f37 100644
--- a/midori.spec
+++ b/midori.spec
@@ -1,23 +1,23 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		midori
-Version:	0.5.11
-Release:	2%{?dist}
+Version:	0.5.12
+Release:	0.1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
 Group:		Applications/Internet
 License:	LGPLv2+
 URL:		http://midori-browser.org/
 
-Source0:        http://midori-browser.org/downloads/midori_%{version}_all_.tar.bz2
+# Using the bzr webKitTwoOnly branch until there's a webkit2 branch
+# Manually created from a checkout of that branch.
+Source0:        midori-0.5.12.tar.bz2
 
 ## Fedora-specific: Set the default homepage to start.fedoraproject.org
 ## instead of search page.
-Patch0: 	midori-0.5.7-homepage.patch
-# Disable sslv3
-Patch1:         midori-0.5.9-disable-sslv3.patch
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: 	midori-0.5.12-homepage.patch
+## Fedora-specific: system wide crypro policy support. 
+Patch1:         midori-0.5.12-system-crypto.patch
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
@@ -33,11 +33,8 @@ BuildRequires:	perl(XML::Parser)
 BuildRequires:	python-docutils
 BuildRequires:	sqlite-devel
 BuildRequires:	vala
-BuildRequires:	unique-devel
-BuildRequires:	webkitgtk-devel >= 1.1.1
-# for gtk3/webkit2 build, comment the 2 above and comment these in
-#BuildRequires: webkitgtk4-devel >= 1.1.1
-#BuildRequires: unique3-devel
+BuildRequires:	unique3-devel
+BuildRequires:	webkitgtk4-devel >= 1.1.1
 
 BuildRequires:	cmake
 BuildRequires:	librsvg2-tools
@@ -46,8 +43,8 @@ BuildRequires:	gcr-devel
 %description
 Midori is a lightweight web browser, and has many features expected of a
 modern browser, including:
-* Full integration with GTK+2.
-* Fast rendering with WebKit.
+* Full integration with GTK3.
+* Fast rendering with WebKit2.
 * Tabs, windows and session management.
 * Bookmarks are stored with XBEL.
 * Searchbox based on OpenSearch.
@@ -59,13 +56,9 @@ The project is currently in an early alpha state. The features are still being
 implemented, and some are still quite incomplete.
 
 %prep
-%setup -q
-%patch0 -p1 -b .fedora-homepage
-%patch1 -p1
+%autosetup -p1
 
 %build
-# for gtk3/webkit2 build use this cmake line
-#cmake -DCMAKE_INSTALL_SYSCONFDIR=/etc -DUSE_APIDOCS=1 -DUSE_ZEITGEIST=OFF -DHALF_BRO_INCOM_WEBKIT2=ON .
 %cmake -DCMAKE_INSTALL_SYSCONFDIR=/etc -DUSE_APIDOCS=1 -DUSE_ZEITGEIST=OFF .
 
 make %{?_smp_mflags}
@@ -76,9 +69,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name}
 desktop-file-install					\
-%if 0%{?fedora} < 19
-	--vendor fedora					\
-%endif
 	--delete-original				\
 	--dir %{buildroot}%{_datadir}/applications	\
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -127,6 +117,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/libmidori-core.*
 
 %changelog
+* Tue Dec 27 2016 Kevin Fenzi <kevin@scrye.com> - 0.5.12-0.1
+- Switch to webKitTwoOnly branch and webkit2. Fixes bugs #1375821 #1172120
+- Add support for system wide crypto with gnutls. Fixes bug #1348218
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index d37433c..30dff92 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fcc03ef759fce4fe9f2446d9da4a065e  midori_0.5.11_all_.tar.bz2
+SHA512 (midori-0.5.12.tar.bz2) = 1cfb6952f96bf8edfaddc8720b18c84a3ee104ce1791c8dd601a59050a80d2fbff401510bd09ceb85829846c1fd8cff0ad6360d8b1fcb011bfdfb896dacf53c0