From b75a34d84f1efbcea66b6e6f83c87eb7049b4336 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Aug 27 2014 16:59:17 +0000 Subject: Update to 0.7.1. - Update patches. - Drop obsolete dependency on libunique. --- diff --git a/.gitignore b/.gitignore index 11cb38d..7b64900 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /geary-0.6.0.tar.xz /geary-0.6.1.tar.xz /geary-0.6.2.tar.xz +/geary-0.7.1.tar.xz diff --git a/geary-0.6.1-fix-timezone.patch b/geary-0.6.1-fix-timezone.patch deleted file mode 100644 index 4fe9ab5..0000000 --- a/geary-0.6.1-fix-timezone.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f38c8c70cab0c582307f77259ef39ad8fce58fd4 Mon Sep 17 00:00:00 2001 -From: Jim Nelson -Date: Mon, 12 May 2014 14:44:34 -0700 -Subject: Fix composed email Date: header: Closes bug #714376 - -GMime documentation suggests its date conversion methods take a -time zone offset in hours, but it appears the number must be base-100 -to get the right results (i.e. -7 becomes "-0700"). - -diff --git a/src/engine/rfc822/rfc822-message-data.vala b/src/engine/rfc822/rfc822-message-data.vala -index 8c9cdb4..975fc7e 100644 ---- a/src/engine/rfc822/rfc822-message-data.vala -+++ b/src/engine/rfc822/rfc822-message-data.vala -@@ -164,7 +164,11 @@ public class Geary.RFC822.Date : Geary.RFC822.MessageData, Geary.MessageData.Abs - * Returns the {@link Date} in ISO-8601 format. - */ - public virtual string serialize() { -- return GMime.utils_header_format_date(as_time_t, 0); -+ // Although GMime documents its conversion methods as requiring the tz offset in hours, -+ // it appears the number is handed directly to the string (i.e. an offset of -7 becomes -+ // "-0007", whereas we want "-0700"). -+ return GMime.utils_header_format_date(as_time_t, -+ (int) (value.get_utc_offset() / TimeSpan.HOUR) * 100); - } - - public virtual uint hash() { -diff --git a/src/engine/rfc822/rfc822-message.vala b/src/engine/rfc822/rfc822-message.vala -index aa32c6b..f38b694 100644 ---- a/src/engine/rfc822/rfc822-message.vala -+++ b/src/engine/rfc822/rfc822-message.vala -@@ -96,8 +96,7 @@ public class Geary.RFC822.Message : BaseObject { - date = new RFC822.Date.from_date_time(email.date); - - message.set_sender(sender.to_rfc822_string()); -- message.set_date((time_t) email.date.to_unix(), -- (int) (email.date.get_utc_offset() / TimeSpan.HOUR)); -+ message.set_date_as_string(date.serialize()); - if (message_id != null) - message.set_message_id(message_id); - --- -cgit v0.10.1 - diff --git a/geary-0.7.1-ownership-transfer.patch b/geary-0.7.1-ownership-transfer.patch new file mode 100644 index 0000000..34288a8 --- /dev/null +++ b/geary-0.7.1-ownership-transfer.patch @@ -0,0 +1,32 @@ +From 67a5a9f7fc7c34dd01cc2a464a709d67b7c3145d Mon Sep 17 00:00:00 2001 +From: Jim Nelson +Date: Thu, 21 Aug 2014 13:42:00 -0700 +Subject: [PATCH] Fix set_default_icon_list() ownership transfer bug + +Ownership of the GList is transferred in this call, so a copy should +be passed instead. This will be fixed in a future version of Vala. + +https://mail.gnome.org/archives/vala-list/2014-August/msg00022.html +--- + src/client/components/main-window.vala | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/client/components/main-window.vala b/src/client/components/main-window.vala +index ebdade2..0736f80 100644 +--- a/src/client/components/main-window.vala ++++ b/src/client/components/main-window.vala +@@ -61,7 +61,10 @@ public class MainWindow : Gtk.ApplicationWindow { + + GLib.List pixbuf_list = new GLib.List(); + pixbuf_list.append(IconFactory.instance.application_icon); +- set_default_icon_list(pixbuf_list); ++ // Use copy() because set_default_icon_list() actually accepts an owned reference ++ // If we didn't hold the pixbufs in memory, would need to use copy_deep() ++ // See https://mail.gnome.org/archives/vala-list/2014-August/msg00022.html ++ set_default_icon_list(pixbuf_list.copy()); + + delete_event.connect(on_delete_event); + key_press_event.connect(on_key_press_event); +-- +1.9.3 + diff --git a/geary.spec b/geary.spec index 46bb7da..eca3208 100644 --- a/geary.spec +++ b/geary.spec @@ -1,13 +1,13 @@ Name: geary -Version: 0.6.2 +Version: 0.7.1 Release: 1%{?dist} Summary: A lightweight email program designed around conversations License: LGPLv2+ URL: http://yorba.org/geary/ -Source0: https://download.gnome.org/sources/geary/0.6/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/geary/0.7/%{name}-%{version}.tar.xz Patch0: geary-0.5.3-vapigen.patch -# upstream commit f38c8c70 -Patch1: geary-0.6.1-fix-timezone.patch +# upstream commit 67a5a9f +Patch1: geary-0.7.1-ownership-transfer.patch BuildRequires: vala >= 0.22.1 BuildRequires: vala-tools >= 0.22.1 BuildRequires: cmake @@ -18,9 +18,8 @@ BuildRequires: gnome-doc-utils BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 BuildRequires: pkgconfig(gio-2.0) >= 2.28.0 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.6.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.10.0 BuildRequires: pkgconfig(gee-0.8) >= 0.8.5 -BuildRequires: pkgconfig(unique-3.0) >= 3.0.0 BuildRequires: pkgconfig(libnotify) >= 0.7.5 BuildRequires: pkgconfig(libcanberra) >= 0.28 BuildRequires: pkgconfig(sqlite3) >= 3.7.4 @@ -67,7 +66,9 @@ make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} -desktop-file-validate %{buildroot}%{_datadir}/applications/geary.desktop +desktop-file-validate \ + %{buildroot}%{_datadir}/applications/geary.desktop \ + %{buildroot}%{_datadir}/applications/geary-autostart.desktop %find_lang %{name} --with-gnome @@ -96,12 +97,18 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_bindir}/geary %{_datadir}/geary %{_datadir}/applications/geary.desktop +%{_datadir}/applications/geary-autostart.desktop %{_datadir}/appdata/geary.appdata.xml %{_datadir}/glib-2.0/schemas/org.yorba.geary.gschema.xml %{_datadir}/icons/hicolor/*/apps/geary.* %changelog +* Wed Aug 27 2014 Thomas Moschny - 0.7.1-1 +- Update to 0.7.1. +- Update patches. +- Drop obsolete dependency on libunique. + * Fri Aug 22 2014 Thomas Moschny - 0.6.2-1 - Update to 0.6.2. - Drop patch applied upstream. diff --git a/sources b/sources index dd43ca7..efc3a15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ac4bac67630f5e9d6669c38e661cfce geary-0.6.2.tar.xz +59e6cd386e5e0b4971a57dd38bd93a7e geary-0.7.1.tar.xz