Merge branch 'release/debian/0.7.2-2'debian/0.7.2-2

4 files changed, 20 insertions, 271 deletions

diff --git a/debian/patches/0100-fix-ftbfs_vala_0_42.patch b/debian/patches/0100-fix-ftbfs_vala_0_42.patch
deleted file mode 100644
index f60fbed..0000000
--- a/debian/patches/0100-fix-ftbfs_vala_0_42.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-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/0110-Fix-Build-error.patch b/debian/patches/0110-Fix-Build-error.patch
new file mode 100644
index 0000000..0ec2925
--- /dev/null
+++ b/debian/patches/0110-Fix-Build-error.patch
@@ -0,0 +1,19 @@
+Description: Fix build errors
+Author: Jörg Frings-Fürst <debian@jff.email>
+forwarded: https://github.com/Simmesimme/Gnome-Pie/issues/177
+Last-Update: 2020-05-31
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/src/actions/action.vala
+===================================================================
+--- trunk.orig/src/actions/action.vala
++++ trunk/src/actions/action.vala
+@@ -69,7 +69,7 @@ public abstract class Action : GLib.Obje
+     /// C'tor, initializes all members.
+     /////////////////////////////////////////////////////////////////////
+ 
+-    public Action(string name, string icon, bool is_quickaction) {
++    Action(string name, string icon, bool is_quickaction) {
+         GLib.Object(name : name, icon : icon, is_quickaction : is_quickaction);
+     }
+ 
diff --git a/debian/patches/0500_bamf3-vapi.patch b/debian/patches/0500_bamf3-vapi.patch
deleted file mode 100644
index f185cfe..0000000
--- a/debian/patches/0500_bamf3-vapi.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-Description: Add libbamf3.vapi to prevent build errors
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Last-Update: 2015-05-11>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/vapi/libbamf3.vapi
-===================================================================
---- /dev/null
-+++ trunk/vapi/libbamf3.vapi
-@@ -0,0 +1,181 @@
-+/* libbamf3.vapi generated by vapigen, do not modify. */
-+
-+[CCode (cprefix = "Bamf", gir_namespace = "Bamf", gir_version = "3", lower_case_cprefix = "bamf_")]
-+namespace Bamf {
-+    [CCode (cheader_filename = "libbamf/libbamf.h", type_id = "bamf_application_get_type ()")]
-+    public class Application : Bamf.View {
-+	[CCode (has_construct_function = false)]
-+	protected Application ();
-+	public bool get_application_menu (string name, string object_path);
-+	public unowned string get_application_type ();
-+	public unowned string get_desktop_file ();
-+	public unowned Bamf.View get_focusable_child ();
-+	public bool get_show_menu_stubs ();
-+	[CCode (array_length = false, array_null_terminated = true)]
-+	public string[] get_supported_mime_types ();
-+	public GLib.List<weak Bamf.Window> get_windows ();
-+	public GLib.Array<uint32> get_xids ();
-+	public signal void window_added (Bamf.View object);
-+	public signal void window_removed (Bamf.View object);
-+    }
-+    [CCode (cheader_filename = "libbamf/libbamf.h", type_id = "bamf_control_get_type ()")]
-+    public class Control : GLib.Object {
-+	[CCode (has_construct_function = false)]
-+	protected Control ();
-+	public static unowned Bamf.Control get_default ();
-+	public void insert_desktop_file (string desktop_file);
-+	public void register_application_for_pid (string application, int32 pid);
-+	public void register_tab_provider (string path);
-+    }
-+    [CCode (cheader_filename = "libbamf/libbamf.h", type_id = "bamf_matcher_get_type ()")]
-+    public class Matcher : GLib.Object {
-+	[CCode (has_construct_function = false)]
-+	protected Matcher ();
-+	public bool application_is_running (string application);
-+	public unowned Bamf.Application get_active_application ();
-+	public unowned Bamf.Window get_active_window ();
-+	public unowned Bamf.Application get_application_for_desktop_file (string desktop_file_path, bool create_if_not_found);
-+	public unowned Bamf.Application get_application_for_window (Bamf.Window window);
-+	public unowned Bamf.Application get_application_for_xid (uint32 xid);
-+	public GLib.List<weak Bamf.Application> get_applications ();
-+	public static Bamf.Matcher get_default ();
-+	public GLib.List<weak Bamf.Application> get_running_applications ();
-+	public GLib.List<weak Bamf.View> get_tabs ();
-+	public GLib.List<weak Bamf.View> get_window_stack_for_monitor (int monitor);
-+	public GLib.List<weak Bamf.View> get_windows ();
-+	public GLib.Array<uint32> get_xids_for_application (string application);
-+	public void register_favorites ([CCode (array_length = false)] string[] favorites);
-+	public signal void active_application_changed (Bamf.View object, Bamf.View p0);
-+	public signal void active_window_changed (Bamf.View object, Bamf.View p0);
-+	public signal void stacking_order_changed ();
-+	public signal void view_closed (Bamf.View object);
-+	public signal void view_opened (Bamf.View object);
-+    }
-+    [CCode (cheader_filename = "libbamf/libbamf.h", type_id = "bamf_tab_get_type ()")]
-+    public class Tab : Bamf.View {
-+	[CCode (has_construct_function = false)]
-+	public Tab (string path);
-+	public bool close ();
-+	public virtual unowned string get_desktop_name ();
-+	public virtual bool get_is_foreground_tab ();
-+	public virtual unowned string get_location ();
-+	public virtual uint64 get_xid ();
-+	public bool raise ();
-+	[NoAccessorMethod]
-+	public string desktop_id { owned get; set; }
-+	[NoAccessorMethod]
-+	public bool is_foreground_tab { get; set; }
-+	[NoAccessorMethod]
-+	public string location { owned get; set; }
-+	[NoAccessorMethod]
-+	public uint64 xid { get; set; }
-+    }
-+    [CCode (cheader_filename = "libbamf/libbamf.h", type_id = "bamf_tab_source_get_type ()")]
-+    public class TabSource : GLib.Object {
-+	[CCode (has_construct_function = false)]
-+	protected TabSource ();
-+	[CCode (array_length = false, array_null_terminated = true)]
-+	public unowned string[] get_tab_ids ();
-+	public string get_tab_uri (string tab_id);
-+	public uint32 get_tab_xid (string tab_id);
-+	[NoWrapper]
-+	public virtual string tab_uri (string tab_id);
-+	[NoWrapper]
-+	public virtual uint32 tab_xid (string tab_id);
-+	[NoAccessorMethod]
-+	public string id { owned get; set construct; }
-+	public signal void tab_closed (string object);
-+	public signal void tab_opened (string object);
-+	public signal void tab_uri_changed (string object, string p0, string p1);
-+    }
-+    [CCode (cheader_filename = "libbamf/libbamf.h", type_id = "bamf_view_get_type ()")]
-+    public class View : GLib.InitiallyUnowned {
-+	[CCode (has_construct_function = false)]
-+	protected View ();
-+	[NoWrapper]
-+	public virtual Bamf.ClickBehavior click_behavior ();
-+	public virtual GLib.List<weak Bamf.View> get_children ();
-+	public Bamf.ClickBehavior get_click_suggestion ();
-+	public virtual string get_icon ();
-+	public virtual string get_name ();
-+	[CCode (vfunc_name = "view_type")]
-+	public virtual unowned string get_view_type ();
-+	public virtual bool is_active ();
-+	public bool is_closed ();
-+	public virtual bool is_running ();
-+	public bool is_sticky ();
-+	public virtual bool is_urgent ();
-+#if !HAVE_BAMF_0_4
-+	[CCode (cname = "bamf_view_user_visible")]
-+#endif
-+	public bool is_user_visible ();
-+	[NoWrapper]
-+	public virtual void set_path (string path);
-+	public void set_sticky (bool value);
-+	[NoAccessorMethod]
-+	public bool active { get; }
-+	[NoAccessorMethod]
-+	public string path { owned get; }
-+	[NoAccessorMethod]
-+	public bool running { get; }
-+	[NoAccessorMethod]
-+	public bool urgent { get; }
-+	[NoAccessorMethod]
-+	public bool user_visible { get; }
-+	public virtual signal void active_changed (bool active);
-+	public virtual signal void child_added (Bamf.View child);
-+	public virtual signal void child_moved (Bamf.View child);
-+	public virtual signal void child_removed (Bamf.View child);
-+	public virtual signal void closed ();
-+	public virtual signal void name_changed (string old_name, string new_name);
-+	public virtual signal void running_changed (bool running);
-+	public virtual signal void urgent_changed (bool urgent);
-+	public virtual signal void user_visible_changed (bool user_visible);
-+    }
-+    [CCode (cheader_filename = "libbamf/libbamf.h", type_id = "bamf_window_get_type ()")]
-+    public class Window : Bamf.View {
-+	[CCode (has_construct_function = false)]
-+	protected Window ();
-+	public virtual int get_monitor ();
-+	public virtual uint32 get_pid ();
-+	public virtual unowned Bamf.Window get_transient ();
-+	public virtual string get_utf8_prop (string prop);
-+	public virtual Bamf.WindowType get_window_type ();
-+	public virtual uint32 get_xid ();
-+	public virtual long last_active ();
-+	public virtual Bamf.WindowMaximizationType maximized ();
-+	public virtual signal void maximized_changed (int old_value, int new_value);
-+	public virtual signal void monitor_changed (int old_value, int new_value);
-+    }
-+    [CCode (cheader_filename = "libbamf/libbamf.h", cprefix = "BAMF_CLICK_BEHAVIOR_", has_type_id = false)]
-+    public enum ClickBehavior {
-+	NONE,
-+	OPEN,
-+	FOCUS,
-+	FOCUS_ALL,
-+	MINIMIZE,
-+	RESTORE,
-+	RESTORE_ALL,
-+	PICKER
-+    }
-+    [CCode (cheader_filename = "libbamf/libbamf.h", cprefix = "BAMF_WINDOW_", has_type_id = false)]
-+    public enum WindowMaximizationType {
-+	FLOATING,
-+	HORIZONTAL_MAXIMIZED,
-+	VERTICAL_MAXIMIZED,
-+	MAXIMIZED
-+    }
-+    [CCode (cheader_filename = "libbamf/libbamf.h", cprefix = "BAMF_WINDOW_", has_type_id = false)]
-+    public enum WindowType {
-+	NORMAL,
-+	DESKTOP,
-+	DOCK,
-+	DIALOG,
-+	TOOLBAR,
-+	MENU,
-+	UTILITY,
-+	SPLASHSCREEN
-+    }
-+    [CCode (cheader_filename = "libbamf/libbamf.h", instance_pos = 2.9)]
-+    public delegate void TabPreviewReadyCallback (Bamf.Tab self, string preview_data);
-+}
-Index: trunk/src/CMakeLists.txt
-===================================================================
---- trunk.orig/src/CMakeLists.txt
-+++ trunk/src/CMakeLists.txt
-@@ -23,6 +23,7 @@ vala_precompile(
-     PACKAGES
-         ${VALA_PKGS}
-     OPTIONS
-+	--vapidir=${CMAKE_SOURCE_DIR}/vapi/
-         --thread
-         ${DEFINES}
- )
diff --git a/debian/patches/series b/debian/patches/series
index e0a3e26..cf48a33 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-#0500_bamf3-vapi.patch
+0110-Fix-Build-error.patch
 0700-ayatana-appindicator.patch
 0105-spelling_errors.patch
-#0100-fix-ftbfs_vala_0_42.patch