avoid configures broken check for freetype

3 files changed, 28 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e95d9dda9235..aff7d9c0f01f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Sat May  5 19:36:28 UTC 2018
 pkgbase = xfe
 	pkgdesc = X File Explorer (Xfe) is an MS-Explorer like file manager for X.
 	pkgver = 1.42
-	pkgrel = 2
+	pkgrel = 3
 	url = http://roland65.free.fr/xfe
 	arch = x86_64
 	license = GPL
@@ -10,7 +12,9 @@ pkgbase = xfe
 	depends = fox<1:1.7
 	depends = freetype2
 	source = https://downloads.sourceforge.net/sourceforge/xfe/xfe-1.42.tar.gz
+	source = no_freetype_check.patch
 	sha256sums = a1e3e892584988c80b3a492f7b3cb78e1ee84d7148e6d1fc9d6054bbd8063bec
+	sha256sums = 8a7acd26ae612ea02aa00c6cb12763e04b3c17e9c8782d64b76930718a19c92b
 
 pkgname = xfe
 
diff --git a/PKGBUILD b/PKGBUILD
index 8cbc82e5e927..abb1010e8c22 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,23 +5,26 @@
 
 pkgname=xfe
 pkgver=1.42
-pkgrel=2
+pkgrel=3
 pkgdesc="X File Explorer (Xfe) is an MS-Explorer like file manager for X."
 arch=('x86_64')
 url="http://roland65.free.fr/xfe"
-license=("GPL")
+license=('GPL')
 depends=('fox>=1:1.6' 'fox<1:1.7' 'freetype2')
 makedepends=('intltool')
-source=(https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('a1e3e892584988c80b3a492f7b3cb78e1ee84d7148e6d1fc9d6054bbd8063bec')
+source=(https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz no_freetype_check.patch)
+sha256sums=('a1e3e892584988c80b3a492f7b3cb78e1ee84d7148e6d1fc9d6054bbd8063bec'
+            '8a7acd26ae612ea02aa00c6cb12763e04b3c17e9c8782d64b76930718a19c92b')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 < "$srcdir"/no_freetype_check.patch 
+}
 
 build() {
   cd $pkgname-$pkgver
-  export CFLAGS="$CFLAGS `pkg-config --cflags freetype2`"
-  aclocal
-  automake --add-missing
-  autoreconf
-  ./configure --prefix=/usr
+  ./autogen.sh 
+  ./configure --prefix=/usr 
   make
 }
 
diff --git a/no_freetype_check.patch b/no_freetype_check.patch
new file mode 100644
index 000000000000..a914a1101acf
--- /dev/null
+++ b/no_freetype_check.patch
@@ -0,0 +1,11 @@
+diff -Naur xfe-1.42.orig/configure.ac xfe-1.42.new/configure.ac
+--- xfe-1.42.orig/configure.ac	2015-12-15 16:32:15.000000000 +0100
++++ xfe-1.42.new/configure.ac	2018-05-05 21:31:55.226454446 +0200
+@@ -118,7 +118,6 @@
+ 	  LIBS="$LIBS $freetype_libs"
+ 	  CPPFLAGS="$freetype_cflags $CPPFLAGS"
+ 	fi
+-	AC_CHECK_HEADER(config/ftheader.h,,[AC_CHECK_HEADER(freetype/config/ftheader.h,,AC_MSG_ERROR("ftheader.h not found"))])
+ 
+ 	# Check for Xft headers
+ 	xft_config=''