CVS commit: pkgsrc/editors/vim-gtk3

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Mon Jan 14 20:20:22 UTC 2019

Modified Files:
        pkgsrc/editors/vim-gtk3: Makefile

Log Message:
vim-gtk3: Fix gtk3 build after gtk3 3.24.1 update

vim-gtk3 was affected by a problem similar to PR pkg/53688, and
the test failed to recognize gtk3 due `undefined reference to
`epoxy_has_glx'' when `checking for GTK - version >= 3.0.0' in the
configure phase because instead of linking to pkgsrc libepoxy it
linked against builtin libepoxy.  Despite that it successfully
built without gtk3 support but gvim failed at run time with
`E25: GUI cannot be used: Not enabled at compile time' error.

Sort x11 bl3 includes so instead of failing at run time it fails
at build time when linking vim.

Add a kludge to override `--x-libraries' and `--x-includes' passed
by x11.buildlink3.mk to avoid linking against builtin libepoxy and
fix gtk3 support.

Thanks to and discussed with <rhialto> and <morr>!


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/editors/vim-gtk3/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/vim-gtk3/Makefile
diff -u pkgsrc/editors/vim-gtk3/Makefile:1.12 pkgsrc/editors/vim-gtk3/Makefile:1.13
--- pkgsrc/editors/vim-gtk3/Makefile:1.12       Wed Nov 14 22:21:24 2018
+++ pkgsrc/editors/vim-gtk3/Makefile    Mon Jan 14 20:20:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/11/14 22:21:24 kleink Exp $
+# $NetBSD: Makefile,v 1.13 2019/01/14 20:20:22 leot Exp $
 
 PKGNAME=       vim-gtk3-${VIM_VERSION}.${VIM_PATCHLEVEL}
 PKGREVISION=   2
@@ -40,9 +40,16 @@ post-install:
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
+
+# XXX: `--x-libraries' and `--x-includes' are injected to CONFIGURE_ARGS via
+# XXX: mk/x11.buildlink3.mk. Override them by redefining them to NONE in order
+# XXX: to avoid picked up possible undesidered libraries similarly to
+# XXX: PR pkg/53688.
+CONFIGURE_ARGS+=       --x-libraries=NONE
+CONFIGURE_ARGS+=       --x-includes=NONE
 
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"