Author: hawk Date: Tue Dec 13 11:55:00 2011 GMT Module: packages Tag: GNOME_2 ---- Log message: - fix for building with vala 0.12.x
---- Files affected: packages/anjuta: anjuta.spec (1.188.2.6 -> 1.188.2.7) , anjuta-vala-0.12.patch (NONE -> 1.1.2.1) (NEW) ---- Diffs: ================================================================ Index: packages/anjuta/anjuta.spec diff -u packages/anjuta/anjuta.spec:1.188.2.6 packages/anjuta/anjuta.spec:1.188.2.7 --- packages/anjuta/anjuta.spec:1.188.2.6 Wed Nov 2 15:10:49 2011 +++ packages/anjuta/anjuta.spec Tue Dec 13 12:54:55 2011 @@ -5,12 +5,13 @@ Summary(pt_BR.UTF-8): Ambiente de desenvolvimento integrado C e C++ Name: anjuta Version: 2.32.1.1 -Release: 6 +Release: 7 Epoch: 1 License: GPL v2+ Group: X11/Development/Tools Source0: http://ftp.gnome.org/pub/GNOME/sources/anjuta/2.32/%{name}-%{version}.tar.bz2 # Source0-md5: 7af70f6486eda92796268fc4bf659c27 +Patch0: %{name}-vala-0.12.patch URL: http://projects.gnome.org/anjuta/ BuildRequires: GConf2-devel >= 2.26.0 BuildRequires: autoconf >= 2.59 @@ -46,7 +47,7 @@ BuildRequires: rpmbuild(macros) >= 1.311 BuildRequires: scrollkeeper BuildRequires: subversion-devel >= 1.5.0 -BuildRequires: vala >= 0.10.0 +BuildRequires: vala >= 0.12.0 BuildRequires: vte-devel >= 0.20.0 Requires(post,postun): desktop-file-utils Requires(post,postun): gtk-update-icon-cache @@ -140,6 +141,7 @@ %prep %setup -q +%patch0 -p1 %build %{__intltoolize} @@ -305,6 +307,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.188.2.7 2011/12/13 11:54:55 hawk +- fix for building with vala 0.12.x + Revision 1.188.2.6 2011/11/02 14:10:49 hawk - release 6 ================================================================ Index: packages/anjuta/anjuta-vala-0.12.patch diff -u /dev/null packages/anjuta/anjuta-vala-0.12.patch:1.1.2.1 --- /dev/null Tue Dec 13 12:55:01 2011 +++ packages/anjuta/anjuta-vala-0.12.patch Tue Dec 13 12:54:55 2011 @@ -0,0 +1,60 @@ +diff -ur anjuta-2.32.1.1.orig//configure.in anjuta-2.32.1.1/configure.in +--- anjuta-2.32.1.1.orig//configure.in 2010-12-29 17:33:54.000000000 +0000 ++++ anjuta-2.32.1.1/configure.in 2011-12-13 11:39:32.799022750 +0000 +@@ -282,7 +282,7 @@ + AC_MSG_RESULT(no) + enable_vala="yes" + PKG_CHECK_MODULES(VALA, +- [vala-0.10 >= $VALA_REQUIRED]) ++ [libvala-0.12 >= $VALA_REQUIRED]) + fi + + if test x$enable_vala = xyes; then +diff -ur anjuta-2.32.1.1.orig//plugins/language-support-vala/Makefile.am anjuta-2.32.1.1/plugins/language-support-vala/Makefile.am +--- anjuta-2.32.1.1.orig//plugins/language-support-vala/Makefile.am 2010-12-29 17:23:51.000000000 +0000 ++++ anjuta-2.32.1.1/plugins/language-support-vala/Makefile.am 2011-12-13 11:39:47.199026575 +0000 +@@ -31,7 +31,7 @@ + -DG_LOG_DOMAIN=\"language-support-vala\" \ + --no-warn + +-VALAFLAGS = --vapidir $(srcdir) --pkg vala-0.10 --pkg libanjuta-1.0 ++VALAFLAGS = --vapidir $(srcdir) --pkg libvala-0.12 --pkg libanjuta-1.0 + + # The plugin + plugindir = $(anjuta_plugin_dir) +diff -ur anjuta-2.32.1.1.orig//plugins/language-support-vala/Makefile.in anjuta-2.32.1.1/plugins/language-support-vala/Makefile.in +--- anjuta-2.32.1.1.orig//plugins/language-support-vala/Makefile.in 2011-12-13 11:38:19.000000000 +0000 ++++ anjuta-2.32.1.1/plugins/language-support-vala/Makefile.in 2011-12-13 11:39:41.288022633 +0000 +@@ -395,7 +395,7 @@ + @ENABLE_VALA_TRUE@ -DG_LOG_DOMAIN=\"language-support-vala\" \ + @ENABLE_VALA_TRUE@ --no-warn + +-@ENABLE_VALA_TRUE@VALAFLAGS = --vapidir $(srcdir) --pkg vala-0.10 --pkg libanjuta-1.0 ++@ENABLE_VALA_TRUE@VALAFLAGS = --vapidir $(srcdir) --pkg libvala-0.12 --pkg libanjuta-1.0 + + # The plugin + @ENABLE_VALA_TRUE@plugindir = $(anjuta_plugin_dir) +diff -ur anjuta-2.32.1.1.orig//plugins/symbol-db/anjuta-tags/Makefile.am anjuta-2.32.1.1/plugins/symbol-db/anjuta-tags/Makefile.am +--- anjuta-2.32.1.1.orig//plugins/symbol-db/anjuta-tags/Makefile.am 2010-12-29 17:22:49.000000000 +0000 ++++ anjuta-2.32.1.1/plugins/symbol-db/anjuta-tags/Makefile.am 2011-12-13 11:39:58.815151895 +0000 +@@ -31,7 +31,7 @@ + ${LEXER} ${LEXCCFLAGS} ${LEXFILE} + + ctags-visitor.c: ctags-visitor.vala +- $(VALAC) -g -h ctags-vala.h -C --pkg vala-0.10 $^ ++ $(VALAC) -g -h ctags-vala.h -C --pkg libvala-0.12 $^ + + anjuta_tags_SOURCES = \ + main.c \ +diff -ur anjuta-2.32.1.1.orig//plugins/symbol-db/anjuta-tags/Makefile.in anjuta-2.32.1.1/plugins/symbol-db/anjuta-tags/Makefile.in +--- anjuta-2.32.1.1.orig//plugins/symbol-db/anjuta-tags/Makefile.in 2011-12-13 11:38:27.000000000 +0000 ++++ anjuta-2.32.1.1/plugins/symbol-db/anjuta-tags/Makefile.in 2011-12-13 11:39:54.256022768 +0000 +@@ -870,7 +870,7 @@ + ${LEXER} ${LEXCCFLAGS} ${LEXFILE} + + ctags-visitor.c: ctags-visitor.vala +- $(VALAC) -g -h ctags-vala.h -C --pkg vala-0.10 $^ ++ $(VALAC) -g -h ctags-vala.h -C --pkg libvala-0.12 $^ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/anjuta/anjuta.spec?r1=1.188.2.6&r2=1.188.2.7&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
