[mingw-webkitgtk3] Update to 1.10.1
Kalev Lember
kalev at fedoraproject.org
Sat Oct 20 11:56:10 UTC 2012
commit 9680a1e2024bb7144b73cc054762fccbd87a6f15
Author: Kalev Lember <kalevlember at gmail.com>
Date: Sat Oct 20 12:57:26 2012 +0200
Update to 1.10.1
- Drop upstreamed patches
- Enable parallel make
- Adjust for webkit -> webkitgtk tarball rename
.gitignore | 1 +
0001-Build-fix-with-newer-bison-2.6.patch | 593 -----------------------------
mingw-webkitgtk3.spec | 36 +-
sources | 2 +-
webkit-1.9.6-wk2-tests.patch | 36 ++
webkit-fix-spellcheck-build.patch | 63 ---
6 files changed, 57 insertions(+), 674 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 728b4cd..506b265 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/webkit-1.8.2.tar.xz
/webkit-1.8.2-win32-extra.tar.xz
/webkit-1.8.3.tar.xz
+/webkitgtk-1.10.1.tar.xz
diff --git a/mingw-webkitgtk3.spec b/mingw-webkitgtk3.spec
index 841e0de..66210ec 100644
--- a/mingw-webkitgtk3.spec
+++ b/mingw-webkitgtk3.spec
@@ -11,7 +11,7 @@
cp -p %1 %{buildroot}%{_docdir}/mingw64-webkitgtk3-%{version}/$(echo '%1' | sed -e 's!/!.!g')
Name: mingw-webkitgtk3
-Version: 1.8.3
+Version: 1.10.1
Release: 1%{?dist}
Summary: MinGW Windows GTK+ Web content engine library
@@ -19,19 +19,15 @@ Group: Development/Libraries
License: LGPLv2+ and BSD
URL: http://webkit.org/
-Source0: http://webkitgtk.org/releases/webkit-%{version}.tar.xz
+Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
+# Disable WebKit2 tests when building WebKit1
+# https://lists.webkit.org/pipermail/webkit-gtk/2012-August/001204.html
+Patch1: webkit-1.9.6-wk2-tests.patch
# Skip building the DumpRenderTree tool which requires internal symbols that
# aren't exported in the .dll.
Patch2: webkit-dont-build-dump-render-tree.patch
-# Fix the build with spellchecking enabled
-# https://bugs.webkit.org/show_bug.cgi?id=93255
-Patch3: webkit-fix-spellcheck-build.patch
-
-# Fix the build with bison 2.6
-Patch4: 0001-Build-fix-with-newer-bison-2.6.patch
-
BuildArch: noarch
BuildRequires: bison
@@ -117,11 +113,10 @@ This is the MinGW port of WebKitGTK+ for GTK+ 3.
%prep
-%setup -qn "webkit-%{version}"
+%setup -qn "webkitgtk-%{version}"
+%patch1 -p1 -b .disable_wk2
%patch2 -p0 -b .dumprendertree
-%patch3 -p1 -b .spellcheck
-%patch4 -p1 -b .bison26
autoreconf --verbose --install -I Source/autotools
@@ -136,10 +131,11 @@ autoreconf --verbose --install -I Source/autotools
--with-font-backend=freetype \
--with-unicode-backend=icu \
--disable-geolocation \
+ --disable-plugin-process \
+ --disable-webkit2 \
--disable-gtk-doc-html
-# %%{?_smp_mflags} disabled to avoid parallel make issues
-%mingw_make V=1
+%mingw_make %{?_smp_mflags} V=1
%install
@@ -151,7 +147,7 @@ install -m 755 build_win64/Programs/.libs/GtkLauncher.exe %{buildroot}%{mingw64_
# Drop all .la files
find $RPM_BUILD_ROOT -name "*.la" -delete
-%mingw_find_lang webkit-3.0
+%mingw_find_lang webkitgtk-3.0
## Copy over and rename the various files for %%doc inclusion.
%add_to_doc_files32 Source/WebKit/LICENSE
@@ -181,7 +177,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%add_to_doc_files64 Source/JavaScriptCore/icu/LICENSE
-%files -n mingw32-webkitgtk3 -f mingw32-webkit-3.0.lang
+%files -n mingw32-webkitgtk3 -f mingw32-webkitgtk-3.0.lang
%{_docdir}/mingw32-webkitgtk3-%{version}/
%{mingw32_bindir}/jsc-3.exe
%{mingw32_bindir}/GtkLauncher-3.exe
@@ -194,7 +190,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%{mingw32_libdir}/pkgconfig/webkitgtk-3.0.pc
%{mingw32_datadir}/webkitgtk-3.0/
-%files -n mingw64-webkitgtk3 -f mingw64-webkit-3.0.lang
+%files -n mingw64-webkitgtk3 -f mingw64-webkitgtk-3.0.lang
%{_docdir}/mingw64-webkitgtk3-%{version}/
%{mingw64_bindir}/jsc-3.exe
%{mingw64_bindir}/GtkLauncher-3.exe
@@ -209,6 +205,12 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog
+* Sat Oct 20 2012 Kalev Lember <kalevlember at gmail.com> - 1.10.1-1
+- Update to 1.10.1
+- Drop upstreamed patches
+- Enable parallel make
+- Adjust for webkit -> webkitgtk tarball rename
+
* Thu Aug 30 2012 Kalev Lember <kalevlember at gmail.com> - 1.8.3-1
- Update to 1.8.3
diff --git a/sources b/sources
index 5f5ca09..968b8be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dcbf9d5e2e6391f857c29a57528b32a6 webkit-1.8.3.tar.xz
+28c930cda012391453c476cdacfaca65 webkitgtk-1.10.1.tar.xz
diff --git a/webkit-1.9.6-wk2-tests.patch b/webkit-1.9.6-wk2-tests.patch
new file mode 100644
index 0000000..6fdf33b
--- /dev/null
+++ b/webkit-1.9.6-wk2-tests.patch
@@ -0,0 +1,36 @@
+Do not build WebKit2 test for WebKit1.
+
+diff -uprN webkit-1.9.6/Source/ThirdParty/gtest/GNUmakefile.am webkit-1.9.6.az/Source/ThirdParty/gtest/GNUmakefile.am
+--- webkit-1.9.6/Source/ThirdParty/gtest/GNUmakefile.am 2012-07-19 12:02:14 +0200
++++ webkit-1.9.6.az/Source/ThirdParty/gtest/GNUmakefile.am 2012-08-10 11:55:45 +0200
+@@ -1,3 +1,4 @@
++if ENABLE_WEBKIT2
+
+ noinst_LTLIBRARIES += \
+ Libraries/libgtest.la
+@@ -40,6 +41,8 @@ Libraries_libgtest_la_CXXFLAGS = -DGTEST
+ Libraries_libgtest_la_LIBADD = \
+ -lpthread
+
++endif
++
+ # gtest source files that we don't compile directly. They are
+ # #included by gtest-all.cc.
+ EXTRA_DIST += \
+diff -uprN webkit-1.9.6/Tools/TestWebKitAPI/GNUmakefile.am webkit-1.9.6.az/Tools/TestWebKitAPI/GNUmakefile.am
+--- webkit-1.9.6/Tools/TestWebKitAPI/GNUmakefile.am 2012-08-06 10:17:52 +0200
++++ webkit-1.9.6.az/Tools/TestWebKitAPI/GNUmakefile.am 2012-08-10 11:55:46 +0200
+@@ -1,3 +1,5 @@
++if ENABLE_WEBKIT2
++
+ BUILT_SOURCES += \
+ generate-testwebkitapi-forwarding-headers
+ wk2_tests_sources = $(shell ls $(srcdir)/Tools/TestWebKitAPI/Tests/WebKit2/*.cpp)
+@@ -91,7 +93,6 @@ Programs_TestWebKitAPI_TestGtk_SOURCES =
+ Tools/TestWebKitAPI/config.h \
+ Tools/TestWebKitAPI/Tests/gtk/InputMethodFilter.cpp
+
+-if ENABLE_WEBKIT2
+ noinst_PROGRAMS += \
+ Programs/TestWebKitAPI/TestWebKit2
+
More information about the scm-commits
mailing list