commit 295377d60ef05f10e5845a2f0ae6ef38759c22e5
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Mon Jul 22 18:28:26 2013 +0200
- added harfbuzz-icu patch (fixes build with harfbuzz icu API in separate
library)
- release .2
ewebkit-harfbuzz-icu.patch | 36 ++++++++++++++++++++++++++++++++++++
ewebkit.spec | 4 +++-
2 files changed, 39 insertions(+), 1 deletion(-)
---
diff --git a/ewebkit.spec b/ewebkit.spec
index 2806328..64982ba 100644
--- a/ewebkit.spec
+++ b/ewebkit.spec
@@ -3,12 +3,13 @@ Summary(pl.UTF-8): WebKit-EFL - silnik WWW dla aplikacji
EFL
Name: ewebkit
Version: 0
%define subver r127150
-Release: 0.%{subver}.1
+Release: 0.%{subver}.2
License: BSD
Group: Libraries
Source0:
http://packages.profusion.mobi/webkit-efl/webkit-efl-svn-%{subver}.tar.bz2
# Source0-md5: 54332bd571a23d44e32837f4fa3a1c76
Patch0: %{name}-lib.patch
+Patch1: %{name}-harfbuzz-icu.patch
URL: http://trac.enlightenment.org/e/wiki/EWebKit
BuildRequires: bison
BuildRequires: cairo-devel >= 1.10
@@ -91,6 +92,7 @@ Pliki nagłówkowe biblioteki WebKit-EFL.
%prep
%setup -q -n webkit-efl-svn-%{subver}
%patch0 -p1
+%patch1 -p1
%build
# replace -g2 with -g1 to not run into 4 GB ar format limit
diff --git a/ewebkit-harfbuzz-icu.patch b/ewebkit-harfbuzz-icu.patch
new file mode 100644
index 0000000..a5a8914
--- /dev/null
+++ b/ewebkit-harfbuzz-icu.patch
@@ -0,0 +1,36 @@
+--- webkit-efl-svn-r127150/Source/cmake/FindHarfBuzz.cmake.orig
2012-08-30 20:44:46.000000000 +0200
++++ webkit-efl-svn-r127150/Source/cmake/FindHarfBuzz.cmake 2013-07-21
15:10:41.231121247 +0200
+@@ -33,14 +33,20 @@
+ INCLUDE(FindPkgConfig)
+
+ PKG_CHECK_MODULES(PC_HARFBUZZ harfbuzz>=0.9.0)
++PKG_CHECK_MODULES(PC_HARFBUZZ_ICU harfbuzz-icu)
+
+ FIND_PATH(HARFBUZZ_INCLUDE_DIRS NAMES hb.h
+ HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
+ )
+
+-FIND_LIBRARY(HARFBUZZ_LIBRARIES NAMES harfbuzz
++FIND_LIBRARY(HARFBUZZ_LIBRARY NAMES harfbuzz
+ HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
+ )
+
++FIND_LIBRARY(HARFBUZZ_ICU_LIBRARY NAMES harfbuzz-icu
++ HINTS ${PC_HARFBUZZ_ICU_LIBRARY_DIRS} ${PC_HARFBUZZ_ICU_LIBDIR}
++)
++SET(HARFBUZZ_LIBRARIES "${HARFBUZZ_ICU_LIBRARY} ${HARFBUZZ_LIBRARY}")
++
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIRS
HARFBUZZ_LIBRARIES)
+--- webkit-efl-svn-r127150/Source/WebCore/PlatformEfl.cmake.orig
2012-08-30 20:44:46.000000000 +0200
++++ webkit-efl-svn-r127150/Source/WebCore/PlatformEfl.cmake 2013-07-21
21:19:51.196858362 +0200
+@@ -167,7 +167,8 @@
+ platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp
+ )
+ LIST(APPEND WebCore_LIBRARIES
+- ${HARFBUZZ_LIBRARIES}
++ ${HARFBUZZ_ICU_LIBRARY}
++ ${HARFBUZZ_LIBRARY}
+ )
+ ENDIF ()
+ ENDIF ()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ewebkit.git/commitdiff/295377d60ef05f10e5845a2f0ae6ef38759c22e5
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
