pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/editors/vim-gtk3 vim-gtk3: Fix gtk3 build after gtk3 3...

branches:  trunk
changeset: 317712:7941b0d6d927
user:      leot <>
date:      Mon Jan 14 20:20:22 2019 +0000

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 to avoid linking against builtin libepoxy and
fix gtk3 support.

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


 editors/vim-gtk3/Makefile |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 2a70014fb703 -r 7941b0d6d927 editors/vim-gtk3/Makefile
--- a/editors/vim-gtk3/Makefile Mon Jan 14 17:22:18 2019 +0000
+++ b/editors/vim-gtk3/Makefile Mon Jan 14 20:20:22 2019 +0000
@@ -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 $
@@ -40,9 +40,16 @@
 .include "../../converters/libiconv/"
 .include "../../devel/gettext-lib/"
+.include "../../x11/gtk3/"
 .include "../../x11/libXpm/"
 .include "../../x11/libXt/"
-.include "../../x11/gtk3/"
+# XXX: `--x-libraries' and `--x-includes' are injected to CONFIGURE_ARGS via
+# XXX: 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/"
 .include "../../mk/"

Home | Main Index | Thread Index | Old Index