diff --git a/.gitignore b/.gitignore index d1a3648..e1b9d00 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/sources b/sources index 6a46942..cd5ab26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4024f4b33d829ec1034179e94f9cab6 webkitgtk-2.0.2.tar.xz +413be319ba171feed9348d1bede6b0a7 webkitgtk-2.0.4.tar.xz diff --git a/webkitgtk-fix-harfbuzz-icu.patch b/webkitgtk-fix-harfbuzz-icu.patch deleted file mode 100644 index 4fc359c..0000000 --- a/webkitgtk-fix-harfbuzz-icu.patch +++ /dev/null @@ -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]) - diff --git a/webkitgtk.spec b/webkitgtk.spec index e4f6bf4..081e97c 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -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 - 2.0.4-1 +- Update to 2.0.4 + * Fri Jun 07 2013 Kalev Lember - 2.0.2-2 - Link with harfbuzz-icu (split into separate library in harfbuzz 0.9.18)