[geary] Update to 0.4.1.
Thomas Moschny
thm at fedoraproject.org
Sun Nov 17 11:34:31 UTC 2013
commit 92a1b75085a73c331fbc3fdf7467144e9899f426
Author: Thomas Moschny <thm at fedoraproject.org>
Date: Sun Nov 17 12:33:55 2013 +0100
Update to 0.4.1.
.gitignore | 1 +
geary-0.4.0-webkitgtk+-2.2.patch | 49 ---------
geary-0.4.1-vala-0.22.1-webkitgtk+-2.2.2.patch | 124 ++++++++++++++++++++++++
geary.spec | 15 ++--
sources | 2 +-
5 files changed, 133 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index de4c41b..69a3a3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/geary-0.3.0.tar.xz
/geary-0.3.1.tar.xz
/geary-0.4.0.tar.xz
+/geary-0.4.1.tar.xz
diff --git a/geary-0.4.1-vala-0.22.1-webkitgtk+-2.2.2.patch b/geary-0.4.1-vala-0.22.1-webkitgtk+-2.2.2.patch
new file mode 100644
index 0000000..61d52c7
--- /dev/null
+++ b/geary-0.4.1-vala-0.22.1-webkitgtk+-2.2.2.patch
@@ -0,0 +1,124 @@
+diff --git a/bindings/metadata/webkitgtk-2.0/WebKit-3.0.metadata b/bindings/metadata/webkitgtk-2.0/WebKit-3.0.metadata
+index 91a72e9..27ca48d 100644
+--- a/bindings/metadata/webkitgtk-2.0/WebKit-3.0.metadata
++++ b/bindings/metadata/webkitgtk-2.0/WebKit-3.0.metadata
+@@ -9,3 +9,8 @@ WebView.leaving_fullscreen#signal name="leaving_fullscreen_signal"
+ WebView.move_cursor#virtual_method name="leaving_fullscreen_method"
+ WebSettings.enable_default_context_menu#property deprecated=false
+
++DOMNode.dispatch_event type="void"
++DOMWebKitNamedFlow.dispatch_event type="void"
++DOMDOMApplicationCache.dispatch_event type="void"
++DOMDOMWindow.dispatch_event type="void"
++
+diff --git a/bindings/metadata/webkitgtk-2.2/WebKit-3.0.metadata b/bindings/metadata/webkitgtk-2.2/WebKit-3.0.metadata
+index f85f867..c19e0c5 100644
+--- a/bindings/metadata/webkitgtk-2.2/WebKit-3.0.metadata
++++ b/bindings/metadata/webkitgtk-2.2/WebKit-3.0.metadata
+@@ -11,3 +11,14 @@ WebView.leaving_fullscreen#signal name="leaving_fullscreen_signal"
+ WebView.move_cursor#virtual_method name="leaving_fullscreen_method"
+ WebSettings.enable_default_context_menu#property deprecated=false
+
++DOMBatteryManager.dispatch_event type="void"
++DOMAudioTrackList.dispatch_event type="void"
++DOMTextTrackCue.dispatch_event type="void"
++DOMTextTrack.dispatch_event type="void"
++DOMTextTrackList.dispatch_event type="void"
++DOMVideoTrackList.dispatch_event type="void"
++DOMNode.dispatch_event type="void"
++DOMWebKitNamedFlow.dispatch_event type="void"
++DOMDOMApplicationCache.dispatch_event type="void"
++DOMDOMWindow.dispatch_event type="void"
++
+diff --git a/bindings/vapi/libnotify.vapi b/bindings/vapi/libnotify.vapi
+new file mode 100644
+index 0000000..c5a6751
+--- /dev/null
++++ b/bindings/vapi/libnotify.vapi
+@@ -0,0 +1,73 @@
++/* libnotify.vapi generated by vapigen, do not modify. */
++
++namespace Notify {
++ [CCode (cheader_filename = "libnotify/notify.h")]
++ public class Notification : GLib.Object {
++ [CCode (has_construct_function = false)]
++ public Notification (string summary, string? body, string? icon);
++ public void add_action (string action, string label, owned Notify.ActionCallback callback);
++ public void clear_actions ();
++ public void clear_hints ();
++ public bool close () throws GLib.Error;
++ public int get_closed_reason ();
++ public void set_app_name (string app_name);
++ public void set_category (string category);
++ public void set_hint (string key, GLib.Variant value);
++ public void set_hint_byte (string key, uchar value);
++ public void set_hint_byte_array (string key, uchar[] value, size_t len);
++ public void set_hint_double (string key, double value);
++ public void set_hint_int32 (string key, int value);
++ public void set_hint_string (string key, string value);
++ public void set_hint_uint32 (string key, uint value);
++ public void set_icon_from_pixbuf (Gdk.Pixbuf icon);
++ public void set_image_from_pixbuf (Gdk.Pixbuf pixbuf);
++ public void set_timeout (int timeout);
++ public void set_urgency (Notify.Urgency urgency);
++ public bool show () throws GLib.Error;
++ public bool update (string summary, string body, string icon);
++ [NoAccessorMethod]
++ public string app_name { owned get; set; }
++ [NoAccessorMethod]
++ public string body { owned get; set construct; }
++ public int closed_reason { get; }
++ [NoAccessorMethod]
++ public string icon_name { owned get; set construct; }
++ [NoAccessorMethod]
++ public int id { get; set construct; }
++ [NoAccessorMethod]
++ public string summary { owned get; set construct; }
++ public virtual signal void closed ();
++ }
++ [CCode (cheader_filename = "libnotify/notify.h", cprefix = "NOTIFY_URGENCY_")]
++ public enum Urgency {
++ LOW,
++ NORMAL,
++ CRITICAL
++ }
++ [CCode (cheader_filename = "libnotify/notify.h")]
++ public delegate void ActionCallback (Notify.Notification notification, string action);
++ [CCode (cheader_filename = "libnotify/notify.h")]
++ public const int EXPIRES_DEFAULT;
++ [CCode (cheader_filename = "libnotify/notify.h")]
++ public const int EXPIRES_NEVER;
++ [CCode (cheader_filename = "libnotify/notify.h")]
++ public const int VERSION_MAJOR;
++ [CCode (cheader_filename = "libnotify/notify.h")]
++ public const int VERSION_MICRO;
++ [CCode (cheader_filename = "libnotify/notify.h")]
++ public const int VERSION_MINOR;
++ [CCode (cheader_filename = "libnotify/notify.h")]
++ public static unowned string get_app_name ();
++ [CCode (cheader_filename = "libnotify/notify.h")]
++ public static GLib.List<string> get_server_caps ();
++ [CCode (cheader_filename = "libnotify/notify.h")]
++ public static bool get_server_info (out unowned string ret_name, out unowned string ret_vendor, out unowned string ret_version, out unowned string ret_spec_version);
++ [CCode (cheader_filename = "libnotify/notify.h")]
++ public static bool init (string app_name);
++ [CCode (cheader_filename = "libnotify/notify.h")]
++ public static bool is_initted ();
++ [CCode (cheader_filename = "libnotify/notify.h")]
++ public static void set_app_name (string app_name);
++ [CCode (cheader_filename = "libnotify/notify.h")]
++ public static void uninit ();
++}
+diff --git a/src/client/notification/libnotify.vala b/src/client/notification/libnotify.vala
+index 51e2529..4da8a5a 100644
+--- a/src/client/notification/libnotify.vala
++++ b/src/client/notification/libnotify.vala
+@@ -16,7 +16,7 @@ public class Libnotify : Geary.BaseObject {
+ private Notify.Notification? error_notification = null;
+ private Geary.Folder? folder = null;
+ private Geary.Email? email = null;
+- private unowned List<string> caps;
++ private List<string> caps;
+
+ public signal void invoked(Geary.Folder? folder, Geary.Email? email);
+
diff --git a/geary.spec b/geary.spec
index c46a5e2..bcc0606 100644
--- a/geary.spec
+++ b/geary.spec
@@ -1,12 +1,13 @@
Name: geary
-Version: 0.4.0
+Version: 0.4.1
Release: 1%{?dist}
Summary: A lightweight email program designed around conversations
License: LGPLv2+
URL: http://yorba.org/geary/
Source0: http://yorba.org/download/geary/stable/%{name}-%{version}.tar.xz
-# see http://redmine.yorba.org/issues/7023
-Patch0: geary-0.4.0-webkitgtk+-2.2.patch
+# See http://http://redmine.yorba.org/issues/7695 and
+# http://redmine.yorba.org/issues/7695
+Patch0: geary-0.4.1-vala-0.22.1-webkitgtk+-2.2.2.patch
BuildRequires: vala >= 0.20.1
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -24,9 +25,6 @@ BuildRequires: pkgconfig(sqlite3) >= 3.7.4
BuildRequires: pkgconfig(gmime-2.6) >= 2.6.0
BuildRequires: pkgconfig(libsecret-1) >= 0.11
BuildRequires: pkgconfig(webkitgtk-3.0) >= 1.10.0
-%if 0%{?fedora} > 19
-BuildRequires: pkgconfig(webkitgtk-3.0) >= 2.2.0
-%endif
BuildRequires: pkgconfig(libxml-2.0) >= 2.7.8
BuildRequires: pkgconfig(gobject-introspection-1.0)
Requires: hicolor-icon-theme
@@ -46,9 +44,7 @@ all kinds of nifty features in a modular way.
%prep
%setup -q
-%if 0%{?fedora} > 19
%patch0 -p1
-%endif
%build
@@ -97,6 +93,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%changelog
+* Sat Nov 16 2013 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.1-1
+- Update to 0.4.1.
+
* Wed Oct 9 2013 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.0-1
- Update to 0.4.0.
- Drop patch applied upstream.
diff --git a/sources b/sources
index 9396974..362ea56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91aa41334813e8d8dae0131afec473e3 geary-0.4.0.tar.xz
+77c86b4cbd3826a69f31ed95df01cfa2 geary-0.4.1.tar.xz
More information about the scm-commits
mailing list