[webkitgtk3] Update to 1.11.4

Wed Jan 16 12:01:36 UTC 2013

commit 856779dc52c0175b89cf9158e53bb5a8c5004d4a
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Jan 16 10:00:35 2013 +0100

    Update to 1.11.4
    
    - Remove conditional pango deps; the build now uses harfbuzz directly
    - BR libwebp-devel
    - Drop upstreamed librt linking patch

 .gitignore               |    1 +
 sources                  |    2 +-
 webkit-1.11.2-yarr.patch |    4 ++--
 webkitgtk3.spec          |   37 ++++++++++++++++++-------------------
 4 files changed, 22 insertions(+), 22 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index ca68e09..1760b7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ webkit-1.3.3.tar.gz
 /webkitgtk-1.10.0.tar.xz
 /webkitgtk-1.10.1.tar.xz
 /webkitgtk-1.11.2.tar.xz
+/webkitgtk-1.11.4.tar.xz
diff --git a/sources b/sources
index d83e5a7..dd4b1a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5db53912982617b952bd2722d56ba74f  webkitgtk-1.11.2.tar.xz
+b0c54b7ffcebb978e5d83cd8745b704e  webkitgtk-1.11.4.tar.xz
diff --git a/webkit-1.11.2-yarr.patch b/webkit-1.11.2-yarr.patch
index 4653594..494e5a8 100644
--- a/webkit-1.11.2-yarr.patch
+++ b/webkit-1.11.2-yarr.patch
@@ -5,8 +5,8 @@ diff -up webkitgtk-1.11.2/Source/WTF/wtf/Platform.h.orig webkitgtk-1.11.2/Source
  #define ENABLE_REGEXP_TRACING 0
  
  /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
--#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !PLATFORM(CHROMIUM)
-+#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && !PLATFORM(CHROMIUM)
+-#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !PLATFORM(CHROMIUM) && !(OS(QNX) && PLATFORM(QT))
++#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && !PLATFORM(CHROMIUM) && !(OS(QNX) && PLATFORM(QT))
  #define ENABLE_YARR_JIT 1
  
  /* Setting this flag compares JIT results with interpreter results. */
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index 8fc3169..0b470dc 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -6,8 +6,8 @@
         cp -p %1  %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk3
-Version:        1.11.2
-Release:        3%{?dist}
+Version:        1.11.4
+Release:        1%{?dist}
 Summary:        GTK+ Web content engine library
 
 Group:          Development/Libraries
@@ -18,9 +18,6 @@ Source0:        http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 
 Patch1:         webkit-1.3.4-no-execmem.patch
 Patch2:         webkit-1.1.14-nspluginwrapper.patch
-# Explicitly link with -lrt
-# https://bugs.webkit.org/show_bug.cgi?id=103194
-Patch3:         webkitgtk-librt.patch
 # workarounds for non-JIT arches
 # https://bugs.webkit.org/show_bug.cgi?id=104270
 Patch4:         webkit-1.11.2-yarr.patch
@@ -30,9 +27,12 @@ Patch5:         webkit-1.11.2-includes.patch
 Patch6:         webkit-1.11.2-Double2Ints.patch
 
 BuildRequires:  bison
+BuildRequires:  cairo-devel
 BuildRequires:  chrpath
 BuildRequires:  enchant-devel
 BuildRequires:  flex
+BuildRequires:  fontconfig-devel
+BuildRequires:  freetype-devel
 BuildRequires:  geoclue-devel
 BuildRequires:  gettext
 BuildRequires:  gperf
@@ -41,11 +41,13 @@ BuildRequires:  gstreamer1-plugins-base-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  gtk3-devel >= 3.0
 BuildRequires:  gtk-doc
+BuildRequires:  harfbuzz-devel
 BuildRequires:  libsoup-devel >= 2.37.2.1
 BuildRequires:  libicu-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libsecret-devel
+BuildRequires:  libwebp-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  libXt-devel
 BuildRequires:  pcre-devel
@@ -55,15 +57,6 @@ BuildRequires:  perl-Switch
 BuildRequires:  ruby
 BuildRequires:  mesa-libGL-devel
 
-## Conditional dependencies...
-%if %{with pango}
-BuildRequires:  pango-devel
-%else
-BuildRequires:  cairo-devel
-BuildRequires:  fontconfig-devel
-BuildRequires:  freetype-devel
-%endif
-
 %description
 WebKitGTK+ is the port of the portable web rendering engine WebKit to the
 GTK+ platform.
@@ -95,14 +88,10 @@ This package contains developer documentation for %{name}.
 # tbzatek - doesn't apply, is this fixed?
 # %patch1 -p1 -b .no-execmem
 %patch2 -p1 -b .nspluginwrapper
-%patch3 -p1 -b .librt
 %patch4 -p1 -b .yarr
 %patch5 -p1 -b .includes
 %patch6 -p1 -b .double2ints
 
-# For patch3
-autoreconf --verbose --install -I Source/autotools
-
 %build
 %ifarch s390 %{arm} ppc
 # Use linker flags to reduce memory consumption on low-mem architectures
@@ -132,6 +121,7 @@ mkdir -p DerivedSources/webkit
 mkdir -p DerivedSources/WebCore
 mkdir -p DerivedSources/ANGLE
 mkdir -p DerivedSources/WebKit2
+mkdir -p DerivedSources/webkitdom/
 mkdir -p DerivedSources/InjectedBundle
 
 make %{_smp_mflags} V=1
@@ -150,6 +140,9 @@ chrpath --delete %{buildroot}%{_libexecdir}/%{name}/GtkLauncher
 chrpath --delete %{buildroot}%{_libexecdir}/WebKitPluginProcess
 chrpath --delete %{buildroot}%{_libexecdir}/WebKitWebProcess
 
+# Remove .la files
+find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
+
 # for some reason translations don't get installed in 1.3.7
 %find_lang webkitgtk-3.0
 
@@ -182,13 +175,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 %files -f webkitgtk-3.0.lang
 %doc %{_docdir}/%{name}-%{version}/
-%exclude %{_libdir}/*.la
 %{_libdir}/libwebkitgtk-3.0.so.*
 %{_libdir}/libwebkit2gtk-3.0.so.*
 %{_libdir}/libjavascriptcoregtk-3.0.so.*
 %{_libdir}/girepository-1.0/WebKit-3.0.typelib
 %{_libdir}/girepository-1.0/WebKit2-3.0.typelib
 %{_libdir}/girepository-1.0/JSCore-3.0.typelib
+%{_libdir}/webkit2gtk-3.0/
 %{_libexecdir}/%{name}/
 %{_libexecdir}/WebKitPluginProcess
 %{_libexecdir}/WebKitWebProcess
@@ -215,6 +208,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 
 %changelog
+* Wed Jan 16 2013 Kalev Lember <kalevlember at gmail.com> - 1.11.4-1
+- Update to 1.11.4
+- Remove conditional pango deps; the build now uses harfbuzz directly
+- BR libwebp-devel
+- Drop upstreamed librt linking patch
+
 * Tue Dec 18 2012 Dan Horák <dan[at]danny.cz> - 1.11.2-3
 - fix 32-bit non-JIT arches
 
