From fab5d4a268838c79290bde2f6dcf2a682a37035a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 15 Sep 2016 09:19:56 +0000 Subject: [PATCH] Accepting request 427892 from GNOME:Next - Build with vala 0.34: + Replace pkgconfig(libvala-0.32) BuildRequires with pkgconfig(libvala-0.34). + Add anjuta-vala-0.34.patch: add support for vala 0.34. + Add gnome-common BuildRequires and call to autogen.sh: above patch touches the build system. OBS-URL: https://build.opensuse.org/request/show/427892 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=192 --- anjuta-vala-0.34.patch | 13 +++++++++++++ anjuta.changes | 10 ++++++++++ anjuta.spec | 7 ++++++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 anjuta-vala-0.34.patch diff --git a/anjuta-vala-0.34.patch b/anjuta-vala-0.34.patch new file mode 100644 index 0000000..1943dec --- /dev/null +++ b/anjuta-vala-0.34.patch @@ -0,0 +1,13 @@ +Index: anjuta-3.20.0/configure.ac +=================================================================== +--- anjuta-3.20.0.orig/configure.ac ++++ anjuta-3.20.0/configure.ac +@@ -329,7 +329,7 @@ if test "$user_disabled_vala" = 1; then + else + AC_MSG_RESULT(no) + AC_MSG_CHECKING(if libvala is available) +- m4_foreach([VERSION], [[0.18], [0.20], [0.22], [0.24], [0.26], [0.28], [0.30], [0.32]], ++ m4_foreach([VERSION], [[0.18], [0.20], [0.22], [0.24], [0.26], [0.28], [0.30], [0.32], [0.34]], + [PKG_CHECK_EXISTS([ libvala-VERSION ], + [ valaver="-VERSION" ]) + ]) diff --git a/anjuta.changes b/anjuta.changes index 1b3f17f..87230fc 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 15 08:39:40 UTC 2016 - dimstar@opensuse.org + +- Build with vala 0.34: + + Replace pkgconfig(libvala-0.32) BuildRequires with + pkgconfig(libvala-0.34). + + Add anjuta-vala-0.34.patch: add support for vala 0.34. + + Add gnome-common BuildRequires and call to autogen.sh: above + patch touches the build system. + ------------------------------------------------------------------- Mon Mar 21 08:35:34 UTC 2016 - dimstar@opensuse.org diff --git a/anjuta.spec b/anjuta.spec index 1a99db8..e8f28f3 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -25,12 +25,15 @@ Group: Development/Tools/IDE Url: https://wiki.gnome.org/Apps/Anjuta Source0: http://download.gnome.org/sources/anjuta/3.20/%{name}-%{version}.tar.xz Source99: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM anjuta-vala-0.34.patch dimstar@opensuse.org -- Enable building with vala 0.34 +Patch0: anjuta-vala-0.34.patch BuildRequires: autogen BuildRequires: binutils-devel BuildRequires: bison BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ +BuildRequires: gnome-common BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: libapr-util1-devel @@ -56,7 +59,7 @@ BuildRequires: pkgconfig(gtksourceview-3.0) >= 3.0.0 BuildRequires: pkgconfig(libdevhelp-3.0) >= 3.7.5 BuildRequires: pkgconfig(libgda-5.0) >= 5.0.0 BuildRequires: pkgconfig(libgvc) -BuildRequires: pkgconfig(libvala-0.32) +BuildRequires: pkgconfig(libvala-0.34) BuildRequires: pkgconfig(libxml-2.0) >= 2.4.23 BuildRequires: pkgconfig(serf-1) BuildRequires: pkgconfig(vte-2.91) @@ -149,9 +152,11 @@ and more. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build +NOCONFIGURE=1 ./autogen.sh %configure\ --disable-static \ --enable-glade-catalog