From 524f30c6031490a38a5da5111d55f74f9fe9f854 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Kie=C5=9B?= Date: Sat, 30 Mar 2013 22:04:33 +0100 Subject: [PATCH] - updated to 3.8.0 - added patch to build with Vala 0.20 --- anjuta.spec | 11 ++++++----- autoconf-cxx.patch | 25 ------------------------- vala-0.20.patch | 23 +++++++++++++++++++++++ 3 files changed, 29 insertions(+), 30 deletions(-) delete mode 100644 autoconf-cxx.patch create mode 100644 vala-0.20.patch diff --git a/anjuta.spec b/anjuta.spec index e8eeced..764d68f 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -3,20 +3,20 @@ Summary(es.UTF-8): Entorno integrado de desarrollo (IDE) de GNOME Summary(pl.UTF-8): Zintegrowane środowisko programowania dla GNOME Summary(pt_BR.UTF-8): Ambiente de desenvolvimento integrado C e C++ Name: anjuta -Version: 3.6.2 +Version: 3.8.0 Release: 1 Epoch: 1 License: GPL v2+ Group: X11/Development/Tools -Source0: http://ftp.gnome.org/pub/GNOME/sources/anjuta/3.6/%{name}-%{version}.tar.xz -# Source0-md5: 3cd2e771df0768af6274a0334fb24502 -Patch0: autoconf-cxx.patch +Source0: http://ftp.gnome.org/pub/GNOME/sources/anjuta/3.8/%{name}-%{version}.tar.xz +# Source0-md5: aa3d0db7163be147edebf64609eacaa7 +Patch0: vala-0.20.patch URL: http://projects.gnome.org/anjuta/ BuildRequires: autoconf >= 2.65 BuildRequires: autogen BuildRequires: automake >= 1:1.10 BuildRequires: bison -BuildRequires: devhelp-devel >= 3.4.2 +BuildRequires: devhelp-devel >= 3.7.4 BuildRequires: docbook-dtd412-xml BuildRequires: flex BuildRequires: gdl-devel >= 3.6.0 @@ -152,6 +152,7 @@ Dokumentacja API biblioteki libanjuta. --with-html-dir=%{_gtkdocdir} \ --disable-schemas-compile \ --disable-silent-rules \ + --enable-glade-catalog \ --disable-static %{__make} diff --git a/autoconf-cxx.patch b/autoconf-cxx.patch deleted file mode 100644 index 748ea18..0000000 --- a/autoconf-cxx.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -uNr anjuta-3.6.0/configure.ac anjuta-3.6.0.new/configure.ac ---- anjuta-3.6.0/configure.ac 2012-09-26 23:16:42.000000000 +0200 -+++ anjuta-3.6.0.new/configure.ac 2012-10-02 10:46:43.690159033 +0200 -@@ -66,6 +66,9 @@ - - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -+dnl Check C++ compiler before C compiler -+AC_PROG_CXX -+ - dnl Check for C Compiler - AC_PROG_CC - AC_PROG_CPP -@@ -79,11 +82,6 @@ - fi - AC_LANG([C]) - AC_LANG([C++]) --AC_PROG_CXX --if test "x$ac_ct_CXX" = "x" --then -- AC_MSG_ERROR([C++ Compiler required to compile Anjuta]) --fi - AM_PROG_CC_C_O - - GNOME_COMPILE_WARNINGS([maximum]) diff --git a/vala-0.20.patch b/vala-0.20.patch new file mode 100644 index 0000000..8e66c81 --- /dev/null +++ b/vala-0.20.patch @@ -0,0 +1,23 @@ +diff -uNr anjuta-3.8.0.old/configure.ac anjuta-3.8.0/configure.ac +--- anjuta-3.8.0.old/configure.ac 2013-03-25 05:32:20.000000000 +0100 ++++ anjuta-3.8.0/configure.ac 2013-03-30 21:56:06.603174301 +0100 +@@ -285,11 +285,14 @@ + else + AC_MSG_RESULT(no) + AC_MSG_CHECKING(if libvala is available) +- PKG_CHECK_EXISTS([ libvala-0.18 ], +- [ valaver="-0.18" ], +- [ PKG_CHECK_EXISTS([ libvala-0.16 ], +- [ valaver="-0.16" ], +- [ valaver="" ]) ++ PKG_CHECK_EXISTS([ libvala-0.20 ], ++ [ valaver="-0.20" ], ++ [ PKG_CHECK_EXISTS([ libvala-0.18 ], ++ [ valaver="-0.18" ], ++ [ PKG_CHECK_EXISTS([ libvala-0.16 ], ++ [ valaver="-0.16" ], ++ [ valaver="" ]) ++ ]) + ]) + if test "x$valaver" != "x"; then + AC_MSG_RESULT(yes) -- 2.44.0