[mingw-webkitgtk] Update to 1.7.92
Kalev Lember
kalev at fedoraproject.org
Wed Mar 28 19:08:02 UTC 2012
commit 95eb53519b0ae71d6319bea2f9af4e4ead8039f8
Author: Kalev Lember <kalevlember at gmail.com>
Date: Wed Mar 28 22:00:33 2012 +0300
Update to 1.7.92
- Dropped upstreamed patches
- Disabled geolocation, no mingw-geoclue package yet
- Removed glib-compile-schemas scriplets; the gsettings support was
removed in webkitgtk 1.8 branch
.gitignore | 1 +
...ebView-does-a-lot-of-work-during-size_all.patch | 193 --------------------
...dd-missing-pango-include-dir-to-fix-build.patch | 53 ------
changeset_r107098.diff | 13 --
mingw-webkitgtk.spec | 65 +------
sources | 2 +-
webkit-1.6.1-mingw-fixes.patch | 94 ----------
webkit-dont-build-dump-render-tree.patch | 11 -
webkitgtk-1.7.5-gmodule.patch | 20 --
webkitgtk-1.7.5-icu.patch | 11 -
webkitgtk-fix-threading-win-on-x86_64.patch | 16 --
11 files changed, 13 insertions(+), 466 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 034ef17..77ad2ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/webkit-1.5.2.tar.gz
/webkit-1.6.1.tar.gz
/webkit-1.7.5.tar.xz
+/webkit-1.7.92.tar.xz
diff --git a/mingw-webkitgtk.spec b/mingw-webkitgtk.spec
index 134bc47..c1dbdee 100644
--- a/mingw-webkitgtk.spec
+++ b/mingw-webkitgtk.spec
@@ -41,8 +41,8 @@
%bcond_with wml
Name: mingw-webkitgtk
-Version: 1.7.5
-Release: 7%{?dist}
+Version: 1.7.92
+Release: 1%{?dist}
Summary: MinGW Windows web content engine library
Group: Development/Libraries
@@ -52,35 +52,11 @@ URL: http://webkit.org/
#Source0: http://nightly.webkit.org/files/trunk/src/WebKit-r%{svn_revision}.tar.bz2
Source0: http://www.webkitgtk.org/webkit-%{version}.tar.xz
-# 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-1.6.1-mingw-fixes.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
-# Upstream patch, link with gmodule-2.0
-Patch3: webkitgtk-1.7.5-gmodule.patch
-
-# Upstream patch, fixes WebKitWebView not drawing initially on win32
-Patch4: 0001-GTK-WebKitWebView-does-a-lot-of-work-during-size_all.patch
-
-# Upstream patch, fixes missing pango includes with ICU backend enabled
-Patch5: 0002-GTK-Add-missing-pango-include-dir-to-fix-build.patch
-# Use correct ICU import library name, fixed upstream as well
-Patch6: webkitgtk-1.7.5-icu.patch
-
-# The compilation of ThreadingWin.cpp fails on x86_64
-# ../Source/JavaScriptCore/wtf/ThreadingWin.cpp:220:45: error: cast from 'void*' to 'unsigned int' loses precision [-fpermissive]
-# https://bugs.webkit.org/show_bug.cgi?id=78389
-Patch8: webkitgtk-fix-threading-win-on-x86_64.patch
-
-# Generating docs is broken when using out of source builds
-Patch9: changeset_r107098.diff
-
BuildArch: noarch
BuildRequires: bison
@@ -184,14 +160,7 @@ Static version of the MinGW Windows WebKitGTK+ library.
%prep
%setup -qn "webkit-%{version}"
-%patch1 -p1 -b .mingw
%patch2 -p0 -b .dumprendertree
-%patch3 -p1 -b .gmodule
-%patch4 -p1 -b .webview_map
-%patch5 -p1 -b .pango_includes
-%patch6 -p1 -b .icu
-%patch8 -p1 -b .threading_x86_64
-%patch9 -p1 -b .docs
autoreconf --verbose --install -I Source/autotools
@@ -206,16 +175,16 @@ autoreconf --verbose --install -I Source/autotools
--with-gtk=2.0 \
--with-font-backend=freetype \
--with-unicode-backend=icu \
- --disable-fullscreen-api \
--enable-static --enable-shared \
--disable-spellcheck \
+ --disable-geolocation \
%{?with_3dtransforms: --enable-3D-transforms } \
%{?with_coverage: --enable-coverage } \
%{?with_debug: --enable-debug } \
%{?with_jit: --enable-jit } \
%{?with_svg: --enable-svg-filters } \
%{?with_wml: --enable-wml }
-
+
%mingw_make %{?_smp_mflags} V=99
@@ -262,23 +231,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
%add_to_doc_files64 Source/JavaScriptCore/icu/LICENSE
-%postun -n mingw32-webkitgtk
-if [ $1 -eq 0 ] ; then
- /usr/bin/glib-compile-schemas %{mingw32_datadir}/glib-2.0/schemas &> /dev/null || :
-fi
-
-%posttrans -n mingw32-webkitgtk
-/usr/bin/glib-compile-schemas %{mingw32_datadir}/glib-2.0/schemas &> /dev/null || :
-
-%postun -n mingw64-webkitgtk
-if [ $1 -eq 0 ] ; then
- /usr/bin/glib-compile-schemas %{mingw64_datadir}/glib-2.0/schemas &> /dev/null || :
-fi
-
-%posttrans -n mingw64-webkitgtk
-/usr/bin/glib-compile-schemas %{mingw64_datadir}/glib-2.0/schemas &> /dev/null || :
-
-
# Win32
%files -n mingw32-webkitgtk -f mingw32-webkit-2.0.lang
%{_docdir}/mingw32-webkitgtk-%{version}/
@@ -291,7 +243,6 @@ fi
%{mingw32_libdir}/libwebkitgtk-1.0.dll.a
%{mingw32_libdir}/pkgconfig/javascriptcoregtk-1.0.pc
%{mingw32_libdir}/pkgconfig/webkit-1.0.pc
-%{mingw32_datadir}/glib-2.0/schemas/org.webkitgtk-1.0.gschema.xml
%{mingw32_datadir}/webkitgtk-1.0/
%files -n mingw32-webkitgtk-static
@@ -310,7 +261,6 @@ fi
%{mingw64_libdir}/libwebkitgtk-1.0.dll.a
%{mingw64_libdir}/pkgconfig/javascriptcoregtk-1.0.pc
%{mingw64_libdir}/pkgconfig/webkit-1.0.pc
-%{mingw64_datadir}/glib-2.0/schemas/org.webkitgtk-1.0.gschema.xml
%{mingw64_datadir}/webkitgtk-1.0/
%files -n mingw64-webkitgtk-static
@@ -319,6 +269,13 @@ fi
%changelog
+* Wed Mar 28 2012 Kalev Lember <kalevlember at gmail.com> - 1.7.92-1
+- Update to 1.7.92
+- Dropped upstreamed patches
+- Disabled geolocation, no mingw-geoclue package yet
+- Removed glib-compile-schemas scriplets; the gsettings support was removed in
+ webkitgtk 1.8 branch
+
* Sun Mar 18 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.7.5-7
- Added win64 support (contributed by Mikkel Kruse Johnsen)
diff --git a/sources b/sources
index ffa9495..03c98a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-074c72e937669cada70faaf6802a86e1 webkit-1.7.5.tar.xz
+520a421566584ea56552ee314de0b671 webkit-1.7.92.tar.xz
diff --git a/webkit-dont-build-dump-render-tree.patch b/webkit-dont-build-dump-render-tree.patch
index c11b96b..b988404 100644
--- a/webkit-dont-build-dump-render-tree.patch
+++ b/webkit-dont-build-dump-render-tree.patch
@@ -1,14 +1,3 @@
---- GNUmakefile.in.dumprendertree 2012-02-06 12:27:02.000000000 +0200
-+++ GNUmakefile.in 2012-02-06 21:17:19.244111742 +0200
-@@ -78,7 +78,7 @@
- build_triplet = @build@
- host_triplet = @host@
- noinst_PROGRAMS = Programs/jsc$(EXEEXT) Programs/minidom$(EXEEXT) \
-- $(am__EXEEXT_5) Programs/DumpRenderTree$(EXEEXT) \
-+ $(am__EXEEXT_5) \
- Programs/GtkLauncher$(EXEEXT) Programs/ImageDiff$(EXEEXT) \
- $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8)
- libexec_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
--- Tools/GNUmakefile.am
+++ Tools/GNUmakefile.am
@@ -1,5 +1,4 @@
More information about the scm-commits
mailing list