[webkitgtk] Update to 1.8.0

[Kevin Fenzi]

commit b69195f758ee2e92750a6f881ef4eb7a9fdae0bf
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Wed Mar 28 20:11:38 2012 -0600

    Update to 1.8.0

 .gitignore                     |    1 +
 sources                        |    2 +-
 webkit-1.3.12-no-execmem.patch |   12 ------------
 webkit-1.6.1-dtoa-s390.patch   |   12 ------------
 webkit-1.6.1-new-glib.patch    |   12 ------------
 webkit-1.6.1-stringfix.patch   |   19 -------------------
 webkit-1.6.1-unistd.patch      |   11 -----------
 webkitgtk.spec                 |   38 +++++++++++++++-----------------------
 8 files changed, 17 insertions(+), 90 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b19f7e1..7eb52d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ webkit-1.3.2.tar.gz
 /webkit-1.4.3.tar.gz
 /webkit-1.6.1.tar.gz
 /webkit-1.6.3.tar.xz
+/webkitgtk-1.8.0-1.fc18.src.rpm
diff --git a/sources b/sources
index 2e9c0ef..fd881a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c476d9335419df061510d31e21175df1  webkit-1.6.3.tar.xz
+3af724c1d18d69ee6479f63232331304  webkitgtk-1.8.0-1.fc18.src.rpm
diff --git a/webkitgtk.spec b/webkitgtk.spec
index 51b675b..4a4177f 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -34,8 +34,8 @@
 %bcond_with 	wml
 
 Name:		webkitgtk
-Version:	1.6.3
-Release:	2%{?dist}
+Version:	1.8.0
+Release:	1%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -45,22 +45,10 @@ Group:		Development/Libraries
 License:	LGPLv2+ and BSD
 URL:		http://www.webkitgtk.org/
 
-Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.xz
+Source0:	http://www.webkitgtk.org/releases/webkit-%{version}.tar.xz
 
-## See: https://bugzilla.redhat.com/show_bug.cgi?id=516057
-## FIXME: We forcibly disable the JIT compiler for the time being.
-## This is a temporary workaround which causes a slight performance hit on
-## 32- and 64-bit x86; but until we can fix the JIT to correctly handle WX
-## memory, at least we'll have a WebKit stack that doesn't crash due to this
-## bug. :)
-Patch1: 	webkit-1.3.12-no-execmem.patch
+# add support for nspluginwrapper. 
 Patch2: 	webkit-1.3.10-nspluginwrapper.patch
-# https://bugs.webkit.org/show_bug.cgi?id=69940
-Patch3:         webkit-1.6.1-dtoa-s390.patch
-# Fix string def
-Patch5:         webkit-1.6.1-stringfix.patch
-# add unistd.h include
-Patch6:         webkit-1.6.1-unistd.patch
 
 BuildRequires:	bison
 BuildRequires:	chrpath
@@ -81,6 +69,7 @@ BuildRequires:	pcre-devel
 BuildRequires:	sqlite-devel
 BuildRequires:	gobject-introspection-devel
 BuildRequires:  mesa-libGL-devel
+BuildRequires:  gtk-doc
 
 ## Conditional dependencies...
 %if %{with pango}
@@ -123,11 +112,7 @@ LICENSE, README, and AUTHORS files.
 
 %prep
 %setup -qn "webkit-%{version}"
-%patch1 -p1 -b .no-execmem
 %patch2 -p1 -b .nspluginwrapper
-%patch3 -p1 -b .dtoa-s390
-%patch5 -p1 -b .stringfix
-%patch6 -p1 -b .unistd
 
 %build
 %ifarch s390 %{arm}
@@ -151,9 +136,12 @@ CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGE
 mkdir -p DerivedSources/webkit
 mkdir -p DerivedSources/WebCore
 mkdir -p DerivedSources/ANGLE
+mkdir -p DerivedSources/WebKit2/webkit2gtk/webkit2
+mkdir -p DerivedSources/InjectedBundle
 
 # Disabled because of https://bugs.webkit.org/show_bug.cgi?id=34846
-make V=1 %{?_smp_mflags}
+#make V=1 %{?_smp_mflags}
+make V=1
 
 %install
 rm -rf %{buildroot}
@@ -198,26 +186,30 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %{_libdir}/libjavascriptcoregtk-1.0.so.*
 %{_libdir}/girepository-1.0/WebKit-1.0.typelib
 %{_libdir}/girepository-1.0/JSCore-1.0.typelib
+#{_datadir}/glib-2.0/schemas/org.webkitgtk-1.0.gschema.xml
 %{_libexecdir}/%{name}/
-%{_datadir}/glib-2.0/schemas/org.webkitgtk-1.0.gschema.xml
 %{_datadir}/webkitgtk-1.0
 
 %files	devel
 %defattr(-,root,root,-)
 %{_bindir}/jsc-1
-%{_includedir}/webkit-1.0
+%{_includedir}/webkitgtk-1.0
 %{_libdir}/libwebkitgtk-1.0.so
 %{_libdir}/libjavascriptcoregtk-1.0.so
 %{_libdir}/pkgconfig/webkit-1.0.pc
 %{_libdir}/pkgconfig/javascriptcoregtk-1.0.pc
 %{_datadir}/gir-1.0/WebKit-1.0.gir
 %{_datadir}/gir-1.0/JSCore-1.0.gir
+%{_datadir}/gtk-doc/html/webkitgtk
 
 %files	doc
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-%{version}/
 
 %changelog
+* Tue Mar 27 2012 Kevin Fenzi <kevin at scrye.com> - 1.8.0-1
+- Update to 1.8.0
+
 * Tue Feb 28 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.6.3-2
 - Add ARM to and optimise compile flags for low mem arches