Bump to 1.11.0alpha1

3 files changed, 63 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab4f790c4d25..9f8eb3fcb418 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ewebkit
 	pkgdesc = WebKit ported to the Enlightenment Foundation Libraries
-	pkgver = 164189
+	pkgver = 1.11.0alpha1
 	pkgrel = 1
 	url = http://trac.webkit.org/wiki/EFLWebKit
 	arch = i686
@@ -15,17 +15,16 @@ pkgbase = ewebkit
 	makedepends = gperf
 	depends = atk
 	depends = cairo
-	depends = efl
-	depends = e_dbus
+	depends = elementary
 	depends = enchant
-	depends = libtiff
-	depends = gst-plugins-base-libs
+	depends = harfbuzz-icu
 	depends = libsoup
 	depends = libxslt
 	depends = libxt
-	depends = harfbuzz-icu
-	source = http://download.enlightenment.org/rel/libs/webkit-efl/webkit-efl-164189.tar.xz
-	sha1sums = 1a90bd20d9b38b86566349163a72ffbd869dd1c2
+	source = http://download.enlightenment.org/rel/libs/webkit-efl/ewebkit-1.11.0-alpha1.tar.xz
+	source = 3e431a5bdd20c264a4636ddaa6b4d5a331020695.patch
+	sha256sums = 3392b1d2e8b9acd9e0461f8235c22fde42420ae4e6c964aa7ec33695d3ceb10c
+	sha256sums = 2e1f0b7e9cd322a32c6d4464263f0ad2fd485871ba5417c41e53503edb60b4dd
 
 pkgname = ewebkit
 
diff --git a/3e431a5bdd20c264a4636ddaa6b4d5a331020695.patch b/3e431a5bdd20c264a4636ddaa6b4d5a331020695.patch
new file mode 100644
index 000000000000..6be4e417e1c2
--- /dev/null
+++ b/3e431a5bdd20c264a4636ddaa6b4d5a331020695.patch
@@ -0,0 +1,36 @@
+From 3e431a5bdd20c264a4636ddaa6b4d5a331020695 Mon Sep 17 00:00:00 2001
+From: Ryuan Choi <ryuan.choi@samsung.com>
+Date: Wed, 6 Aug 2014 09:00:13 +0900
+Subject: [PATCH] build fix attempt with Gstreamer 1.4
+
+@hotfix
+
+r167025 exposed MPEG-TS metadata but looks missing includes on PlatformEfl.cmake
+---
+ Source/WebCore/PlatformEfl.cmake | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/Source/WebCore/PlatformEfl.cmake b/Source/WebCore/PlatformEfl.cmake
+index 424f576..41ffc15 100644
+--- a/Source/WebCore/PlatformEfl.cmake
++++ b/Source/WebCore/PlatformEfl.cmake
+@@ -322,6 +322,16 @@ if (ENABLE_VIDEO)
+         ${GSTREAMER_TAG_LIBRARIES}
+         ${GSTREAMER_VIDEO_LIBRARIES}
+     )
++
++    if (USE_GSTREAMER_MPEGTS)
++        list(APPEND WebCore_INCLUDE_DIRECTORIES
++            ${GSTREAMER_MPEGTS_INCLUDE_DIRS}
++        )
++
++        list(APPEND WebCore_LIBRARIES
++            ${GSTREAMER_MPEGTS_LIBRARIES}
++        )
++    endif ()
+ endif ()
+ 
+ if (WTF_USE_3D_GRAPHICS)
+-- 
+2.0.3
+
diff --git a/PKGBUILD b/PKGBUILD
index 0756d1cd86d3..e713cb1c94bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,46 @@
-# Maintainer: Doug Newgard <scimmia22 at outlook dot com>
+# Maintainer: Doug Newgard <scimmia at archlinux dot info>
 # Contributor: twa022 <twa022 at gmail dot com>
 
 pkgname=ewebkit
-pkgver=164189
+pkgver=1.11.0alpha1
 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' 'cairo' 'efl' 'e_dbus' 'enchant' 'libtiff'
-         'gst-plugins-base-libs' 'libsoup' 'libxslt' 'libxt' 'harfbuzz-icu')
+depends=('atk' 'cairo' 'elementary' 'enchant' 'harfbuzz-icu' 'libsoup' 'libxslt' 'libxt')
 makedepends=('cmake' 'perl' 'python2' 'ruby' 'gperf')
-source=("http://download.enlightenment.org/rel/libs/webkit-efl/webkit-efl-$pkgver.tar.xz")
-sha1sums=('1a90bd20d9b38b86566349163a72ffbd869dd1c2')
+source=("http://download.enlightenment.org/rel/libs/webkit-efl/$pkgname-1.11.0-alpha1.tar.xz"
+        '3e431a5bdd20c264a4636ddaa6b4d5a331020695.patch')
+sha256sums=('3392b1d2e8b9acd9e0461f8235c22fde42420ae4e6c964aa7ec33695d3ceb10c'
+            '2e1f0b7e9cd322a32c6d4464263f0ad2fd485871ba5417c41e53503edb60b4dd')
+
+prepare() {
+  cd "$srcdir/$pkgname"
+
+  patch -Np1 < ../3e431a5bdd20c264a4636ddaa6b4d5a331020695.patch
+}
 
 build() {
-  cd "$srcdir/efl-webkit"
+  cd "$srcdir/$pkgname"
 
 # build with glib 2.38/libsoup 2.44
   export CFLAGS="$CFLAGS -Wno-deprecated-declarations"
   export CXXFLAGS="$CXXFLAGS -Wno-deprecated-declarations"
 
   cmake . \
-    -DPORT=Efl \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DSHARED_CORE=ON \
-    -DENABLE_WEBKIT=ON \
-    -DENABLE_WEBKIT2=ON \
-    -DENABLE_TOOLS=OFF
+    -DCMAKE_INSTALL_PREFIX=/usr
 
   make
 }
 
-package() {
-  cd "$srcdir/efl-webkit"
+package_ewebkit() {
+  cd "$srcdir/$pkgname"
 
   make DESTDIR="$pkgdir" install
+  install -m755 bin/MiniBrowser "$pkgdir/usr/bin/MiniBrowser-ewk"
 
 # install license files
-  install -Dm644 Source/WebCore/LICENSE-APPLE "$pkgdir/usr/share/licenses/$pkgname/LICENSE-APPLE"
-  install -Dm644 Source/WebCore/LICENSE-LGPL-2 "$pkgdir/usr/share/licenses/$pkgname/LICENSE-LGPL-2"
+  install -d "$pkgdir/usr/share/licenses/$pkgname/"
+  install -m644 -t "$pkgdir/usr/share/licenses/$pkgname/" Source/WebCore/LICENSE-{APPLE,LGPL-2}
 }