[Mud-builder-commits] r278 - in trunk: lib/MUD packages/vala.pkg packages/vala.pkg/patches

[jaffa at garage.maemo.org]

Author: jaffa
Date: 2009-06-10 00:20:11 +0300 (Wed, 10 Jun 2009)
New Revision: 278

Modified:
   trunk/lib/MUD/Build.pm
   trunk/packages/vala.pkg/mud.xml
   trunk/packages/vala.pkg/patches/g_regex-glib-2.1.4_compat.patch
Log:
Exclude own package from build-deps (needs to be an option?) and update vala patch to upstream diff which fixes glib 2.12 compatbility

Modified: trunk/lib/MUD/Build.pm
===================================================================
--- trunk/lib/MUD/Build.pm	2009-05-27 22:48:25 UTC (rev 277)
+++ trunk/lib/MUD/Build.pm	2009-06-09 21:20:11 UTC (rev 278)
@@ -311,7 +311,7 @@
           while (<LOG>) {
               $inNeeded ||= /^Packages needed:$/;
               next unless $inNeeded and m/^  ([^\s\r\n]+)$/;
-              push @buildDeps, $1;
+              push @buildDeps, $1 if $1 ne $self->{data}->name;
           }
           close(LOG);
       }

Modified: trunk/packages/vala.pkg/mud.xml
===================================================================
--- trunk/packages/vala.pkg/mud.xml	2009-05-27 22:48:25 UTC (rev 277)
+++ trunk/packages/vala.pkg/mud.xml	2009-06-09 21:20:11 UTC (rev 278)
@@ -7,7 +7,7 @@
     <configure-append>--enable-maintainer-mode --disable-dependency-tracking</configure-append>
   </build>
   <deb prefix-section="0">
-    <version>0.7.3-maemo1</version>
+    <version>0.7.3-maemo3</version>
     <maintainer>Andrew Flegg &lt;andrew at bleb.org&gt;</maintainer>
     <section>programming</section>
     <depends>c-compiler</depends>

Modified: 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-05-27 22:48:25 UTC (rev 277)
+++ trunk/packages/vala.pkg/patches/g_regex-glib-2.1.4_compat.patch	2009-06-09 21:20:11 UTC (rev 278)
@@ -1,41 +1,58 @@
-Index: debian/rules
-===================================================================
---- debian/rules	(revision 1)
-+++ debian/rules	(working copy)
-@@ -76,10 +76,10 @@
- binary-arch: build install
- 	dh_testdir
- 	dh_testroot
--	dh_installchangelogs ChangeLog
--	dh_installdocs
--	dh_installexamples
--#	dh_install
-+#	dh_installchangelogs ChangeLog
-+#	dh_installdocs
-+#	dh_installexamples
-+	dh_install --sourcedir=debian/tmp
- #	dh_installmenu
- #	dh_installdebconf	
- #	dh_installlogrotate
-@@ -90,7 +90,7 @@
- #	dh_installinit
- #	dh_installcron
- #	dh_installinfo
--	dh_installman
-+#	dh_installman
- 	dh_link
- 	dh_strip
- 	dh_compress
-Index: compiler/valacompiler.c
-===================================================================
---- compiler/valacompiler.c	(revision 1)
-+++ compiler/valacompiler.c	(working copy)
-@@ -679,7 +679,7 @@
- 				char** split_gir;
- 				_tmp40_ = NULL;
- 				_tmp39_ = NULL;
--				split_gir = (_tmp40_ = _tmp39_ = g_regex_split_simple ("(.*)-([0-9]+(\\.[0-9]+)?)\\.gir$", vala_compiler_gir, 0, 0), split_gir_length1 = _vala_array_length (_tmp39_), split_gir_size = split_gir_length1, _tmp40_);
-+				split_gir = (_tmp40_ = _tmp39_ = g_strsplit("", "", 0), split_gir_length1 = _vala_array_length (_tmp39_), split_gir_size = split_gir_length1, _tmp40_);
- 				if (split_gir_length1 < 4) {
- 					char* _tmp41_;
- 					_tmp41_ = NULL;
+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