File gnome-pie-fix-build-vala042.patch of Package gnome-pie

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-pie-fix-build-vala042.patch of Package gnome-pie (Revision 2494c5f5670b51f2ca4385d18785d61c)

Currently displaying revision 2494c5f5670b51f2ca4385d18785d61c , Show latest

From 86412ee09b7f8bc11f163bc8b6c3a061be279c43 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 22 Aug 2018 10:38:13 +0200
Subject: [PATCH] Fix build with vala 0.42

---
 src/utilities/archiveReader.vala | 10 +++++++++-
 src/utilities/archiveWriter.vala | 14 +++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/utilities/archiveReader.vala b/src/utilities/archiveReader.vala
index df248cf..28b7005 100644
--- a/src/utilities/archiveReader.vala
+++ b/src/utilities/archiveReader.vala
@@ -84,9 +84,13 @@ public class ArchiveReader : GLib.Object {
             if (entry.size() > 0) {
                 while (true) {
                     size_t offset, size;
-                    void *buff;
+                    uint8[] buff;
 
+#if VALA_0_42
+                    r = this.archive.read_data_block(out buff, out offset);
+#else
                     r = this.archive.read_data_block(out buff, out size, out offset);
+#endif
                     if (r == Archive.Result.EOF) {
                         break;
                     }
@@ -96,7 +100,11 @@ public class ArchiveReader : GLib.Object {
                         return false;
                     }
 
+#if VALA_0_42
+                    this.writer.write_data_block(buff, offset);
+#else
                     this.writer.write_data_block(buff, size, offset);
+#endif
                 }
             }
 
diff --git a/src/utilities/archiveWriter.vala b/src/utilities/archiveWriter.vala
index 2a18154..59b2b2f 100644
--- a/src/utilities/archiveWriter.vala
+++ b/src/utilities/archiveWriter.vala
@@ -112,13 +112,17 @@ public class ArchiveWriter : GLib.Object {
         if (this.archive.write_header(entry) == Archive.Result.OK) {
             try {
                 var reader = File.new_for_path(path).read();
-                uint8 buffer[4096];
+                uint8[] buffer = new uint8[4096];
 
-                var len = reader.read(buffer);
+                buffer.length = (int) reader.read(buffer);
 
-                while(len > 0) {
-                    this.archive.write_data(buffer, len);
-                    len = reader.read(buffer);
+                while(buffer.length > 0) {
+#if VALA_0_42
+                    this.archive.write_data(buffer);
+#else
+                    this.archive.write_data(buffer, buffer.length);
+#endif
+                    buffer.length = (int) reader.read(buffer);
                 }
 
                 this.archive.finish_entry();

Places

File gnome-pie-fix-build-vala042.patch of Package gnome-pie (Revision 2494c5f5670b51f2ca4385d18785d61c)

Places