Re: [Qemu-devel] [PATCH v4 04/10] Add a script to extract VSS SDK headers on POSIX system

[Paolo Bonzini <pbonzini@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 907 bytes --]

Il 25/06/2013 17:01, Laszlo Ersek ha scritto:
> On 06/06/13 17:06, Tomoki Sekiyama wrote:
> 
>> +if ! command -v msiextract > /dev/null; then
>> +  echo 'msiextract not found. Please install msitools.' >&2
>> +  exit 1
>> +fi
> 
> (This is not a review comment -- I'm trying to test it:)
> 
> What msiextract version (and dependencies, like libgcab, libgsf etc) are
> you using? I'm unable to extract "vsssdk.msi"; msiextract spews a bunch
> of assertion failures.
> 
> 2e39646b7850a12673bc66ade85fece3  setup.exe
> 433eb024ed0c669dd1563d952ca41091  vsssdk.msi
> 
> My versions (RHEL-6.4.z distro):
> - msitools-0.92 (built from source)
> - gcab-0.4 (built from source)
> - libgsf-1.14.15-5.el6 (patch in [1] doesn't seem to help, it only
> changes the kinds of asserts that fail)
> - glib2-2.22.5-7.el6
> - libuuid-2.17.2-12.9.el6_4.3

The attached patch may help building a newer libgsf on RHEL6.

Paolo


[-- Attachment #2: 0001-remove-need-for-glib-2.26.patch --]
[-- Type: text/x-patch, Size: 1794 bytes --]

>From 0eee72d26d06d7087d5d83efbc37564f67489019 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 16 Jan 2013 19:27:20 +0100
Subject: [PATCH] remove need for glib 2.26

---
 configure           |    2 +-
 configure.in        |    2 +-
 gsf/gsf-timestamp.c |   16 +++++++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index 30aa84d..029f5f9 100755
--- a/configure
+++ b/configure
@@ -12740,7 +12740,7 @@ _ACEOF
 
 libgsf_reqs="
     gobject-2.0 >= 2.16.0
-    glib-2.0 >= 2.26.0
+    glib-2.0 >= 2.22.0
     libxml-2.0 >= 2.4.16
 "
 
diff --git a/configure.in b/configure.in
index a830360..c6c7254 100644
--- a/configure.in
+++ b/configure.in
@@ -71,7 +71,7 @@ ifelse([
 dnl Modules required for libgsf
 libgsf_reqs="
     gobject-2.0 >= 2.16.0
-    glib-2.0 >= 2.26.0
+    glib-2.0 >= 2.22.0
     libxml-2.0 >= 2.4.16
 "
 
diff --git a/gsf/gsf-timestamp.c b/gsf/gsf-timestamp.c
index 9d45f9a..a8e0a44 100644
--- a/gsf/gsf-timestamp.c
+++ b/gsf/gsf-timestamp.c
@@ -136,20 +136,22 @@ int
 gsf_timestamp_load_from_string (GsfTimestamp *stamp, char const *spec)
 {
 	int year, month, day, hour, minute, second;
-	GDateTime *dt;
+	time_t t;
 
 	/* 'YYYY-MM-DDThh:mm:ss' */
 	if (6 != sscanf (spec, "%d-%d-%dT%d:%d:%d",
 			 &year, &month, &day, &hour, &minute, &second))
 		return FALSE;
 
-	dt = g_date_time_new_utc (year, month, day, hour, minute, second);
-	if (!dt)
-		return FALSE;
-
-	stamp->timet = g_date_time_to_unix (dt);
+	if (month < 3) {
+		month += 12;
+		year--;
+	}
+	t = 86400ULL * (day + (153 * month - 457) / 5 + 365 * year + year / 4 - year / 100 + 
+		     year / 400 - 719469);
+	t += 3600 * hour + 60 * minute + second;
 
-	g_date_time_unref (dt);
+	stamp->timet = t;
 	return TRUE;
 }
 
-- 
1.7.1