New debian/patches/0100-fix-ftbfs_vala_0_42.patch

3 files changed, 74 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 8a41795..d3b4d8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-pie (0.7.1-2) UNRELEASED; urgency=medium
+
+  * New debian/patches/0100-fix-ftbfs_vala_0_42.patch to fix FTBFS
+    with vala 0.42.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 07 Sep 2018 06:31:00 +0200
+
 gnome-pie (0.7.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/0100-fix-ftbfs_vala_0_42.patch b/debian/patches/0100-fix-ftbfs_vala_0_42.patch
new file mode 100644
index 0000000..f60fbed
--- /dev/null
+++ b/debian/patches/0100-fix-ftbfs_vala_0_42.patch
@@ -0,0 +1,66 @@
+Description: Fix FTBFS with vala 0.42
+Origin: upstream, https://github.com/Simmesimme/Gnome-Pie/commit/86412ee09b7f8bc11f163bc8b6c3a061be279c43
+Bug: https://github.com/Simmesimme/Gnome-Pie/issues/164
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=907943
+Forwarded: not-needed
+Last-Update: 2018-09-07
+--
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/src/utilities/archiveReader.vala
+===================================================================
+--- trunk.orig/src/utilities/archiveReader.vala
++++ trunk/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
+                 }
+             }
+ 
+Index: trunk/src/utilities/archiveWriter.vala
+===================================================================
+--- trunk.orig/src/utilities/archiveWriter.vala
++++ trunk/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();
diff --git a/debian/patches/series b/debian/patches/series
index 23920e0..47e91e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 #0500_bamf3-vapi.patch
+0100-fix-ftbfs_vala_0_42.patch