From 7d5b25b28300e6daf856204d3488a02c1ce2fdcc Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 4 Mar 2019 12:52:26 +0100 Subject: [PATCH 1/8] Update to 3.31.92 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 6dd317b..da8febb 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ ### Abstract ### Name: evolution -Version: 3.31.91 +Version: 3.31.92 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -509,6 +509,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %endif %changelog +* Mon Mar 04 2019 Milan Crha - 3.31.92-1 +- Update to 3.31.92 + * Mon Feb 18 2019 Milan Crha - 3.31.91-1 - Update to 3.31.91 diff --git a/sources b/sources index c18aaf5..976747d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.31.91.tar.xz) = 35de5ce3b314aa22c33a72faad20612a6bd300a8ab4f17c37e79d67bcc3e69a0cb2021fbe005024471411e12f6e9bd7fb24b19daf1bc490526cf2aa79dd7d568 +SHA512 (evolution-3.31.92.tar.xz) = 6a67fc97beea6d423769c46fa5ea8af6c7026c082adb6ddf178b3dada2c61204998c66a1558962050b22b3d299d7a435c3af8995f76edcd127803b76af2d2009 From c805e0f94a9c136da69cdc1e35f9d369196aaec2 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 11 Mar 2019 10:44:21 +0100 Subject: [PATCH 2/8] Update to 3.32.0 --- evolution.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index da8febb..5a830f6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,12 +31,12 @@ ### Abstract ### Name: evolution -Version: 3.31.92 +Version: 3.32.0 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution -Source: http://download.gnome.org/sources/%{name}/3.31/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.32/%{name}-%{version}.tar.xz ### Patches ### @@ -509,6 +509,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %endif %changelog +* Mon Mar 11 2019 Milan Crha - 3.32.0-1 +- Update to 3.32.0 + * Mon Mar 04 2019 Milan Crha - 3.31.92-1 - Update to 3.31.92 diff --git a/sources b/sources index 976747d..5d90717 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.31.92.tar.xz) = 6a67fc97beea6d423769c46fa5ea8af6c7026c082adb6ddf178b3dada2c61204998c66a1558962050b22b3d299d7a435c3af8995f76edcd127803b76af2d2009 +SHA512 (evolution-3.32.0.tar.xz) = a93931fea87a4f1cbfc5303424017491c6c6237d77c5fc31e9295424c063c84bffca4bb353b113ff982f979bb8c261e095fd282205f4afdcc7135248ec4d7cdc From bc8bbf155bcedd3a595c437837386a27c9547758 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 8 Apr 2019 15:41:31 +0200 Subject: [PATCH 3/8] Update to 3.32.1 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 5a830f6..4b00570 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ ### Abstract ### Name: evolution -Version: 3.32.0 +Version: 3.32.1 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -509,6 +509,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %endif %changelog +* Mon Apr 08 2019 Milan Crha - 3.32.1-1 +- Update to 3.32.1 + * Mon Mar 11 2019 Milan Crha - 3.32.0-1 - Update to 3.32.0 diff --git a/sources b/sources index 5d90717..d04ab03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.32.0.tar.xz) = a93931fea87a4f1cbfc5303424017491c6c6237d77c5fc31e9295424c063c84bffca4bb353b113ff982f979bb8c261e095fd282205f4afdcc7135248ec4d7cdc +SHA512 (evolution-3.32.1.tar.xz) = b50f0156970fb331ca39e8bb82a00565bb716ccaf13f3feecc4bdf8858b43b998464b0c4d06d0d430a385759bfb6f14a5d0fb6a030c68f80f00c91212eee0342 From 750c74c168ceb07538c1235e2ac0f4c4f8c05370 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 6 May 2019 13:46:13 +0200 Subject: [PATCH 4/8] Update to 3.32.2 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 4b00570..7fe5815 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ ### Abstract ### Name: evolution -Version: 3.32.1 +Version: 3.32.2 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -509,6 +509,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %endif %changelog +* Mon May 06 2019 Milan Crha - 3.32.2-1 +- Update to 3.32.2 + * Mon Apr 08 2019 Milan Crha - 3.32.1-1 - Update to 3.32.1 diff --git a/sources b/sources index d04ab03..f4cbf09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.32.1.tar.xz) = b50f0156970fb331ca39e8bb82a00565bb716ccaf13f3feecc4bdf8858b43b998464b0c4d06d0d430a385759bfb6f14a5d0fb6a030c68f80f00c91212eee0342 +SHA512 (evolution-3.32.2.tar.xz) = 15bba6f032dc11ec7bb69c8e04319277e94212b54826b45d7ff1d83e316097a3ffb9f4f25c21f8c3e03b0c66dc5555b519f7f305e25e8b3bed926f8fac585dea From ae24b9cf2584d182b8d6fa94993721245a72b2f2 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Jun 2019 17:30:22 +0200 Subject: [PATCH 5/8] Update to 3.32.3 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 7fe5815..5c9a5e6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ ### Abstract ### Name: evolution -Version: 3.32.2 +Version: 3.32.3 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -509,6 +509,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %endif %changelog +* Mon Jun 17 2019 Milan Crha - 3.32.3-1 +- Update to 3.32.3 + * Mon May 06 2019 Milan Crha - 3.32.2-1 - Update to 3.32.2 diff --git a/sources b/sources index f4cbf09..748e250 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.32.2.tar.xz) = 15bba6f032dc11ec7bb69c8e04319277e94212b54826b45d7ff1d83e316097a3ffb9f4f25c21f8c3e03b0c66dc5555b519f7f305e25e8b3bed926f8fac585dea +SHA512 (evolution-3.32.3.tar.xz) = 35c4152501e0341632792dff8304b984658734778a3dfcb556b586c46ed752a22b0b15348af6b324cf9ac7a4d51f761530283a06f1e6542941cd85c430ce2df8 From 03aab26fcb8208fcc2447ef95a40bcc64ff422bc Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 15 Jul 2019 11:48:29 +0200 Subject: [PATCH 6/8] Update to 3.32.4 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 5c9a5e6..1e9a37e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ ### Abstract ### Name: evolution -Version: 3.32.3 +Version: 3.32.4 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -509,6 +509,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %endif %changelog +* Mon Jul 15 2019 Milan Crha - 3.32.4-1 +- Update to 3.32.4 + * Mon Jun 17 2019 Milan Crha - 3.32.3-1 - Update to 3.32.3 diff --git a/sources b/sources index 748e250..40224a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.32.3.tar.xz) = 35c4152501e0341632792dff8304b984658734778a3dfcb556b586c46ed752a22b0b15348af6b324cf9ac7a4d51f761530283a06f1e6542941cd85c430ce2df8 +SHA512 (evolution-3.32.4.tar.xz) = a09ef7e39a73449a8a897c430fb97aadac01790d350b21e456d86cc785b67bdc2b542771ef9c6daa160fc0c1946b4a4e3eb9429a8ad1d69284698cbdb0ac4931 From c5e7e455a482412419bd348ad20b6337fd2ea08f Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 6 Aug 2019 15:59:49 +0200 Subject: [PATCH 7/8] Add changes related to Flatpak build --- evolution.spec | 46 ++++++++++++++++++++++++-- flatpak-evolution-fix-service-names.sh | 10 ++++++ flatpak-evolution-wrapper.sh.in | 33 ++++++++++++++++++ 3 files changed, 86 insertions(+), 3 deletions(-) create mode 100755 flatpak-evolution-fix-service-names.sh create mode 100644 flatpak-evolution-wrapper.sh.in diff --git a/evolution.spec b/evolution.spec index 1e9a37e..3a541b2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,6 +26,10 @@ # Coverity scan can override this to 0, to skip checking in gtk-doc generated code %{!?with_docs: %global with_docs 1} +%if 0%{?flatpak} +%global with_docs 0 +%endif + %define evo_plugin_dir %{_libdir}/evolution/plugins ### Abstract ### @@ -37,6 +41,8 @@ Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution Source: http://download.gnome.org/sources/%{name}/3.32/%{name}-%{version}.tar.xz +Source1: flatpak-evolution-fix-service-names.sh +Source2: flatpak-evolution-wrapper.sh.in ### Patches ### @@ -53,20 +59,26 @@ Obsoletes: evolution-tests <= 3.31.1 ## Dependencies ### +%if ! 0%{?flatpak} Requires: %{_bindir}/killall -Requires: evolution-data-server >= %{eds_version} Requires: gvfs +%endif +Requires: evolution-data-server >= %{eds_version} Requires: gtkspell3 Requires: highlight Requires: %{name}-langpacks = %{version}-%{release} ### Build Dependencies ### +%if ! 0%{?flatpak} BuildRequires: %{_bindir}/killall +%endif BuildRequires: cmake BuildRequires: gcc BuildRequires: gettext +%if %{with_docs} BuildRequires: gtk-doc +%endif BuildRequires: highlight BuildRequires: intltool >= %{intltool_version} BuildRequires: itstool @@ -76,7 +88,11 @@ BuildRequires: yelp-tools BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(cairo-gobject) BuildRequires: pkgconfig(camel-1.2) >= %{eds_version} +%if 0%{?flatpak} +BuildRequires: pkgconfig(enchant-2) +%else BuildRequires: pkgconfig(enchant) +%endif BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version} BuildRequires: pkgconfig(gcr-3) BuildRequires: pkgconfig(gdk-pixbuf-2.0) @@ -143,6 +159,8 @@ Obsoletes: libgal2-devel <= %{last_libgal2_version} %description devel Development files needed for building things which link against %{name}. +%if %{with_docs} + %package devel-docs Summary: Developer documentation for Evolution Requires: devhelp @@ -152,6 +170,8 @@ BuildArch: noarch %description devel-docs This package contains developer documentation for Evolution. +%endif + %package langpacks Summary: Translations for %{name} BuildArch: noarch @@ -217,6 +237,11 @@ for inbox in src/mail/default/*/Inbox; do echo -n "" > $inbox done +%if 0%{?flatpak} +mv data/org.gnome.Evolution.desktop.in.in data/org.gnome.Evolution.desktop.in.i +cat data/org.gnome.Evolution.desktop.in.i | sed -e "s/Icon=evolution/Icon=org.gnome.Evolution/" >data/org.gnome.Evolution.desktop.in.in +%endif + %build mkdir -p _build @@ -289,11 +314,18 @@ rm -rf $RPM_BUILD_ROOT cd _build make DESTDIR=$RPM_BUILD_ROOT install +%if 0%{?flatpak} +%{S:1} <%{S:2} >flatpak-evolution-wrapper.sh +chmod a+x flatpak-evolution-wrapper.sh +mv $RPM_BUILD_ROOT%{_bindir}/evolution $RPM_BUILD_ROOT%{_bindir}/evolution.bin +cp flatpak-evolution-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/evolution +%endif + %find_lang evolution --all-name --with-gnome -grep "/usr/share/locale" evolution.lang > translations.lang +grep "%{_datadir}/locale" evolution.lang > translations.lang %if %{with_docs} -grep -v "/usr/share/locale" evolution.lang > help.lang +grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %ldconfig_scriptlets @@ -329,6 +361,10 @@ grep -v "/usr/share/locale" evolution.lang > help.lang # The main executable %{_bindir}/evolution +%if 0%{?flatpak} +%{_bindir}/evolution.bin +%endif + %{_datadir}/metainfo/org.gnome.Evolution.appdata.xml # Desktop files: @@ -474,6 +510,8 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_libdir}/pkgconfig/evolution-shell-3.0.pc %{_libdir}/pkgconfig/libemail-engine.pc +%if %{with_docs} + %files devel-docs %doc %{_datadir}/gtk-doc/html/evolution-mail-composer %doc %{_datadir}/gtk-doc/html/evolution-mail-engine @@ -481,6 +519,8 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %doc %{_datadir}/gtk-doc/html/evolution-shell %doc %{_datadir}/gtk-doc/html/evolution-util +%endif + %files langpacks -f _build/translations.lang %if %{with_docs} diff --git a/flatpak-evolution-fix-service-names.sh b/flatpak-evolution-fix-service-names.sh new file mode 100755 index 0000000..9454543 --- /dev/null +++ b/flatpak-evolution-fix-service-names.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# see https://gitlab.gnome.org/GNOME/glib/issues/1737 +# previous versions used milliseconds instead of seconds as the timeout argument", +(`pkg-config --atleast-version 2.60.1 gio-2.0` || `pkg-config --atleast-version 2.61.0 gio-2.0`) && TIMEOUTMULT= || TIMEOUTMULT=000 + +sed -e "s|\@SOURCES_SERVICE\@|$(pkg-config --variable=sourcesdbusservicename evolution-data-server-1.2)|" \ + -e "s|\@ADDRESSBOOK_SERVICE\@|$(pkg-config --variable=addressbookdbusservicename evolution-data-server-1.2)|" \ + -e "s|\@CALENDAR_SERVICE\@|$(pkg-config --variable=calendardbusservicename evolution-data-server-1.2)|" \ + -e "s|\@TIMEOUTMULT\@|${TIMEOUTMULT}|" diff --git a/flatpak-evolution-wrapper.sh.in b/flatpak-evolution-wrapper.sh.in new file mode 100644 index 0000000..c57bfbe --- /dev/null +++ b/flatpak-evolution-wrapper.sh.in @@ -0,0 +1,33 @@ +#!/bin/bash + +if [ "$1" = "--quit" -o "$1" = "--force-shutdown" ]; then + /app/bin/evolution.bin "$@" +else + export BOGOFILTER_DIR="${XDG_DATA_HOME}/bogofilter/" + export GIO_USE_NETWORK_MONITOR=base + gsettings reset org.gnome.evolution-data-server network-monitor-gio-name + + gpg-agent --homedir ~/.gnupg --daemon --pinentry-program=/app/bin/pinentry + + LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l) + if [ "${LINES}" = "0" ]; then + /app/libexec/evolution-source-registry & + gdbus wait --session --timeout=1@TIMEOUTMULT@ @SOURCES_SERVICE@ + fi + + LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @ADDRESSBOOK_SERVICE@ | wc -l) + if [ "${LINES}" = "0" ]; then + /app/libexec/evolution-addressbook-factory -r & + gdbus wait --session --timeout=1@TIMEOUTMULT@ @ADDRESSBOOK_SERVICE@ + fi + + LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @CALENDAR_SERVICE@ | wc -l) + if [ "${LINES}" = "0" ]; then + /app/libexec/evolution-calendar-factory -r & + gdbus wait --session --timeout=1@TIMEOUTMULT@ @CALENDAR_SERVICE@ + fi + + /app/bin/evolution.bin "$@" + + pkill -TERM gpg-agent +fi From b8d9b1c1e5848c8c60413226fb62e67a1f073327 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 11 Nov 2019 11:12:28 +0100 Subject: [PATCH 8/8] Update to 3.32.5 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 3a541b2..b84082c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -35,7 +35,7 @@ ### Abstract ### Name: evolution -Version: 3.32.4 +Version: 3.32.5 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -549,6 +549,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Mon Nov 11 2019 Milan Crha - 3.32.5-1 +- Update to 3.32.5 + * Mon Jul 15 2019 Milan Crha - 3.32.4-1 - Update to 3.32.4 diff --git a/sources b/sources index 40224a5..05a1147 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.32.4.tar.xz) = a09ef7e39a73449a8a897c430fb97aadac01790d350b21e456d86cc785b67bdc2b542771ef9c6daa160fc0c1946b4a4e3eb9429a8ad1d69284698cbdb0ac4931 +SHA512 (evolution-3.32.5.tar.xz) = b77715d290ad3727a68416d425a19a0d10b5ebab69538d702008bc158fa70ea8bdb43f8cc55ebdf913f88ccf408df31ff5919ae5ccd3e94eeecd0f9f97592f96