- updated to 2.0.4

- removed obsolete sh patch
- really use ld.gold

diff --git a/gtk-webkit-sh.patch b/gtk-webkit-sh.patch
deleted file mode 100644 (file)
index 0e3f5a8..0000000
--- a/gtk-webkit-sh.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- webkitgtk-2.0.3/Source/autotools/FindDependencies.m4.orig  2013-06-11 11:31:36.000000000 +0200
-+++ webkitgtk-2.0.3/Source/autotools/FindDependencies.m4       2013-06-24 17:49:33.605399898 +0200
-@@ -377,8 +377,8 @@
- # Since we support earlier HarfBuzz versions we keep this conditional for now.
- if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
-     PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version)
--    FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"
--    FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"
-+    FREETYPE_CFLAGS="$FREETYPE_CFLAGS $HARFBUZZ_ICU_CFLAGS"
-+    FREETYPE_LIBS="$FREETYPE_LIBS $HARFBUZZ_ICU_LIBS"
- fi
- AC_SUBST([FREETYPE_CFLAGS])
- AC_SUBST([FREETYPE_LIBS])
-@@ -450,18 +450,18 @@
- 
- if test "$with_acceleration_backend" = "opengl"; then
-     if test "$enable_gles2" = "yes"; then
--        acceleration_backend_description+= "(gles2"
-+        acceleration_backend_description="$acceleration_backend_description(gles2"
-         OPENGL_LIBS="-lGLESv2"
-     else
--        acceleration_backend_description+="(gl"
-+        acceleration_backend_description="$acceleration_backend_description(gl"
-         OPENGL_LIBS="-lGL"
-     fi
-     if test "$enable_egl" = "yes"; then
--        acceleration_backend_description+=", egl"
--        OPENGL_LIBS+=" -lEGL"
-+        acceleration_backend_description="$acceleration_backend_description, egl"
-+        OPENGL_LIBS="$OPENGL_LIBS -lEGL"
-     fi
-     if test "$enable_glx" = "yes"; then
--        acceleration_backend_description+=", glx"
-+        acceleration_backend_description="$acceleration_backend_description, glx"
-     fi
- 
-     # Check whether dlopen() is in the core libc like on FreeBSD, or in a separate
-@@ -469,8 +469,8 @@
-     AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
-     AC_SUBST([DLOPEN_LIBS])
- 
--    OPENGL_LIBS+=" $DLOPEN_LIBS"
--    acceleration_backend_description+=")"
-+    OPENGL_LIBS="$OPENGL_LIBS $DLOPEN_LIBS"
-+    acceleration_backend_description="$acceleration_backend_description)"
- fi
- AC_SUBST([OPENGL_LIBS])
- 

diff --git a/gtk-webkit.spec b/gtk-webkit.spec
index 44d1a173f81c7af8ba7d0a920657a1359c8476d9..d56822dd71d457821ff143b94a7c6aee1e88a766 100644 (file)
--- a/gtk-webkit.spec
+++ b/gtk-webkit.spec
@@ -5,15 +5,14 @@
 Summary:       Port of WebKit embeddable web component to GTK+
 Summary(pl.UTF-8):     Port osadzalnego komponentu WWW WebKit do GTK+
 Name:          gtk-webkit
-Version:       2.0.3
-Release:       3
+Version:       2.0.4
+Release:       1
 License:       BSD-like
 Group:         X11/Libraries
 Source0:       http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
-# Source0-md5: 9eca9eec4595b66b72a1ac7ceaef08ba
+# Source0-md5: 413be319ba171feed9348d1bede6b0a7
 Patch0:                %{name}-sync-builtins.patch
-Patch1:                %{name}-sh.patch
-Patch2:                %{name}-pl.po.patch
+Patch1:                %{name}-pl.po.patch
 URL:           http://webkitgtk.org/
 BuildRequires: EGL-devel
 BuildRequires: OpenGL-GLX-devel
@@ -45,7 +44,8 @@ BuildRequires:        libpng-devel
 BuildRequires: libsecret-devel
 BuildRequires: libsoup-devel >= 2.42.0
 BuildRequires: libstdc++-devel
-BuildRequires: libtool >= 2:1.5
+# libtool with -fuse-ld= gcc option support
+BuildRequires: libtool >= 2:2.4.2-13
 BuildRequires: libwebp-devel
 BuildRequires: libxml2-devel >= 1:2.6.30
 BuildRequires: libxslt-devel >= 1.1.7
@@ -64,6 +64,7 @@ BuildRequires:        xorg-lib-libXrender-devel
 BuildRequires: xorg-lib-libXt-devel
 BuildRequires: xz
 BuildRequires: zlib-devel
+BuildRequires: /usr/bin/ld.gold
 Requires:      cairo >= 1.10
 Requires:      enchant >= 0.22
 Requires:      fontconfig-libs >= 2.5.0
@@ -106,7 +107,6 @@ Pliki programistyczne komponentu WebKit dla GTK+ 2.
 %setup -q -n webkitgtk-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -115,6 +115,7 @@ Pliki programistyczne komponentu WebKit dla GTK+ 2.
 %{__autoheader}
 %{__automake}
 %configure \
+       LDFLAGS="%{rpmldflags} -fuse-ld=gold" \
        --disable-gtk-doc \
        --disable-silent-rules \
        --disable-webkit2 \
@@ -123,8 +124,7 @@ Pliki programistyczne komponentu WebKit dla GTK+ 2.
        %{__enable_disable introspection} \
        --enable-webgl \
        --with-gtk=2.0 \
-       --with-html-dir=%{_gtkdocdir} \
-       DFLAGS="%{rpmldflags} -fuse-ld=gold"
+       --with-html-dir=%{_gtkdocdir}
 
 %{__make} -j1