smooth: more fixes

3 files changed, 5 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 584c178d90cf..f29c88e1c9f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,14 +6,13 @@ pkgbase = smooth
 	arch = i686
 	arch = x86_64
 	license = Artistic2.0
+	depends = curl
+	depends = fribidi
 	depends = gtk3
 	depends = libjpeg-turbo
 	depends = libxml2
-	depends = curl
 	source = smooth-0.9.1.tar.gz::https://github.com/enzo1982/smooth/archive/v0.9.1.tar.gz
-	source = glib2-include.patch
 	sha512sums = 9cab9d4a06eae37cb3024feb3fee73ae2de47723c03a5d0b9d75afda379049c16ee572ebfe024cfd73cf16942829c9731cc56568cfe84f1d222f6d016e999f8b
-	sha512sums = 5eea3bf95f84ff99bc35af54699f3dc00ff20eb7253a49f5b59fa12e60ee12e269715c54a6f99c380a17cf813d0b08738ce0ecb21c95d33f57e2ca8f56ea0bf1
 
 pkgname = smooth
 
diff --git a/PKGBUILD b/PKGBUILD
index 2a12b4ae482f..883f87a6a59a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,14 +8,12 @@ pkgdesc="An object oriented C++ class library for Windows, OS X, Linux and most
 arch=('i686' 'x86_64')
 url="http://www.smooth-project.org/"
 license=('Artistic2.0')
-depends=('gtk3' 'libjpeg-turbo' 'libxml2' 'curl')
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/enzo1982/smooth/archive/v${pkgver}.tar.gz" "glib2-include.patch")
-sha512sums=('9cab9d4a06eae37cb3024feb3fee73ae2de47723c03a5d0b9d75afda379049c16ee572ebfe024cfd73cf16942829c9731cc56568cfe84f1d222f6d016e999f8b'
-            '5eea3bf95f84ff99bc35af54699f3dc00ff20eb7253a49f5b59fa12e60ee12e269715c54a6f99c380a17cf813d0b08738ce0ecb21c95d33f57e2ca8f56ea0bf1')
+depends=('curl' 'fribidi' 'gtk3' 'libjpeg-turbo' 'libxml2')
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/enzo1982/smooth/archive/v${pkgver}.tar.gz")
+sha512sums=('9cab9d4a06eae37cb3024feb3fee73ae2de47723c03a5d0b9d75afda379049c16ee572ebfe024cfd73cf16942829c9731cc56568cfe84f1d222f6d016e999f8b')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver/_/-}"
-  patch -Np1 -i "${srcdir}/glib2-include.patch"
   find . -type f -exec sed -i 's!/usr/local!/usr!g' {} \;
 }
 
diff --git a/glib2-include.patch b/glib2-include.patch
deleted file mode 100644
index 29d01737c057..000000000000
--- a/glib2-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/classes/gui/widgets/special/Makefile b/classes/gui/widgets/special/Makefile
-index 8229c17..5349e0c 100644
---- a/classes/gui/widgets/special/Makefile
-+++ b/classes/gui/widgets/special/Makefile
-@@ -8,6 +8,8 @@ include $(dir $(firstword $(MAKEFILE_LIST)))/$(SMOOTH_PATH)/Makefile-options
- # Change these variables to fit your project:
- ifeq ($(USE_BUNDLED_LIBFRIBIDI),True)
- 	MYCCOPTS += -I$(SRCDIR)/$(SMOOTH_PATH)/include/support
-+else
-+	MYCCOPTS += -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
- endif
- 
- # Enter object files here: