rpms/webkitgtk
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Link with harfbuzz-icu

Browse Source 
harfbuzz-icu was split into separate library in harfbuzz 0.9.18 and F19
is getting the new HB now.

https://bugzilla.redhat.com/show_bug.cgi?id=971795
This commit is contained in:
Kalev Lember 2013-06-07 15:47:17 +02:00
parent 96c5ba1e3c
commit 06b189be2e
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
webkitgtk-fix-harfbuzz-icu.patch Normal file
View File

@ -0,0 +1,20 @@
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])

14
webkitgtk.spec
View File

@ -7,7 +7,7 @@
Name: webkitgtk
Version: 2.0.2
Release: 1%{?dist}
Release: 2%{?dist}
Summary: GTK+ Web content engine library
Group: Development/Libraries
@ -25,6 +25,8 @@ 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
@ -56,6 +58,9 @@ BuildRequires: cairo-gobject-devel
BuildRequires: fontconfig-devel >= 2.5
BuildRequires: freetype-devel
# Needed for patch5:
BuildRequires: autoconf automake libtool
%ifarch ppc
BuildRequires: libatomic
%endif
@ -96,6 +101,10 @@ 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
%build
%ifarch s390 %{arm} ppc
@ -203,6 +212,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%changelog
* 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)
* Mon May 13 2013 Tomas Popela <tpopela@redhat.com> - 2.0.2-1
- Update to 2.0.2