Hello community,
here is the log from the commit of package gnome-code-assistance for
openSUSE:Factory checked in at 2017-03-22 23:00:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-code-assistance (Old)
and /work/SRC/openSUSE:Factory/.gnome-code-assistance.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-code-assistance"
Wed Mar 22 23:00:17 2017 rev:14 rq:467538 version:3.16.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-code-assistance/gnome-code-assistance.changes
2016-09-23 11:33:57.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-code-assistance.new/gnome-code-assistance.changes
2017-03-22 23:00:20.224329302 +0100
@@ -1,0 +2,11 @@
+Fri Mar 3 08:49:29 UTC 2017 - [email protected]
+
+- Add 0001-Add-libvala-0.36-support.patch and
+ 0003-Fix-compilation-with-vala-0.36.patch: Fix build with
+ vala 0.36, patches taken from git.
+- Add libtool Buildrequires and call to autoreconf, as above patch
+ touches the build system.
+- Replace pkgconfig(libvala-0.34) BuildRequires with libvala-devel:
+ we do not want to change the version every 6 months any longer.
+
+-------------------------------------------------------------------
New:
----
0001-Add-libvala-0.36-support.patch
0003-Fix-compilation-with-vala-0.36.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-code-assistance.spec ++++++
--- /var/tmp/diff_new_pack.zHbQjQ/_old 2017-03-22 23:00:21.952084386 +0100
+++ /var/tmp/diff_new_pack.zHbQjQ/_new 2017-03-22 23:00:21.956083819 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gnome-code-assistance
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2013 Dominique Leuenberger, Amsterdam, The Netherlands.
#
# All modifications and additions to the file contributed by third parties
@@ -25,7 +25,12 @@
Group: Development/
Url: https://git.gnome.org/browse/gnome-code-assistance
Source:
http://download.gnome.org/sources/gnome-code-assistance/3.16/%{name}-%{version}.tar.xz
-# Generic build dependencies
+# PATCH-FIX-UPSTREAM 0001-Add-libvala-0.36-support.patch [email protected]
-- Add vala-0.36 support
+Patch0: 0001-Add-libvala-0.36-support.patch
+# PATCH-FIX-UPSTREAM 0003-Fix-compilation-with-vala-0.36.patch
[email protected] -- Fix build with vala 0.36
+Patch1: 0003-Fix-compilation-with-vala-0.36.patch
+# Generic build dependenciesa
+BuildRequires: libtool
BuildRequires: pkgconfig(gio-2.0)
# Python backend
BuildRequires: dbus-1-python3
@@ -41,11 +46,11 @@
# GJS Backend
BuildRequires: gjs
# Vala backend
+BuildRequires: libvala-devel
BuildRequires: pkgconfig(gee-0.8)
BuildRequires: pkgconfig(gio-2.0) >= 2.36
BuildRequires: pkgconfig(glib-2.0) >= 2.36
BuildRequires: pkgconfig(gobject-2.0) >= 2.36
-BuildRequires: pkgconfig(libvala-0.34)
BuildRequires: pkgconfig(vapigen)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%glib2_gsettings_schema_requires
@@ -58,8 +63,11 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
%build
+autoreconf -fiv
%configure \
%ifnarch ppc
--enable-c \
++++++ 0001-Add-libvala-0.36-support.patch ++++++
>From b6097f3007fe29545d44ef4def120261b36fdac9 Mon Sep 17 00:00:00 2001
From: Jesse van den Kieboom <[email protected]>
Date: Sat, 5 Nov 2016 13:33:16 +0100
Subject: [PATCH 1/3] Add libvala-0.36 support
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 40b7c96..008c2ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -410,7 +410,7 @@ AC_ARG_ENABLE([vala],
[enable_vala=$enableval],
[enable_vala=auto])
-BACKEND_VALA_LIBVALA_VERSIONS="libvala-0.34 libvala-0.32 libvala-0.30
libvala-0.28 libvala-0.26 libvala-0.24 libvala-0.22 libvala-0.20"
+BACKEND_VALA_LIBVALA_VERSIONS="libvala-0.36 libvala-0.34 libvala-0.32
libvala-0.30 libvala-0.28 libvala-0.26 libvala-0.24 libvala-0.22 libvala-0.20"
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=
--
2.11.1
++++++ 0003-Fix-compilation-with-vala-0.36.patch ++++++
>From 508e157a08eda979683d130bd779792ee4d90d58 Mon Sep 17 00:00:00 2001
From: Jesse van den Kieboom <[email protected]>
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)
