From f1c065bd148ce6057a148a41b72b52ef8d1f1391 Mon Sep 17 00:00:00 2001
From: Sofia Boldyreva <tysytylalaia@yandex.ru>
Date: Tue, 21 Mar 2023 23:28:23 +0100
Subject: [PATCH] Import elementary-mail-6.4.0-1.el9

---
 .elementary-mail.metadata  |   1 +
 .gitignore                 |   1 +
 SOURCES/c3aa61d.patch      |  23 +++++++++
 SPECS/elementary-mail.spec | 102 +++++++++++++++++++++++++++++++++++++
 4 files changed, 127 insertions(+)
 create mode 100644 .elementary-mail.metadata
 create mode 100644 .gitignore
 create mode 100644 SOURCES/c3aa61d.patch
 create mode 100644 SPECS/elementary-mail.spec

diff --git a/.elementary-mail.metadata b/.elementary-mail.metadata
new file mode 100644
index 0000000..3b8f6c8
--- /dev/null
+++ b/.elementary-mail.metadata
@@ -0,0 +1 @@
+56760b4a9d8f69824ca39cbc48e79bcba36f996b SOURCES/elementary-mail-6.4.0.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fb6a62a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+SOURCES/elementary-mail-6.4.0.tar.gz
diff --git a/SOURCES/c3aa61d.patch b/SOURCES/c3aa61d.patch
new file mode 100644
index 0000000..3b5c0b5
--- /dev/null
+++ b/SOURCES/c3aa61d.patch
@@ -0,0 +1,23 @@
+From c3aa61d226f49147d7685cc00013469ff4df369a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin@elementary.io>
+Date: Sat, 29 Jan 2022 14:57:25 +0100
+Subject: [PATCH] ComposerWidget: Make ACTION_ENTRIES private (#765)
+
+Fixes compilation with latest valac.
+---
+ src/Composer/ComposerWidget.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Composer/ComposerWidget.vala b/src/Composer/ComposerWidget.vala
+index 3fe962a1..ccc05d5e 100644
+--- a/src/Composer/ComposerWidget.vala
++++ b/src/Composer/ComposerWidget.vala
+@@ -66,7 +66,7 @@ public class Mail.ComposerWidget : Gtk.Grid {
+         DRAFT
+     }
+ 
+-    public const ActionEntry[] ACTION_ENTRIES = {
++    private const ActionEntry[] ACTION_ENTRIES = {
+         {ACTION_ADD_ATTACHMENT, on_add_attachment },
+         {ACTION_BOLD, on_edit_action, "s", "''" },
+         {ACTION_ITALIC, on_edit_action, "s", "''" },
diff --git a/SPECS/elementary-mail.spec b/SPECS/elementary-mail.spec
new file mode 100644
index 0000000..1919af5
--- /dev/null
+++ b/SPECS/elementary-mail.spec
@@ -0,0 +1,102 @@
+## START: Set by rpmautospec
+## (rpmautospec version 0.2.5)
+%define autorelease(e:s:pb:) %{?-p:0.}%{lua:
+    release_number = 1;
+    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
+    print(release_number + base_release_number - 1);
+}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{?dist}
+## END: Set by rpmautospec
+
+%global srcname mail
+%global appname io.elementary.mail
+
+%global __provides_exclude_from ^%{_libdir}/%{appname}/webkit2/.*\\.so$
+
+Name:           elementary-mail
+Summary:        Mail app designed for elementary
+Version:        6.4.0
+Release:        %autorelease
+License:        GPLv3+
+
+URL:            https://github.com/elementary/mail
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+
+# include upstream patch to fix compilation with vala 0.55+
+Patch0:         %{url}/commit/c3aa61d.patch
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  libappstream-glib
+BuildRequires:  meson
+BuildRequires:  vala
+
+BuildRequires:  pkgconfig(camel-1.2) >= 3.28
+BuildRequires:  pkgconfig(folks)
+BuildRequires:  pkgconfig(gee-0.8)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gobject-2.0)
+BuildRequires:  pkgconfig(granite) >= 6.0.0
+BuildRequires:  pkgconfig(libedataserver-1.2) >= 3.28
+BuildRequires:  pkgconfig(libedataserverui-1.2) >= 3.28
+BuildRequires:  pkgconfig(libhandy-1) >= 1.1.90
+BuildRequires:  pkgconfig(webkit2gtk-4.0) >= 2.28
+BuildRequires:  pkgconfig(webkit2gtk-web-extension-4.0) >= 2.28
+
+Requires:       hicolor-icon-theme
+
+%description
+%{summary}.
+
+
+%prep
+%autosetup -n %{srcname}-%{version} -p1
+
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+
+# remove @2 scaled icons that aren't properly supported by hicolor-icon-theme:
+# * https://github.com/elementary/tasks/issues/321
+# * https://gitlab.freedesktop.org/xdg/default-icon-theme/-/issues/2
+# * https://bugzilla.redhat.com/show_bug.cgi?id=1537318
+# * https://src.fedoraproject.org/rpms/hicolor-icon-theme/pull-request/2
+rm -r %{buildroot}/%{_datadir}/icons/hicolor/*@2/
+
+%find_lang %{appname}
+
+
+%check
+desktop-file-validate \
+    %{buildroot}/%{_datadir}/applications/%{appname}.desktop
+
+desktop-file-validate \
+    %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
+
+appstream-util validate-relax --nonet \
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+
+
+%files -f %{appname}.lang
+%license COPYING
+%doc README.md
+
+%config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
+
+%{_bindir}/%{appname}
+
+%{_libdir}/%{appname}/
+
+%{_datadir}/applications/%{appname}.desktop
+%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
+%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
+%{_datadir}/metainfo/%{appname}.appdata.xml
+
+
+%changelog
+* Mon Jan 31 2022 Fabio Valentini <decathorpe@gmail.com> 6.4.0-1
+- Initial import (#2033891)