[packages/gtk-webkit] - updated to 2.0.3 - updated sh patch
qboosh
qboosh at pld-linux.org
Tue Jun 25 17:25:49 CEST 2013
commit b3f15db7318a00e594048b434bdc359ee2a4fcf3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Jun 25 17:25:29 2013 +0200
- updated to 2.0.3
- updated sh patch
gtk-webkit-sh.patch | 19 +++++++++++++++----
gtk-webkit.spec | 7 ++++---
2 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/gtk-webkit.spec b/gtk-webkit.spec
index d19963b..8b2bffb 100644
--- a/gtk-webkit.spec
+++ b/gtk-webkit.spec
@@ -5,12 +5,12 @@
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.1
-Release: 2
+Version: 2.0.3
+Release: 1
License: BSD-like
Group: X11/Libraries
Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
-# Source0-md5: 69c2037b6d2644d789d34940eac9c993
+# Source0-md5: 9eca9eec4595b66b72a1ac7ceaef08ba
Patch0: %{name}-sync-builtins.patch
Patch1: %{name}-sh.patch
Patch2: %{name}-pl.po.patch
@@ -38,6 +38,7 @@ BuildRequires: gstreamer-plugins-base-devel >= 1.0.3
BuildRequires: gtk+2-devel >= 2:2.24.10
BuildRequires: gtk-doc >= 1.10
BuildRequires: harfbuzz-devel >= 0.9.7
+BuildRequires: harfbuzz-icu-devel >= 0.9.7
BuildRequires: libicu-devel >= 4.2.1
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
diff --git a/gtk-webkit-sh.patch b/gtk-webkit-sh.patch
index 3f3d90e..0e3f5a8 100644
--- a/gtk-webkit-sh.patch
+++ b/gtk-webkit-sh.patch
@@ -1,6 +1,17 @@
---- webkitgtk-2.0.0/Source/autotools/FindDependencies.m4.orig 2013-03-26 19:25:38.000000000 +0100
-+++ webkitgtk-2.0.0/Source/autotools/FindDependencies.m4 2013-04-01 21:33:59.797598840 +0200
-@@ -441,18 +441,18 @@
+--- 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
@@ -24,7 +35,7 @@
fi
# Check whether dlopen() is in the core libc like on FreeBSD, or in a separate
-@@ -460,8 +460,8 @@
+@@ -469,8 +469,8 @@
AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
AC_SUBST([DLOPEN_LIBS])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit.git/commitdiff/b3f15db7318a00e594048b434bdc359ee2a4fcf3
More information about the pld-cvs-commit
mailing list