[arch-commits] Commit in anjuta/trunk (PKGBUILD fix-compile-error.patch)

[Jan Steffens]

    Date: Sunday, March 31, 2013 @ 14:08:27
  Author: heftig
Revision: 181093

3.8.0

Added:
  anjuta/trunk/fix-compile-error.patch
Modified:
  anjuta/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   31 ++++++++++++++++++++-----------
 fix-compile-error.patch |   24 ++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-31 11:18:53 UTC (rev 181092)
+++ PKGBUILD	2013-03-31 12:08:27 UTC (rev 181093)
@@ -4,27 +4,36 @@
 
 pkgbase=anjuta
 pkgname=('libanjuta' 'anjuta')
-pkgver=3.6.2
-pkgrel=2
+pkgver=3.8.0
+pkgrel=1
 pkgdesc="GNOME Integrated Development Environment (IDE)"
-arch=('i686' 'x86_64')
-license=('GPL')
-makedepends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf' 'gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool')
+arch=(i686 x86_64)
+license=(GPL)
+makedepends=(gdl vte3 autogen devhelp glade libgda subversion gnome-icon-theme vala dconf
+             gtk-doc yelp-tools gnome-common intltool gobject-introspection itstool gjs)
 url="http://www.anjuta.org/"
-source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('2cf44120dcf22c4f4f25bbc65d3641c206e627776ab0f3a37ff0059844d581a2')
+source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
+        fix-compile-error.patch)
+sha256sums=('c95caac9ad56a26457b76c49ec27b38e67de05df5f6656e0fbdac0508d59f117'
+            'd072af4c1c52ce65f84026b83baa642a9bcfa06b10913b356b5cd99d98931b1d')
 
 build() {
   cd "$pkgbase-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
+
+  patch -Np1 -i ../fix-compile-error.patch
+
+  # Bump vala version
+  sed -i '/vala/s/-0\.18/-0.20/' configure.ac
+
+  PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --enable-glade-catalog
   make
 }
 
 package_libanjuta(){
   pkgdesc="Anjuta runtime library"
-  depends=('gdl')
+  depends=(gdl)
   conflicts=('anjuta<3.4.4')
 
   cd "$pkgbase-$pkgver/libanjuta"
@@ -35,7 +44,7 @@
 
 package_anjuta(){
   pkgdesc="GNOME Integrated Development Environment (IDE)"
-  depends=('libanjuta' 'vte3' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf')
+  depends=(libanjuta vte3 autogen devhelp glade libgda subversion gnome-icon-theme vala dconf)
 
   install=anjuta.install
 

Added: fix-compile-error.patch
===================================================================
--- fix-compile-error.patch	                        (rev 0)
+++ fix-compile-error.patch	2013-03-31 12:08:27 UTC (rev 181093)
@@ -0,0 +1,24 @@
+diff -u -r anjuta-3.8.0/libanjuta/anjuta-token.c anjuta-3.8.0-fix/libanjuta/anjuta-token.c
+--- anjuta-3.8.0/libanjuta/anjuta-token.c	2013-01-14 22:45:09.000000000 +0100
++++ anjuta-3.8.0-fix/libanjuta/anjuta-token.c	2013-03-31 13:56:11.722332230 +0200
+@@ -329,7 +329,7 @@
+ 	if (string == NULL)
+ 	{
+ 		/* Value doesn't contain a newline */
+-		fprintf (stderr, "(%lu)", length);
++		fprintf (stderr, "(%lu)", (long unsigned)length);
+ 	}
+ 	else
+ 	{
+diff -u -r anjuta-3.8.0/plugins/dir-project/dir-project.c anjuta-3.8.0-fix/plugins/dir-project/dir-project.c
+--- anjuta-3.8.0/plugins/dir-project/dir-project.c	2012-11-19 00:34:57.000000000 +0100
++++ anjuta-3.8.0-fix/plugins/dir-project/dir-project.c	2013-03-31 13:55:35.922610895 +0200
+@@ -268,7 +268,7 @@
+ 			{
+ 				ptr++;
+ 			} while  (*ptr == '?');
+-			g_string_append_printf (regex, "(.{%d})", ptr - next);
++			g_string_append_printf (regex, "(.{%ld})", (long)(ptr - next));
+ 		}
+ 		else if (*ptr == '\\')
+ 		{