[packages/geary] - updated to 3.38.1 - updated meson patch

qboosh qboosh at pld-linux.org
Sun Oct 4 13:18:02 CEST 2020


commit ce2ebe97c5833b69b5abc385fe0300aeff2b6704
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Oct 4 13:21:05 2020 +0200

    - updated to 3.38.1
    - updated meson patch

 geary-meson.patch | 14 +++++++-------
 geary.spec        | 52 +++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 46 insertions(+), 20 deletions(-)
---
diff --git a/geary.spec b/geary.spec
index 11d826c..87adee3 100644
--- a/geary.spec
+++ b/geary.spec
@@ -2,33 +2,36 @@
 Summary:	Geary - mail client for GNOME 3
 Summary(pl.UTF-8):	Geary - klient pocztowy dla GNOME 3
 Name:		geary
-Version:	3.36.3.1
+Version:	3.38.1
 Release:	1
 License:	LGPL v2.1+
 Group:		X11/Applications/Mail
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/geary/3.36/%{name}-%{version}.tar.xz
-# Source0-md5:	4524cdcd81e2af7ccfd960acd3409819
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/geary/3.38/%{name}-%{version}.tar.xz
+# Source0-md5:	d095f766b72ca7c08d85064fcef5cc23
 Patch0:		%{name}-meson.patch
 URL:		https://wiki.gnome.org/Apps/Geary
 BuildRequires:	appstream-glib-devel >= 0.7.10
+BuildRequires:	cairo-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	enchant2-devel >= 2.1
 BuildRequires:	folks-devel >= 0.11
 BuildRequires:	gcr-devel >= 3.10.1
 BuildRequires:	gettext-tools
-BuildRequires:	glib2-devel >= 1:2.60.4
+BuildRequires:	glib2-devel >= 1:2.64
 BuildRequires:	gmime3-devel >= 3.2.4
 BuildRequires:	gnome-online-accounts-devel
 BuildRequires:	gspell-devel
+BuildRequires:	gsound-devel
 BuildRequires:	gtk+3-devel >= 3.24.7
 BuildRequires:	gtk-webkit4-devel >= 2.26
 BuildRequires:	iso-codes
 BuildRequires:	json-glib-devel >= 1.0
 BuildRequires:	libcanberra-devel >= 0.28
 BuildRequires:	libgee-devel >= 0.8.5
-BuildRequires:	libhandy-devel >= 0.0.10
+BuildRequires:	libhandy1-devel >= 0.90
 BuildRequires:	libnotify-devel >= 0.7.5
 BuildRequires:	libpeas-devel >= 1.24.0
+BuildRequires:	libpeas-gtk-devel >= 1.24.0
 BuildRequires:	libsecret-devel >= 0.11
 BuildRequires:	libsoup-devel >= 2.48
 BuildRequires:	libunwind-devel >= 1.1
@@ -40,7 +43,7 @@ BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	sqlite3-devel >= 3.24
 BuildRequires:	tar >= 1:1.22
-BuildRequires:	vala >= 0.22.1
+BuildRequires:	vala >= 0.48.6
 BuildRequires:	vala-folks >= 0.11
 BuildRequires:	vala-gcr >= 3.10.1
 BuildRequires:	vala-gmime3 >= 3.2.4
@@ -48,18 +51,18 @@ BuildRequires:	vala-gnome-online-accounts
 BuildRequires:	vala-gspell
 BuildRequires:	vala-libcanberra >= 0.28
 BuildRequires:	vala-libgee >= 0.8.5
-BuildRequires:	vala-libhandy >= 0.0.10
+BuildRequires:	vala-libhandy1 >= 0.90
 BuildRequires:	vala-libsecret >= 0.11
 BuildRequires:	valadoc
 BuildRequires:	xz
 Requires(post,postun):	desktop-file-utils
-Requires(post,postun):	glib2 >= 1:2.60.4
+Requires(post,postun):	glib2 >= 1:2.64
 Requires(post,postun):	gtk-update-icon-cache
 Requires:	appstream-glib >= 0.7.10
 Requires:	enchant2 >= 2.1
 Requires:	folks >= 0.11
 Requires:	gcr >= 3.10.1
-Requires:	glib2 >= 1:2.60.4
+Requires:	glib2 >= 1:2.64
 Requires:	gmime3 >= 3.2.4
 Requires:	gtk+3 >= 3.24.7
 Requires:	gtk-webkit4 >= 2.26
@@ -68,8 +71,9 @@ Requires:	iso-codes
 Requires:	json-glib >= 1.0
 Requires:	libcanberra >= 0.28
 Requires:	libgee >= 0.8.5
-Requires:	libhandy >= 0.0.10
+Requires:	libhandy1 >= 0.90
 Requires:	libpeas >= 1.24.0
+Requires:	libpeas-gtk >= 1.24.0
 Requires:	libsecret >= 0.11
 Requires:	libsoup >= 2.48
 Requires:	libunwind >= 1.1
@@ -95,12 +99,11 @@ interfejsem.
 
 %build
 %meson build \
+	--default-library=shared \
 	-Dvaladoc=true
 
 %ninja_build -C build
 
-%{__make}
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -126,16 +129,39 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING.{icons,snowball} NEWS README.md THANKS
 %attr(755,root,root) %{_bindir}/geary
 %dir %{_libdir}/geary
-%attr(755,root,root) %{_libdir}/geary/libgeary-client-3.36.so
+%attr(755,root,root) %{_libdir}/geary/libgeary-client-3.38.so
 %dir %{_libdir}/geary/web-extensions
 %attr(755,root,root) %{_libdir}/geary/web-extensions/libgeary-web-process.so
 %dir %{_libdir}/geary/plugins
+
 %dir %{_libdir}/geary/plugins/desktop-notifications
 %attr(755,root,root) %{_libdir}/geary/plugins/desktop-notifications/libdesktop-notifications.so
 %{_libdir}/geary/plugins/desktop-notifications/desktop-notifications.plugin
+
+%dir %{_libdir}/geary/plugins/email-templates
+%attr(755,root,root) %{_libdir}/geary/plugins/email-templates/libemail-templates.so
+%{_libdir}/geary/plugins/email-templates/email-templates.plugin
+
+%dir %{_libdir}/geary/plugins/folder-highlight
+%attr(755,root,root) %{_libdir}/geary/plugins/folder-highlight/libfolder-highlight.so
+%{_libdir}/geary/plugins/folder-highlight/folder-highlight.plugin
+
+%dir %{_libdir}/geary/plugins/mail-merge
+%attr(755,root,root) %{_libdir}/geary/plugins/mail-merge/libmail-merge.so
+%{_libdir}/geary/plugins/mail-merge/mail-merge.plugin
+
 %dir %{_libdir}/geary/plugins/notification-badge
 %attr(755,root,root) %{_libdir}/geary/plugins/notification-badge/libnotification-badge.so
 %{_libdir}/geary/plugins/notification-badge/notification-badge.plugin
+
+%dir %{_libdir}/geary/plugins/sent-sound
+%attr(755,root,root) %{_libdir}/geary/plugins/sent-sound/libsent-sound.so
+%{_libdir}/geary/plugins/sent-sound/sent-sound.plugin
+
+%dir %{_libdir}/geary/plugins/special-folders
+%attr(755,root,root) %{_libdir}/geary/plugins/special-folders/libspecial-folders.so
+%{_libdir}/geary/plugins/special-folders/special-folders.plugin
+
 %{_datadir}/dbus-1/services/org.gnome.Geary.service
 %{_datadir}/geary
 %{_datadir}/glib-2.0/schemas/org.gnome.Geary.gschema.xml
diff --git a/geary-meson.patch b/geary-meson.patch
index 77b4a9c..22bc618 100644
--- a/geary-meson.patch
+++ b/geary-meson.patch
@@ -1,11 +1,11 @@
---- geary-3.34.1/src/meson.build.orig	2019-11-23 14:57:07.207017030 +0100
-+++ geary-3.34.1/src/meson.build	2019-11-23 14:57:15.293639887 +0100
-@@ -38,7 +38,7 @@
+--- geary-3.38.0/src/meson.build.orig	2020-09-13 18:30:55.384204963 +0200
++++ geary-3.38.0/src/meson.build	2020-09-13 18:31:24.124049266 +0200
+@@ -63,7 +63,7 @@
  )
  
  # Web process extension library
--geary_web_process = library('geary-web-process',
-+geary_web_process = shared_library('geary-web-process',
-   geary_web_process_sources,
-   c_args: geary_c_options,
+-web_process = library('geary-web-process',
++web_process = shared_library('geary-web-process',
+   web_process_sources,
    dependencies: [
+     engine_dep,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/geary.git/commitdiff/ce2ebe97c5833b69b5abc385fe0300aeff2b6704



More information about the pld-cvs-commit mailing list