[packages/gtk-webkit3] - updated to 2.0.3 - updated sh patch
qboosh
qboosh at pld-linux.org
Wed Jun 26 15:28:43 CEST 2013
commit 333087b6047d1341d9350f0361e8d531d3f54cba
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Jun 26 15:28:25 2013 +0200
- updated to 2.0.3
- updated sh patch
gtk-webkit3-sh.patch | 19 +++++++++++++++----
gtk-webkit3.spec | 11 ++++++-----
2 files changed, 21 insertions(+), 9 deletions(-)
---
diff --git a/gtk-webkit3.spec b/gtk-webkit3.spec
index 0b7c926..860f357 100644
--- a/gtk-webkit3.spec
+++ b/gtk-webkit3.spec
@@ -7,12 +7,12 @@
Summary: Port of WebKit embeddable web component to GTK+ 3
Summary(pl.UTF-8): Port osadzalnego komponentu WWW WebKit do GTK+ 3
Name: gtk-webkit3
-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: sync-builtins.patch
Patch1: %{name}-sh.patch
Patch2: gtk-webkit-pl.po.patch
@@ -42,6 +42,7 @@ BuildRequires: gtk+2-devel >= 2:2.24.10
BuildRequires: gtk+3-devel >= 3.6.0
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
@@ -58,7 +59,7 @@ BuildRequires: pkgconfig
BuildRequires: python
BuildRequires: rpmbuild(macros) >= 1.592
BuildRequires: ruby
-BuildRequires: sqlite3-devel >= 3.0
+BuildRequires: sqlite3-devel >= 3
BuildRequires: tar >= 1:1.22
BuildRequires: udev-glib-devel
BuildRequires: xorg-lib-libXcomposite-devel
@@ -127,9 +128,9 @@ Dokumentacja API WebKita.
%build
%{__libtoolize}
%{__aclocal} -I Source/autotools
+%{__autoconf}
%{__autoheader}
%{__automake}
-%{__autoconf}
%configure \
--disable-gtk-doc \
--disable-silent-rules \
diff --git a/gtk-webkit3-sh.patch b/gtk-webkit3-sh.patch
index 3f3d90e..0e3f5a8 100644
--- a/gtk-webkit3-sh.patch
+++ b/gtk-webkit3-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-webkit3.git/commitdiff/333087b6047d1341d9350f0361e8d531d3f54cba
More information about the pld-cvs-commit
mailing list