Tue Apr 23 01:16:16 PDT 2013

3 files changed, 150 insertions, 15 deletions

diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index b84a86c2c..e9e5fadfb 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,30 +1,42 @@
-# $Id: PKGBUILD 180677 2013-03-25 19:13:50Z bpiotrowski $
+# $Id: PKGBUILD 183314 2013-04-21 22:06:32Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgbase=anjuta
 pkgname=('libanjuta' 'anjuta')
-pkgver=3.6.2
-pkgrel=2
+pkgver=3.8.1
+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
+             python)
 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 anjuta-glade.xml.diff)
+sha256sums=('ef5d8a5032d4c2025e1870bef044fa025f01096a86f8f226eb178688a960c5b9'
+            'd072af4c1c52ce65f84026b83baa642a9bcfa06b10913b356b5cd99d98931b1d'
+            'e480c41a92198c9158f7d66f248b83464e6d0745d5756dae581b204d5439cc4d')
 
 build() {
   cd "$pkgbase-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
+
+  patch -Np1 -i ../fix-compile-error.patch
+  patch -Np1 -i ../anjuta-glade.xml.diff
+
+  # Bump vala version
+  sed -i '/vala/s/-0\.18/-0.20/' configure.ac
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --enable-glade-catalog --enable-compile-warnings=minimum
   make
 }
 
 package_libanjuta(){
   pkgdesc="Anjuta runtime library"
-  depends=('gdl')
+  depends=(gdl)
   conflicts=('anjuta<3.4.4')
 
   cd "$pkgbase-$pkgver/libanjuta"
@@ -35,7 +47,8 @@ package_libanjuta(){
 
 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)
+  groups=('gnome-extra')
 
   install=anjuta.install
 
@@ -44,7 +57,4 @@ package_anjuta(){
 
   cd libanjuta
   make -j1 DESTDIR="$pkgdir" uninstall
-  
-  sed -i "1s|#!/usr/bin/python$|&2|" \
-    $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py
 }
diff --git a/extra/anjuta/anjuta-glade.xml.diff b/extra/anjuta/anjuta-glade.xml.diff
new file mode 100644
index 000000000..a33c530e5
--- /dev/null
+++ b/extra/anjuta/anjuta-glade.xml.diff
@@ -0,0 +1,101 @@
+diff -u -rN anjuta-3.8.1/libanjuta/anjuta-glade.xml anjuta-3.8.0/libanjuta/anjuta-glade.xml
+--- anjuta-3.8.1/libanjuta/anjuta-glade.xml	1970-01-01 01:00:00.000000000 +0100
++++ anjuta-3.8.0/libanjuta/anjuta-glade.xml	2012-09-26 22:53:46.000000000 +0200
+@@ -0,0 +1,97 @@
++<?xml version="1.0" encoding="UTF-8"?>
++
++<glade-catalog name="anjuta" supports="gtkbuilder" 
++ library="gladeanjuta" depends="gtk+">
++
++	<glade-widget-classes>
++		<glade-widget-class name="AnjutaVcsStatusTreeView" title="Status Tree View" 
++		 generic-name="vcsstatus">
++
++			<properties>
++				<property id="show-status" default="True" />
++				<property id="conflicted-selectable" default="True" />
++				<property id="status-codes" ignore="True">
++					<displayable-values>
++						<value id="ANJUTA_VCS_STATUS_MODIFIED" name="Modified" />
++						<value id="ANJUTA_VCS_STATUS_ADDED" name="Added" />
++						<value id="ANJUTA_VCS_STATUS_DELETED" name="Deleted" />
++						<value id="ANJUTA_VCS_STATUS_CONFLICTED" name="Conflicted" />
++						<value id="ANJUTA_VCS_STATUS_UPTODATE" name="Up to date" />
++						<value id="ANJUTA_VCS_STATUS_LOCKED" name="Locked" />
++						<value id="ANJUTA_VCS_STATUS_MISSING" name="Missing" />
++						<value id="ANJUTA_VCS_STATUS_UNVERSIONED" name="Unversioned" />
++						<value id="ANJUTA_VCS_STATUS_IGNORED" name="Ignored" />
++					</displayable-values>
++				</property>
++			</properties>
++		</glade-widget-class>
++
++		<glade-widget-class name="AnjutaDropEntry" title="Drop Entry"
++		 generic-name="dropentry" />
++
++		 <glade-widget-class name="AnjutaFileList" title="File List"
++		 generic-name="filelist">
++		 
++		 	<properties>
++		 		<property id="show-add-button" default="False" />
++		 	</properties>
++		 </glade-widget-class>
++		 
++	     <glade-widget-class name="AnjutaPkgConfigChooser" title="pkg-config chooser" 
++		 generic-name="pkg_config_chooser" />
++
++		<glade-widget-class name="AnjutaColumnTextView" title="Column Text View"
++		 generic-name="columntextview" />
++
++		 <glade-widget-class name="AnjutaFileDropEntry" title="File Drop Entry"
++		 generic-name="filedropentry" />
++		 
++		 <glade-widget-class name="AnjutaEntry" title="Entry" 
++		 generic-name="entry">
++		 	
++		 	<properties>
++		 		<property translatable="True" id="help-text" default="" />
++		 	</properties>
++		 </glade-widget-class>
++
++		 <glade-widget-class name="AnjutaEnvironmentEditor" title="Environment editor"
++		 generic-name="environment_editor" />
++
++		<glade-widget-class name="AnjutaTreeComboBox" title="Tree combo box"
++		 generic-name="combo">
++			<properties>
++				<property id="glade-type" disabled="True"/>
++				<property id="label" disabled="True"/>
++				<property id="use-underline" disabled="True"/>
++				<property id="stock" disabled="True"/>
++			</properties>
++		</glade-widget-class>
++		<glade-widget-class name="AnjutaPmChooserButton" title="Project node chooser"
++		 generic-name="button" parent="AnjutaTreeComboBox">
++			<properties>
++				<property id="glade-type" disabled="True"/>
++				<property id="label" disabled="True"/>
++				<property id="use-underline" disabled="True"/>
++				<property id="stock" disabled="True"/>
++			</properties>
++		</glade-widget-class>
++		<glade-widget-class name="GbfProjectView" title="Project node view"
++		 generic-name="view" parent="GtkTreeView">
++		</glade-widget-class>
++
++	</glade-widget-classes>
++
++	<glade-widget-group name="Anjuta" title="Anjuta">
++		<glade-widget-class-ref name="AnjutaVcsStatusTreeView" />
++		<glade-widget-class-ref name="AnjutaDropEntry" />
++		<glade-widget-class-ref name="AnjutaFileList" />
++		<glade-widget-class-ref name="AnjutaPkgConfigChooser" />
++		<glade-widget-class-ref name="AnjutaColumnTextView" />
++		<glade-widget-class-ref name="AnjutaFileDropEntry" />
++		<glade-widget-class-ref name="AnjutaEntry" />
++		<glade-widget-class-ref name="AnjutaEnvironmentEditor" />
++		<glade-widget-class-ref name="AnjutaTreeComboBox" />
++		<glade-widget-class-ref name="AnjutaPmChooserButton" />
++		<glade-widget-class-ref name="GbfProjectView" />
++	</glade-widget-group>
++</glade-catalog>
diff --git a/extra/anjuta/fix-compile-error.patch b/extra/anjuta/fix-compile-error.patch
new file mode 100644
index 000000000..bc8fa7c41
--- /dev/null
+++ b/extra/anjuta/fix-compile-error.patch
@@ -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 == '\\')
+ 		{