Hello community, here is the log from the commit of package geary for openSUSE:Factory checked in at 2016-09-23 11:38:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geary (Old) and /work/SRC/openSUSE:Factory/.geary.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geary" Changes: -------- --- /work/SRC/openSUSE:Factory/geary/geary.changes 2016-08-31 14:31:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.geary.new/geary.changes 2016-09-23 11:38:52.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 19 21:37:26 UTC 2016 - [email protected] + +- Add geary-vala-0.34.patch: Fix build with vala 0.34. Patch taken + from git master. + +------------------------------------------------------------------- New: ---- geary-vala-0.34.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geary.spec ++++++ --- /var/tmp/diff_new_pack.j5ED5P/_old 2016-09-23 11:38:53.000000000 +0200 +++ /var/tmp/diff_new_pack.j5ED5P/_new 2016-09-23 11:38:53.000000000 +0200 @@ -24,6 +24,8 @@ Group: Productivity/Networking/Email/Clients Url: http://yorba.org/geary Source: http://download.gnome.org/sources/geary/0.11/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM geary-vala-0.34.patch [email protected] -- Fix build with vala 0.34, taken from git master +Patch0: geary-vala-0.34.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: intltool @@ -57,6 +59,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %cmake -DVALA_EXECUTABLE:FILEPATH=%{_bindir}/valac%{?vala_version_suffix} \ ++++++ geary-vala-0.34.patch ++++++ commit f2d392bed5ea3cec6c097895ba54ba840e3e3480 Author: Rico Tzschichholz <[email protected]> Date: Fri Jul 8 09:56:42 2016 +0200 Fix compile warnings with vala git diff --git a/src/client/application/geary-application.vala b/src/client/application/geary-application.vala index 64038bb..da5ff3e 100644 --- a/src/client/application/geary-application.vala +++ b/src/client/application/geary-application.vala @@ -36,9 +36,9 @@ public class GearyApplication : Gtk.Application { null }; - private static const string ACTION_ENTRY_COMPOSE = "compose"; + private const string ACTION_ENTRY_COMPOSE = "compose"; - public static const ActionEntry[] action_entries = { + public const ActionEntry[] action_entries = { {ACTION_ENTRY_COMPOSE, activate_compose, "s"}, }; diff --git a/src/client/components/conversation-find-bar.vala b/src/client/components/conversation-find-bar.vala index 008f4d3..a625896 100644 --- a/src/client/components/conversation-find-bar.vala +++ b/src/client/components/conversation-find-bar.vala @@ -5,7 +5,7 @@ */ public class ConversationFindBar : Gtk.Layout { - private static const string entry_not_found_style = + private const string entry_not_found_style = """ .geary-not-found { color: white; diff --git a/src/client/dialogs/attachment-dialog.vala b/src/client/dialogs/attachment-dialog.vala index e391a35..fc29a3d 100644 --- a/src/client/dialogs/attachment-dialog.vala +++ b/src/client/dialogs/attachment-dialog.vala @@ -5,8 +5,8 @@ */ public class AttachmentDialog : Gtk.FileChooserDialog { - private static const int PREVIEW_SIZE = 180; - private static const int PREVIEW_PADDING = 3; + private const int PREVIEW_SIZE = 180; + private const int PREVIEW_PADDING = 3; private static string? current_folder = null; diff --git a/src/console/main.vala b/src/console/main.vala index 6ae3fff..7d0ba12 100644 --- a/src/console/main.vala +++ b/src/console/main.vala @@ -15,7 +15,7 @@ errordomain CommandException { class ImapConsole : Gtk.Window { public const string VERSION = _VERSION; - private static const int KEEPALIVE_SEC = 60 * 10; + private const int KEEPALIVE_SEC = 60 * 10; private Gtk.TextView console = new Gtk.TextView(); private Gtk.Entry cmdline = new Gtk.Entry();
