[mingw-webkitgtk: 6/36] Update to 1.4.0
Kalev Lember
kalev at fedoraproject.org
Tue Mar 6 21:09:55 UTC 2012
commit 0e0af157523821367b9f1829c018cc6b05e5a8bf
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Thu Apr 28 00:19:55 2011 +0200
Update to 1.4.0
mingw32-webkitgtk.spec | 84 ++++++++++++++++++++++++++++------------
webkit-jpeg-boolean-fix.patch | 4 +-
2 files changed, 61 insertions(+), 27 deletions(-)
---
diff --git a/mingw32-webkitgtk.spec b/mingw32-webkitgtk.spec
index 068693f..5185ef4 100644
--- a/mingw32-webkitgtk.spec
+++ b/mingw32-webkitgtk.spec
@@ -47,8 +47,8 @@
%bcond_with wml
Name: mingw32-webkitgtk
-Version: 1.3.6
-Release: 3%{?dist}
+Version: 1.4.0
+Release: 1%{?dist}
Summary: MinGW Windows web content engine library
Group: Development/Libraries
@@ -65,11 +65,33 @@ Patch0: webkit-jpeg-boolean-fix.patch
# Several changes required to get webkitgtk cross-compiled
# Originally created by Mikkel Kruse Johnsen
# https://bugs.webkit.org/show_bug.cgi?id=23872
-Patch1: webkit-mingw-fixes.patch
+Patch1: webkit-1.3.13-mingw-fixes.patch
-# The DumpRenderTree tool fails to compile for version 1.3.6
-# As this tool isn't packaged a ugly hack can be applied to make it compile
-Patch2: webkit-dump-render-tree-compile-fix.patch
+# The DumpRenderTree tool fails to compile for version 1.3.13
+# as it depends on internal symbols which aren't exported in
+# the .dll so it's safe to skip building this tool
+Patch2: webkit-dont-build-dump-render-tree.patch
+
+# Fix building with gcc 4.6: http://trac.webkit.org/changeset/84123
+Patch3: changeset_r84123.diff
+
+# 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
+
+# Fix build break when font backend is Pango
+Patch6: changeset_r82701.diff
+
+# Revert some commits as the CreateTimerQueueTimer function isn't
+# implemented in the mingw.org stack (but is in the mingw-w64 stack)
+# These can be dropped as soon as were using the mingw-w64 toolchain
+Patch7: changeset_r75839.diff
+Patch8: changeset_r75830.diff
+Patch9: changeset_r75827.diff
+Patch10: changeset_r75825.diff
+Patch11: changeset_r75819.diff
BuildArch: noarch
@@ -126,6 +148,15 @@ Static version of the MinGW Windows WebKitGTK+ library.
%patch0 -p0 -b .jpeg_boolean
%patch1 -p0 -b .mingw
%patch2 -p0 -b .dumprendertree
+%patch3 -p0 -b .gcc46
+%patch4 -p0 -b .libpng15
+%patch5 -p0 -b .libpng15_2
+%patch6 -p0 -b .pango
+%patch7 -p0 -b .createtimerqueuetimer -R
+%patch8 -p0 -b .createtimerqueuetimer -R
+%patch9 -p0 -b .createtimerqueuetimer -R
+%patch10 -p0 -b .createtimerqueuetimer -R
+%patch11 -p0 -b .createtimerqueuetimer -R
%build
@@ -135,6 +166,7 @@ Static version of the MinGW Windows WebKitGTK+ library.
--with-unicode-backend=glib \
--disable-video \
--enable-static --enable-shared \
+ --disable-spellcheck \
%{?with_3dtransforms: --enable-3D-transforms } \
%{?with_coverage: --enable-coverage } \
%{?with_debug: --enable-debug } \
@@ -154,25 +186,18 @@ install -m 755 Programs/.libs/GtkLauncher.exe %{buildroot}%{_mingw32_bindir}
## Copy over and rename the various files for %%doc inclusion.
-%add_to_doc_files JavaScriptCore/icu/LICENSE
-%add_to_doc_files WebKit/LICENSE
-%add_to_doc_files WebCore/icu/LICENSE
-%add_to_doc_files WebCore/LICENSE-APPLE
-%add_to_doc_files WebCore/LICENSE-LGPL-2
-%add_to_doc_files WebCore/LICENSE-LGPL-2.1
-
-%add_to_doc_files JavaScriptCore/pcre/COPYING
-%add_to_doc_files JavaScriptCore/COPYING.LIB
-
-%add_to_doc_files JavaScriptCore/icu/README
-%add_to_doc_files WebKit/gtk/po/README
-
-%add_to_doc_files JavaScriptCore/AUTHORS
-%add_to_doc_files JavaScriptCore/pcre/AUTHORS
-
-%add_to_doc_files JavaScriptCore/THANKS
-
-%add_to_doc_files WebKit/gtk/NEWS
+%add_to_doc_files Source/WebKit/LICENSE
+%add_to_doc_files Source/WebKit/gtk/po/README
+%add_to_doc_files Source/WebKit/gtk/NEWS
+%add_to_doc_files Source/WebCore/icu/LICENSE
+%add_to_doc_files Source/WebCore/LICENSE-APPLE
+%add_to_doc_files Source/WebCore/LICENSE-LGPL-2
+%add_to_doc_files Source/WebCore/LICENSE-LGPL-2.1
+%add_to_doc_files Source/JavaScriptCore/COPYING.LIB
+%add_to_doc_files Source/JavaScriptCore/THANKS
+%add_to_doc_files Source/JavaScriptCore/AUTHORS
+%add_to_doc_files Source/JavaScriptCore/icu/README
+%add_to_doc_files Source/JavaScriptCore/icu/LICENSE
%files -f webkit-2.0.lang
@@ -195,6 +220,15 @@ install -m 755 Programs/.libs/GtkLauncher.exe %{buildroot}%{_mingw32_bindir}
%changelog
+* Wed Apr 27 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.4.0-1
+- Update to 1.4.0
+- Drop upstreamed patches
+
+* Wed Apr 20 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.3.13-1
+- Update to 1.3.13
+- Fixed compatibility with gcc 4.6
+- Disabled spellchecking support for now as it breaks compilation
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/webkit-jpeg-boolean-fix.patch b/webkit-jpeg-boolean-fix.patch
index f3b1a0b..0f44747 100644
--- a/webkit-jpeg-boolean-fix.patch
+++ b/webkit-jpeg-boolean-fix.patch
@@ -1,5 +1,5 @@
---- ./WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp.orig 2010-11-07 12:09:27.209820788 +0100
-+++ ./WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp 2010-11-07 12:10:47.274135534 +0100
+--- Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp.orig 2010-11-07 12:09:27.209820788 +0100
++++ Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp 2010-11-07 12:10:47.274135534 +0100
@@ -41,7 +41,7 @@
#include "JPEGImageDecoder.h"
#include <stdio.h> // Needed by jpeglib.h for FILE.
More information about the scm-commits
mailing list