[Mud-builder-commits] r279 - in trunk/packages/vala.pkg: . patches

[jaffa at garage.maemo.org]

Author: jaffa
Date: 2009-07-04 15:02:41 +0300 (Sat, 04 Jul 2009)
New Revision: 279

Removed:
   trunk/packages/vala.pkg/patches/g_regex-glib-2.1.4_compat.patch
Modified:
   trunk/packages/vala.pkg/mud.xml
Log:
Update Vala to 0.7.4

Modified: trunk/packages/vala.pkg/mud.xml
===================================================================
--- trunk/packages/vala.pkg/mud.xml	2009-06-09 21:20:11 UTC (rev 278)
+++ trunk/packages/vala.pkg/mud.xml	2009-07-04 12:02:41 UTC (rev 279)
@@ -1,13 +1,13 @@
 <package>
   <fetch type="tarball">
-    <url>http://download.gnome.org/sources/vala/0.7/vala-0.7.3.tar.bz2</url>
+    <url>http://download.gnome.org/sources/vala/0.7/vala-0.7.4.tar.bz2</url>
   </fetch>
   <build>
     <copyright>lgpl</copyright>
     <configure-append>--enable-maintainer-mode --disable-dependency-tracking</configure-append>
   </build>
   <deb prefix-section="0">
-    <version>0.7.3-maemo3</version>
+    <version>0.7.4-maemo1</version>
     <maintainer>Andrew Flegg &lt;andrew at bleb.org&gt;</maintainer>
     <section>programming</section>
     <depends>c-compiler</depends>

Deleted: trunk/packages/vala.pkg/patches/g_regex-glib-2.1.4_compat.patch
===================================================================
--- trunk/packages/vala.pkg/patches/g_regex-glib-2.1.4_compat.patch	2009-06-09 21:20:11 UTC (rev 278)
+++ trunk/packages/vala.pkg/patches/g_regex-glib-2.1.4_compat.patch	2009-07-04 12:02:41 UTC (rev 279)
@@ -1,58 +0,0 @@
-From 357f23fd794db87a5a2054d7d94f4efd31f06e6b Mon Sep 17 00:00:00 2001
-From: Mark Lee <marklee at src.gnome.org>
-Date: Thu, 28 May 2009 08:43:40 +0000
-Subject: GIR writer: Remove GLib.Regex reference
-
-The GRegex reference prevents compilation with GLib 2.12. The code has
-been replaced with equivalent code derived from the string class.
-
-Fixes bug 584098.
----
-diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala
-index 2bb6c00..06c8bf6 100644
---- compiler/valacompiler.vala
-+++ compiler/valacompiler.vala
-@@ -363,22 +363,29 @@ class Vala.Compiler {
- 		if (library != null) {
- 			if (gir != null) {
- 				if (context.profile == Profile.GOBJECT) {
--					string[] split_gir = Regex.split_simple("(.*)-([0-9]+(\\.[0-9]+)?)\\.gir$", gir);
-+					long gir_len = gir.len ();
-+					unowned string? last_hyphen = gir.rchr (gir_len, '-');
- 
--					if (split_gir.length < 4) {
-+					if (last_hyphen == null || !gir.has_suffix (".gir")) {
- 						Report.error (null, "GIR file name `%s' is not well-formed, expected NAME-VERSION.gir".printf (gir));
- 					} else {
--						var gir_writer = new GIRWriter ();
--						string gir_namespace = split_gir[1];
--						string gir_version = split_gir[2];
--
--						// put .gir file in current directory unless -d has been explicitly specified
--						string gir_directory = ".";
--						if (directory != null) {
--							gir_directory = context.directory;
-+						long offset = gir.pointer_to_offset (last_hyphen);
-+						string gir_namespace = gir.substring (0, offset);
-+						string gir_version = gir.substring (offset + 1, gir_len - offset - 5);
-+						gir_version.canon ("0123456789.", '?');
-+						if (gir_namespace == "" || gir_version == "" || !gir_version[0].isdigit () || gir_version.contains ("?")) {
-+							Report.error (null, "GIR file name `%s' is not well-formed, expected NAME-VERSION.gir".printf (gir));
-+						} else {
-+							var gir_writer = new GIRWriter ();
-+
-+							// put .gir file in current directory unless -d has been explicitly specified
-+							string gir_directory = ".";
-+							if (directory != null) {
-+								gir_directory = context.directory;
-+							}
-+
-+							gir_writer.write_file (context, gir_directory, gir_namespace, gir_version, library);
- 						}
--
--						gir_writer.write_file (context, gir_directory, gir_namespace, gir_version, library);
- 					}
- 				}
- 
---
-cgit v0.8.2