File 0003-64bit-portability.patch of Package birdfont

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-64bit-portability.patch of Package birdfont (Revision 45de7be43d74d04efcf2386cf438808c)

Currently displaying revision 45de7be43d74d04efcf2386cf438808c , Show latest

From 28a7982c5c5f3d4f2ebac73680c14d8f7869c716 Mon Sep 17 00:00:00 2001
From: Johan Mattsson <johan@linux-cy8u.site>
Date: Sat, 28 Sep 2013 07:14:06 +0200
Subject: [PATCH] 64bit-portability

---
 birdfont/Main.vala                  | 4 ++--
 libbirdfont/CharDatabaseParser.vala | 4 ++--
 scripts/build.py                    | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/birdfont/Main.vala b/birdfont/Main.vala
index 08d8fe3..8147b1e 100644
--- a/birdfont/Main.vala
+++ b/birdfont/Main.vala
@@ -30,7 +30,7 @@ public static int main (string[] arg) {
 	string file;
 	BirdFont.BirdFont birdfont = new BirdFont.BirdFont ();
 	CharDatabaseParser db = new CharDatabaseParser ();
-	unowned Thread<int> db_thread;
+	unowned Thread<CharDatabaseParser> db_thread;
 	Mutex database_mutex = new Mutex ();
 	Cond main_loop_idle = new Cond ();
 	bool in_idle = false;
@@ -53,7 +53,7 @@ public static int main (string[] arg) {
 	}
 	
 	try {
-		db_thread = Thread.create<int> (db.load, false);
+		db_thread = Thread.create<CharDatabaseParser> (db.load, false);
 		
 		// wait until main loop is done
 		db.sync.connect (() => {
diff --git a/libbirdfont/CharDatabaseParser.vala b/libbirdfont/CharDatabaseParser.vala
index ffa2414..78463ec 100644
--- a/libbirdfont/CharDatabaseParser.vala
+++ b/libbirdfont/CharDatabaseParser.vala
@@ -132,7 +132,7 @@ public class CharDatabaseParser : GLib.Object {
 		}
 	}
 	
-	public int load () {
+	public CharDatabaseParser load () {
 		parse_all_entries ();
 		
 		IdleSource idle = new IdleSource ();
@@ -145,7 +145,7 @@ public class CharDatabaseParser : GLib.Object {
 		});
 		idle.attach (null);
 		
-		return 0;
+		return this;
 	}
 
 	static File get_unicode_database () {
diff --git a/scripts/build.py b/scripts/build.py
index 658241f..2be309b 100644
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -125,9 +125,11 @@ def birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, library):
 		$(pkg-config --libs gdk-pixbuf-2.0) \
 		-o ./build/bin/birdfont-export""")
 
+	run("rm -f build/birdfont.1.gz")
 	run("cp resources/linux/birdfont.1 build/")
 	run("gzip build/birdfont.1")
-	
+
+	run("rm -f build/birdfont-export.1.gz")	
 	run("cp resources/linux/birdfont-export.1 build/")
 	run("gzip build/birdfont-export.1")
 	
-- 
1.8.4

Places

File 0003-64bit-portability.patch of Package birdfont (Revision 45de7be43d74d04efcf2386cf438808c)

Places