diff options
| author | Doug Newgard | 2013-02-25 00:23:57 -0600 |
|---|---|---|
| committer | Doug Newgard | 2013-02-25 00:23:57 -0600 |
| commit | 19b8ecb18947e6755c3b03c76b03a14d6eae69e2 (patch) | |
| tree | e3ee0e3164f1251920fb196cb87962576c50ad0c | |
| parent | 1bf7e25b50fed75141c876788dd501386788b88c (diff) | |
| download | aur-19b8ecb18947e6755c3b03c76b03a14d6eae69e2.tar.gz | |
Remove Elm dep, only needed for Webkit2, and add real EFL deps; add patch to make it build against efl-git
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | ecore-headers.patch | 128 |
3 files changed, 141 insertions, 5 deletions
@@ -1,6 +1,6 @@ pkgbase = ewebkit-svn pkgdesc = WebKit ported to the Enlightenment Foundation Libraries - pkgver = 139452 + pkgver = 143884 pkgrel = 1 url = http://trac.webkit.org/wiki/EFLWebKit arch = i686 @@ -15,15 +15,19 @@ pkgbase = ewebkit-svn makedepends = ruby makedepends = gperf depends = atk - depends = elementary + depends = edje + depends = eeze + depends = efreet + depends = e_dbus depends = enchant depends = sqlite - depends = e_dbus depends = libtiff depends = gst-plugins-base-libs depends = libsoup depends = libxslt depends = libxt + source = ecore-headers.patch + md5sums = bba54046ca64ac77344e30a4add78e0d pkgname = ewebkit-svn @@ -2,15 +2,17 @@ # Contributor: twa022 <twa022 at gmail dot com> pkgname=ewebkit-svn -pkgver=139452 +pkgver=143884 pkgrel=1 pkgdesc="WebKit ported to the Enlightenment Foundation Libraries" arch=('i686' 'x86_64') url="http://trac.webkit.org/wiki/EFLWebKit" license=('LGPL2' 'LGPL2.1' 'BSD') -depends=('atk' 'elementary' 'enchant' 'sqlite' 'e_dbus' 'libtiff' +depends=('atk' 'edje' 'eeze' 'efreet' 'e_dbus' 'enchant' 'sqlite' 'libtiff' 'gst-plugins-base-libs' 'libsoup' 'libxslt' 'libxt') makedepends=('cmake' 'subversion' 'perl' 'python2' 'ruby' 'gperf') +source=("ecore-headers.patch") +md5sums=("bba54046ca64ac77344e30a4add78e0d") _svntrunk=https://svn.webkit.org/repository/webkit/trunk _svnmod=Webkit @@ -37,6 +39,8 @@ build() { svn export "$srcdir/$_svnmod" "$srcdir/$_svnmod-build" cd "$srcdir/$_svnmod-build" + patch -Np0 < ../ecore-headers.patch + cmake . -DPORT=Efl \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ -DSHARED_CORE=OFF \ diff --git a/ecore-headers.patch b/ecore-headers.patch new file mode 100644 index 000000000000..b3a9db4291c8 --- /dev/null +++ b/ecore-headers.patch @@ -0,0 +1,128 @@ +Index: Source/WTF/wtf/PlatformEfl.cmake +=================================================================== +--- Source/WTF/wtf/PlatformEfl.cmake (revision 143875) ++++ Source/WTF/wtf/PlatformEfl.cmake (working copy) +@@ -31,6 +31,7 @@ + list(APPEND WTF_INCLUDE_DIRECTORIES + ${ECORE_INCLUDE_DIRS} + ${ECORE_EVAS_INCLUDE_DIRS} ++ ${ECORE_IMF_INCLUDE_DIRS} + ${EINA_INCLUDE_DIRS} + ${EO_INCLUDE_DIRS} + ${EVAS_INCLUDE_DIRS} +Index: Source/WebKit/PlatformEfl.cmake +=================================================================== +--- Source/WebKit/PlatformEfl.cmake (revision 143875) ++++ Source/WebKit/PlatformEfl.cmake (working copy) +@@ -14,6 +14,7 @@ + ${ECORE_EVAS_INCLUDE_DIRS} + ${ECORE_INCLUDE_DIRS} + ${ECORE_INPUT_INCLUDE_DIRS} ++ ${ECORE_X_INCLUDE_DIRS} + ${EDJE_INCLUDE_DIRS} + ${EFREET_INCLUDE_DIRS} + ${EINA_INCLUDE_DIRS} +Index: Source/cmake/FindEcore.cmake +=================================================================== +--- Source/cmake/FindEcore.cmake (revision 143875) ++++ Source/cmake/FindEcore.cmake (working copy) +@@ -47,36 +47,69 @@ + ) + + # Components. +-FIND_EFL_LIBRARY(ECORE_EVAS +- HEADERS Ecore_Evas.h +- HEADER_PREFIXES ecore-1 +- LIBRARY ecore_evas +-) +-FIND_EFL_LIBRARY(ECORE_FILE +- HEADERS Ecore_File.h +- HEADER_PREFIXES ecore-1 +- LIBRARY ecore_file +-) +-FIND_EFL_LIBRARY(ECORE_INPUT +- HEADERS Ecore_Input.h +- HEADER_PREFIXES ecore-1 +- LIBRARY ecore_input +-) +-FIND_EFL_LIBRARY(ECORE_X +- HEADERS Ecore_X.h +- HEADER_PREFIXES ecore-1 +- LIBRARY ecore_x +-) +-FIND_EFL_LIBRARY(ECORE_IMF +- HEADERS Ecore_IMF.h +- HEADER_PREFIXES ecore-1 +- LIBRARY ecore_imf +-) +-FIND_EFL_LIBRARY(ECORE_IMF_EVAS +- HEADERS Ecore_IMF_Evas.h +- HEADER_PREFIXES ecore-1 +- LIBRARY ecore_imf_evas +-) ++if (${EVAS_VERSION} VERSION_EQUAL 1.8) ++ FIND_EFL_LIBRARY(ECORE_EVAS ++ HEADERS Ecore_Evas.h ++ HEADER_PREFIXES ecore-evas-1 ++ LIBRARY ecore_evas ++ ) ++ FIND_EFL_LIBRARY(ECORE_FILE ++ HEADERS Ecore_File.h ++ HEADER_PREFIXES ecore-file-1 ++ LIBRARY ecore_file ++ ) ++ FIND_EFL_LIBRARY(ECORE_INPUT ++ HEADERS Ecore_Input.h ++ HEADER_PREFIXES ecore-input-1 ++ LIBRARY ecore_input ++ ) ++ FIND_EFL_LIBRARY(ECORE_X ++ HEADERS Ecore_X.h ++ HEADER_PREFIXES ecore-x-1 ++ LIBRARY ecore_x ++ ) ++ FIND_EFL_LIBRARY(ECORE_IMF ++ HEADERS Ecore_IMF.h ++ HEADER_PREFIXES ecore-imf-1 ++ LIBRARY ecore_imf ++ ) ++ FIND_EFL_LIBRARY(ECORE_IMF_EVAS ++ HEADERS Ecore_IMF_Evas.h ++ HEADER_PREFIXES ecore-imf-evas-1 ++ LIBRARY ecore_imf_evas ++ ) ++else () ++ FIND_EFL_LIBRARY(ECORE_EVAS ++ HEADERS Ecore_Evas.h ++ HEADER_PREFIXES ecore-1 ++ LIBRARY ecore_evas ++ ) ++ FIND_EFL_LIBRARY(ECORE_FILE ++ HEADERS Ecore_File.h ++ HEADER_PREFIXES ecore-1 ++ LIBRARY ecore_file ++ ) ++ FIND_EFL_LIBRARY(ECORE_INPUT ++ HEADERS Ecore_Input.h ++ HEADER_PREFIXES ecore-1 ++ LIBRARY ecore_input ++ ) ++ FIND_EFL_LIBRARY(ECORE_X ++ HEADERS Ecore_X.h ++ HEADER_PREFIXES ecore-1 ++ LIBRARY ecore_x ++ ) ++ FIND_EFL_LIBRARY(ECORE_IMF ++ HEADERS Ecore_IMF.h ++ HEADER_PREFIXES ecore-1 ++ LIBRARY ecore_imf ++ ) ++ FIND_EFL_LIBRARY(ECORE_IMF_EVAS ++ HEADERS Ecore_IMF_Evas.h ++ HEADER_PREFIXES ecore-1 ++ LIBRARY ecore_imf_evas ++ ) ++endif () + + foreach (_component ${Ecore_FIND_COMPONENTS}) + set(_ecore_component "ECORE_${_component}") |