Accepting request 100183 from home:dimstar:branches:GNOME:Factory

Build with vala 0.15/0.16

OBS-URL: https://build.opensuse.org/request/show/100183
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=116

anjuta-vala-0_16.patch

@@ -0,0 +1,18 @@
+diff -ur anjuta-3.3.3/configure.ac anjuta-3.3.3.patched/configure.ac
+--- anjuta-3.3.3/configure.ac	2011-11-21 19:45:44.000000000 +0100
++++ anjuta-3.3.3.patched/configure.ac	2012-01-13 12:20:09.376074138 +0100
+@@ -263,12 +263,12 @@
+ 	AC_MSG_RESULT(no)
+ 	enable_vala="yes"
+ 	PKG_CHECK_MODULES(VALA,
+-		[libvala-0.14 >= $VALA_REQUIRED],LIBVALA="libvala-0.14")
++		[libvala-0.16 >= $VALA_REQUIRED],LIBVALA="libvala-0.16")
+ 	AC_SUBST(LIBVALA)
+ fi
+ 
+ if test x$enable_vala = xyes; then
+-	AC_PATH_PROGS(VALAC, [valac-0.14 valac], valac)
++	AC_PATH_PROGS(VALAC, [valac-0.16 valac], valac)
+ 	AC_SUBST(VALAC)
+ fi
+ 

anjuta.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Jan 13 13:56:58 UTC 2012 - dimstar@opensuse.org
+
+- Replace pkgconfig(libvala-0.14) BuildRequires with
+  pkgconfig(libvala-0.16) in order to build against vala 0.15/0.16.
+- Add anjuta-vala-0_16.patch: Fix build with libvala-0.16
+- Add gnome-common BuildRequires and call to autogen.sh, as the
+  above patch touches the build system.
+- Delete .c files that are auto-generated from .vala files to
+  ensure they are generated with the right vala compiler.
+- Add vala BuildRequires: as we drop the shipped generated .c
+  files, we need to rebuild them during our build.
+
 -------------------------------------------------------------------
 Tue Dec 20 23:11:52 UTC 2011 - vuntz@opensuse.org
 

anjuta.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package anjuta
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 Name:           anjuta
 Version:        3.3.3
 Release:        0
@@ -25,12 +24,16 @@ Group:          Development/Tools/IDE
 Url:            http://anjuta.sourceforge.net/
 Source:         http://download.gnome.org/sources/anjuta/3.3/%{name}-%{version}.tar.xz
 Source99:       %{name}-rpmlintrc
+# PATCH-FIX-UPSTREAM anjuta-vala-0_16.patch bgo#667851 dimstar@opensuse.org -- Detect vala 0.15/0.16.
+Patch0:         anjuta-vala-0_16.patch
 BuildRequires:  autogen
 BuildRequires:  binutils-devel
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  gcc-c++
+# Needed bt patch0
+BuildRequires:  gnome-common
 BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gnome-icon-theme
 BuildRequires:  gobject-introspection-devel
@@ -44,6 +47,8 @@ BuildRequires:  sqlite3-devel
 BuildRequires:  subversion-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
+# Needed because we drop some generated .c files in order to support vala 0.15/0.16.
+BuildRequires:  vala
 %ifnarch ia64 s390 s390x
 BuildRequires:  valgrind-devel
 %endif
@@ -59,7 +64,7 @@ BuildRequires:  pkgconfig(libdevhelp-3.0)
 BuildRequires:  pkgconfig(libgda-5.0) >= 4.99.0
 BuildRequires:  pkgconfig(libgraph)
 BuildRequires:  pkgconfig(libgvc)
-BuildRequires:  pkgconfig(libvala-0.14) >= 0.13.3
+BuildRequires:  pkgconfig(libvala-0.16)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(neon)
 BuildRequires:  pkgconfig(vte-2.90)
@@ -152,9 +157,15 @@ and more.
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
+# Remove 'pre-built' .c files built with 'older' vala versions
+rm plugins/language-support-vala/{locator,plugin,provider,report}.c
+rm plugins/symbol-db/anjuta-tags/ctags-visitor.c
 translation-update-upstream
 
 %build
+# Needed by patch0
+./autogen.sh
 %configure\
         --disable-static \
         --disable-scrollkeeper