From a044aa40fa3fbeca07cca82708ee827d6f4d82e0 Mon Sep 17 00:00:00 2001
From: Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>
Date: Sep 16 2016 14:38:50 +0000
Subject: Fix Vim build when GTK {headers,libraries} are installed on the build host.


---

diff --git a/build.vars b/build.vars
index 5170b68..b50cdf6 100644
--- a/build.vars
+++ b/build.vars
@@ -556,6 +556,7 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_VIM_URL:=https://github.com/vim/vim/archive/v${PKG_VIM_VERSION}.tar.gz};
 : ${PKG_VIM_SUBDIR:=vim-${PKG_VIM_VERSION}};
 : ${PKG_VIM_BUILD_DIR:=${PKG_VIM_SUBDIR}};
+: ${PKG_VIM_ENV_VARS_EXTRA:=PKG_CONFIG=${PREFIX}/bin/${TARGET}-pkg-config};
 : ${PKG_VIM_CONFIG_CACHE_EXTRA:=${PKG_VIM_BUILD_DIR}/src/auto};
 : ${PKG_VIM_CONFIGURE_ARGS_EXTRA:=--with-tlib=ncursesw};
 : ${PKG_VIM_INSTALL_FILES:=@vim=bin/vi};
diff --git a/config.cache b/config.cache
index 932044a..2910ce7 100644
--- a/config.cache
+++ b/config.cache
@@ -151,6 +151,7 @@ ac_cv_func_realloc_0_nonnull=yes
 
 # vim
 ac_cv_small_wchar_t=no
+ac_x_header_dirs=${PKG_PREFIX}/include
 vim_cv_bcopy_handles_overlap=yes
 vim_cv_getcwd_broken=no
 vim_cv_memcpy_handles_overlap=no
diff --git a/vim-7.4.1952.local.patch b/vim-7.4.1952.local.patch
index 0709751..d6ea7b2 100644
--- a/vim-7.4.1952.local.patch
+++ b/vim-7.4.1952.local.patch
@@ -18,3 +18,30 @@
  
  auto/pathdef.c: Makefile auto/config.mk
  	-@echo creating $@
+--- vim-7.4.1952/src/auto/configure.orig	2016-06-21 23:42:20.000000000 +0200
++++ vim-7.4.1952/src/auto/configure	2016-09-16 16:37:28.147266000 +0200
+@@ -2603,7 +2603,7 @@
+ ## -------------------- ##
+ 
+ ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
++ac_cpp='$CPP $CFLAGS $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -7607,6 +7607,7 @@
+ 
+ # Standard set of common directories for X headers.
+ # Check X11 before X11Rn because it is often a symlink to the current release.
++if test -z "$ac_x_header_dirs"; then
+ ac_x_header_dirs='
+ /usr/X11/include
+ /usr/X11R7/include
+@@ -7645,6 +7646,7 @@
+ 
+ /usr/openwin/include
+ /usr/openwin/share/include'
++fi
+ 
+ if test "$ac_x_includes" = no; then
+   # Guess where to find include files, by looking for Xlib.h.