From 2f48d84d1727193b01a78cf952c7f0e7b720e4fb Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Nov 23 2013 13:30:35 +0000 Subject: Update to 0.4.2. - Drop patch applied upstream. --- diff --git a/.gitignore b/.gitignore index 69a3a3d..1603a0d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /geary-0.3.1.tar.xz /geary-0.4.0.tar.xz /geary-0.4.1.tar.xz +/geary-0.4.2.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 deleted file mode 100644 index 61d52c7..0000000 --- a/geary-0.4.1-vala-0.22.1-webkitgtk+-2.2.2.patch +++ /dev/null @@ -1,124 +0,0 @@ -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 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 caps; -+ private List caps; - - public signal void invoked(Geary.Folder? folder, Geary.Email? email); - diff --git a/geary.spec b/geary.spec index bcc0606..0106593 100644 --- a/geary.spec +++ b/geary.spec @@ -1,13 +1,10 @@ Name: geary -Version: 0.4.1 +Version: 0.4.2 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://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 @@ -44,7 +41,6 @@ all kinds of nifty features in a modular way. %prep %setup -q -%patch0 -p1 %build @@ -93,6 +89,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %changelog +* Sat Nov 23 2013 Thomas Moschny - 0.4.2-1 +- Update to 0.4.2. +- Drop patch applied upstream. + * Sat Nov 16 2013 Thomas Moschny - 0.4.1-1 - Update to 0.4.1. diff --git a/sources b/sources index 362ea56..aee465c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -77c86b4cbd3826a69f31ed95df01cfa2 geary-0.4.1.tar.xz +c71ae49fcdda09a549a7a592051ed154 geary-0.4.2.tar.xz