Update to 2.0.4

This commit is contained in:
Tomas Popela 2013-07-22 09:24:26 +02:00
parent 13b4f85249
commit 4e854f7ef7
4 changed files with 7 additions and 26 deletions

1
.gitignore vendored
View File

@ -25,3 +25,4 @@ webkit-1.3.2.tar.gz
/webkitgtk-2.0.0.tar.xz
/webkitgtk-2.0.1.tar.xz
/webkitgtk-2.0.2.tar.xz
/webkitgtk-2.0.4.tar.xz

View File

@ -1 +1 @@
a4024f4b33d829ec1034179e94f9cab6 webkitgtk-2.0.2.tar.xz
413be319ba171feed9348d1bede6b0a7 webkitgtk-2.0.4.tar.xz

View File

@ -1,20 +0,0 @@
https://bugs.webkit.org/show_bug.cgi?id=116978
diff --git a/Source/autotools/FindDependencies.m4 b/Source/autotools/FindDependencies.m4
index a9067c5..aead295 100644
--- a/Source/autotools/FindDependencies.m4
+++ b/Source/autotools/FindDependencies.m4
@@ -373,6 +373,13 @@
PKG_CHECK_MODULES([FREETYPE],
[cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version])
fi
+# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library.
+# 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"
+fi
AC_SUBST([FREETYPE_CFLAGS])
AC_SUBST([FREETYPE_LIBS])

View File

@ -6,8 +6,8 @@
cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g')
Name: webkitgtk
Version: 2.0.2
Release: 2%{?dist}
Version: 2.0.4
Release: 1%{?dist}
Summary: GTK+ Web content engine library
Group: Development/Libraries
@ -25,8 +25,6 @@ Patch1: webkit-1.11.2-yarr.patch
Patch2: webkit-1.11.2-Double2Ints.patch
Patch3: webkitgtk-1.11.5-libatomic.patch
Patch4: webkit-1.11.90-double2intsPPC32.patch
# https://bugs.webkit.org/show_bug.cgi?id=116978
Patch5: webkitgtk-fix-harfbuzz-icu.patch
BuildRequires: bison
BuildRequires: chrpath
@ -101,7 +99,6 @@ This package contains developer documentation for %{name}.
%ifarch ppc s390
%patch4 -p1 -b .double2intsPPC32
%endif
%patch5 -p1 -b .harfbuzz-icu
# Needed for patch5:
autoreconf --verbose --install -I Source/autotools
@ -212,6 +209,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%changelog
* Mon Jul 22 2013 Tomas Popela <tpopela@redhat.com> - 2.0.4-1
- Update to 2.0.4
* Fri Jun 07 2013 Kalev Lember <kalevlember@gmail.com> - 2.0.2-2
- Link with harfbuzz-icu (split into separate library in harfbuzz 0.9.18)