[mingw-webkitgtk: 16/36] Update to 1.4.2

[Kalev Lember]

commit 6d0e0dc4f091db43250b65de413a83a60d493f3d
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Thu Jul 7 00:18:12 2011 +0200

    Update to 1.4.2
    
    - Update to 1.4.2
    - Rebuild for win-iconv

 .gitignore             |    1 +
 changeset_r82344.diff  |   38 --------------------------------------
 mingw32-webkitgtk.spec |   10 +++++-----
 sources                |    2 +-
 4 files changed, 7 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a3622b8..db1f763 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /webkit-1.3.13.tar.gz
 /webkit-1.4.0.tar.gz
 /webkit-1.4.1.tar.gz
+/webkit-1.4.2.tar.gz
diff --git a/mingw32-webkitgtk.spec b/mingw32-webkitgtk.spec
index d36fbd2..32acb57 100644
--- a/mingw32-webkitgtk.spec
+++ b/mingw32-webkitgtk.spec
@@ -47,7 +47,7 @@
 %bcond_with	wml
 
 Name:		mingw32-webkitgtk
-Version:	1.4.1
+Version:	1.4.2
 Release:	1%{?dist}
 Summary:	MinGW Windows web content engine library
 
@@ -68,9 +68,6 @@ Patch1:		webkit-1.3.13-mingw-fixes.patch
 # the .dll so it's safe to skip building this tool
 Patch2:		webkit-dont-build-dump-render-tree.patch
 
-# Fix building with libpng 1.5
-Patch4:		changeset_r82344.diff
-
 # An additional change is required for libpng 1.5 compatibility
 Patch5:		webkit-libpng15-compile-fix.patch
 
@@ -138,7 +135,6 @@ Static version of the MinGW Windows WebKitGTK+ library.
 
 %patch1 -p0 -b .mingw
 %patch2 -p0 -b .dumprendertree
-%patch4 -p0 -b .libpng15
 #%patch5 -p0 -b .libpng15_2
 %patch6 -p0 -b .pango
 %patch7 -p1 -b .winver
@@ -206,6 +202,10 @@ install -m 755 Programs/.libs/GtkLauncher.exe %{buildroot}%{_mingw32_bindir}
 
 
 %changelog
+* Thu Jul  7 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.4.2-1
+- Update to 1.4.2
+- Rebuild for win-iconv
+
 * Sun Jun 19 2011 Kalev Lember <kalev at smartlink.ee> - 1.4.1-1
 - Update to 1.4.1
 - Dropped upstreamed gcc 4.6 compatibility patch
diff --git a/sources b/sources
index 3eddb56..02f5238 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c1a4f732a77d6f8197437b50678d3dbc  webkit-1.4.1.tar.gz
+361f8420e93d12101d650758fec09fa0  webkit-1.4.2.tar.gz