Remove harfbuzz-icu patch, was fixed upstream

3 files changed, 8 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e2f759586ee..0f2e18acf2e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ewebkit-svn
 	pkgdesc = WebKit ported to the Enlightenment Foundation Libraries
-	pkgver = 154268
+	pkgver = 159930
 	pkgrel = 1
 	url = http://trac.webkit.org/wiki/EFLWebKit
 	arch = i686
@@ -27,8 +27,6 @@ pkgbase = ewebkit-svn
 	depends = libxslt
 	depends = libxt
 	depends = harfbuzz-icu
-	source = harfbuzz-icu.patch
-	sha256sums = 95f61c07e2548ff7b3799c8812a3eb922658a3969144cca701f6f89d9e5c6a34
 
 pkgname = ewebkit-svn
 
diff --git a/PKGBUILD b/PKGBUILD
index ecc297bbc97c..1f5742e52400 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=ewebkit-svn
 _pkgname=${pkgname%-*}
-pkgver=154268
+pkgver=159930
 pkgrel=1
 pkgdesc="WebKit ported to the Enlightenment Foundation Libraries"
 arch=('i686' 'x86_64')
@@ -13,11 +13,9 @@ license=('LGPL2' 'LGPL2.1' 'BSD')
 depends=('atk' 'cairo' 'edje' 'eeze' 'efreet' 'e_dbus' 'enchant' 'libtiff'
          'gst-plugins-base-libs' 'libsoup' 'libxslt' 'libxt' 'harfbuzz-icu')
 makedepends=('cmake' 'subversion' 'perl' 'python2' 'ruby' 'gperf')
-source=("harfbuzz-icu.patch")
-sha256sums=('95f61c07e2548ff7b3799c8812a3eb922658a3969144cca701f6f89d9e5c6a34')
 if [[ -d "$SRCDEST/$_pkgname/.svn" ]]; then
-  source+=("$_pkgname::svn+$_svnurl")
-  sha256sums+=('SKIP')
+  source=("$_pkgname::svn+$_svnurl")
+  sha256sums=('SKIP')
 fi
 
 pkgver() {
@@ -43,14 +41,15 @@ prepare() {
     rm -rf "$srcdir/$_pkgname"
     cp -a "$SRCDEST/$_pkgname" "$srcdir/$_pkgname"
   fi
-
-  cd "$srcdir/$_pkgname"
-  patch -Np0 < ../harfbuzz-icu.patch
 }
 
 build() {
   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 \
diff --git a/harfbuzz-icu.patch b/harfbuzz-icu.patch
deleted file mode 100644
index a15364f127d8..000000000000
--- a/harfbuzz-icu.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: Source/WebCore/PlatformEfl.cmake
-===================================================================
---- Source/WebCore/PlatformEfl.cmake	(revision 154249)
-+++ Source/WebCore/PlatformEfl.cmake	(working copy)
-@@ -217,6 +217,7 @@
-     ${LIBSOUP_LIBRARIES}
-     ${ZLIB_LIBRARIES}
-     ${HARFBUZZ_LIBRARIES}
-+    ${HARFBUZZ_ICU_LIBRARIES}
- )
- 
- list(APPEND WebCore_INCLUDE_DIRECTORIES
-Index: Source/WebKit2/PlatformEfl.cmake
-===================================================================
---- Source/WebKit2/PlatformEfl.cmake	(revision 154249)
-+++ Source/WebKit2/PlatformEfl.cmake	(working copy)
-@@ -237,6 +237,7 @@
-     ${EVAS_LIBRARIES}
-     ${Freetype_LIBRARIES}
-     ${HARFBUZZ_LIBRARIES}
-+    ${HARFBUZZ_ICU_LIBRARIES}
-     ${LIBXML2_LIBRARIES}
-     ${OPENGL_LIBRARIES}
-     ${SQLITE_LIBRARIES}
-Index: Source/cmake/FindHarfBuzz.cmake
-===================================================================
---- Source/cmake/FindHarfBuzz.cmake	(revision 154249)
-+++ Source/cmake/FindHarfBuzz.cmake	(working copy)
-@@ -33,6 +33,7 @@
- include(FindPkgConfig)
- 
- pkg_check_modules(PC_HARFBUZZ harfbuzz>=0.9.7)
-+pkg_check_modules(PC_HARFBUZZ_ICU harfbuzz-icu)
- 
- find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h
-     HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
-@@ -42,5 +43,9 @@
-     HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
- )
- 
-+find_library(HARFBUZZ_ICU_LIBRARIES NAMES harfbuzz-icu
-+    HINTS ${PC_HARFBUZZ_ICU_LIBRARY_DIRS} ${PC_HARFBUZZ_ICU_LIBDIR}
-+)
-+
- include(FindPackageHandleStandardArgs)
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIRS HARFBUZZ_LIBRARIES)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIRS HARFBUZZ_LIBRARIES HARFBUZZ_ICU_LIBRARIES)