File 0003-Fix-compilation-with-vala-0.36.patch of Package gnome-code-assistance

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-Fix-compilation-with-vala-0.36.patch of Package gnome-code-assistance (Revision eabe1e254e60fa17623621933eca1aed)

Currently displaying revision eabe1e254e60fa17623621933eca1aed , Show latest

From 508e157a08eda979683d130bd779792ee4d90d58 Mon Sep 17 00:00:00 2001
From: Jesse van den Kieboom <jessevdk@gnome.org>
Date: Sun, 6 Nov 2016 01:27:49 -0800
Subject: [PATCH 3/3] Fix compilation with vala 0.36

https://bugzilla.gnome.org/show_bug.cgi?id=772861
---
 backends/vala/Makefile.am           |  4 ++++
 backends/vala/valaoptionparser.vala |  4 ++++
 configure.ac                        | 25 +++++++++++++++++++++----
 3 files changed, 29 insertions(+), 4 deletions(-)

Index: gnome-code-assistance-3.16.1/backends/vala/Makefile.am
===================================================================
--- gnome-code-assistance-3.16.1.orig/backends/vala/Makefile.am
+++ gnome-code-assistance-3.16.1/backends/vala/Makefile.am
@@ -34,6 +34,10 @@ if ENABLE_DEBUG
 backends_vala_common_valaflags += --debug -X -O0
 endif
 
+if BACKENDS_VALA_ENABLE_VALA_CODE_CONTEXT_SET_THREAD
+backends_vala_common_valaflags += -D ENABLE_VALA_CODE_CONTEXT_SET_THREAD
+endif
+
 backends_vala_libvalashared_la_VALAFLAGS =	\
 	$(backends_vala_common_valaflags)	\
 	--library libvalashared			\
Index: gnome-code-assistance-3.16.1/backends/vala/valaoptionparser.vala
===================================================================
--- gnome-code-assistance-3.16.1.orig/backends/vala/valaoptionparser.vala
+++ gnome-code-assistance-3.16.1/backends/vala/valaoptionparser.vala
@@ -184,7 +184,11 @@ class OptionParser {
 		context.gir_directories = realpaths(wd, gir_directories);
 		context.metadata_directories = realpaths(wd, metadata_directories);
 		context.debug = debug;
+
+#if ENABLE_VALA_CODE_CONTEXT_SET_THREAD
 		context.thread = thread;
+#endif
+
 		context.mem_profiler = mem_profiler;
 		context.save_temps = save_temps;
 		if (profile == "gobject-2.0" || profile == "gobject" || profile == null) {
Index: gnome-code-assistance-3.16.1/configure.ac
===================================================================
--- gnome-code-assistance-3.16.1.orig/configure.ac
+++ gnome-code-assistance-3.16.1/configure.ac
@@ -414,6 +414,7 @@ BACKEND_VALA_LIBVALA_VERSIONS="libvala-0
 BACKEND_VALA_MODULES="gobject-2.0 >= 2.36 glib-2.0 >= 2.36 gio-2.0 >= 2.36 gee-0.8 gio-unix-2.0 >= 2.36"
 
 BACKEND_VALA_LIBVALA=
+
 for i in $BACKEND_VALA_LIBVALA_VERSIONS; do
 	if test "x$BACKEND_VALA_LIBVALA" = "x"; then
 		BACKEND_VALA_LIBVALA="$i"
@@ -428,10 +429,6 @@ for i in $BACKEND_VALA_LIBVALA_VERSIONS;
 	fi
 done
 
-if test "x$libvala_found" != "xyes"; then
-	BACKEND_VALA_MODULES="$BACKEND_VALA_MODULES $BACKEND_VALA_LIBVALA"
-fi
-
 AC_SUBST(BACKEND_VALA_LIBVALA)
 
 if test "x$enable_vala" != "xno"; then
@@ -467,9 +464,29 @@ if test "x$enable_vala" != "xno"; then
 	fi
 fi
 
+# Check for deprecated threading support
+AS_IF([test x$enable_vala = xyes],[
+	cflags_save="${CFLAGS}"
+	libs_save="${LIBS}"
+	CFLAGS="${CFLAGS} ${BACKEND_VALA_CFLAGS}"
+	LIBS="${LIBS} ${BACKEND_VALA_LIBS}"
+
+	AC_MSG_CHECKING([if vala CodeContext supports thread property])
+
+	AC_TRY_LINK([#include <vala.h>],[
+		vala_code_context_set_thread (NULL, TRUE);
+	], [have_vala_code_context_set_thread=yes], [have_vala_code_context_set_thread=no])
+
+	CFLAGS="${cflags_save}"
+	LIBS="${libs_save}"
+])
+AC_MSG_RESULT([$have_vala_code_context_set_thread])
+
 color_enable_var("$enable_vala", [enable_vala_msg])
 
 AM_CONDITIONAL(BACKENDS_VALA_ENABLE, test "x$enable_vala" = "xyes")
+AM_CONDITIONAL(BACKENDS_VALA_ENABLE_VALA_CODE_CONTEXT_SET_THREAD, test x$have_vala_code_context_set_thread = xyes)
+
 AC_SUBST(BACKEND_VALA_LIBVALA)

Places

File 0003-Fix-compilation-with-vala-0.36.patch of Package gnome-code-assistance (Revision eabe1e254e60fa17623621933eca1aed)

Places