Notification time stamped 2022-09-30 21:14:34 UTC
From e07930fffbd0cd4d124c1edf5ab69f2585cf9166 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember(a)redhat.com>
Date: Sep 30 2022 21:13:56 +0000
Subject: Update to 43.0
---
diff --git a/0f75e7a8.patch b/0f75e7a8.patch
deleted file mode 100644
index 390cc5b..0000000
--- a/0f75e7a8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 0f75e7a84a39492d0748cec2ba6028e08cae3644
-Author: Rico Tzschichholz <ricotz(a)ubuntu.com>
-Date: Sun Jan 30 19:54:11 2022
-
- Util.Cache.Lru: Workaround missing generic type argument
-
-diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala
-index f054e32e5..ecc275e84 100644
---- a/src/client/util/util-cache.vala
-+++ b/src/client/util/util-cache.vala
-@@ -12,7 +12,7 @@ public class Util.Cache.Lru<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> b) {
-+ public static int lru_compare(CacheEntry a, CacheEntry b) {
- if (a.key == b.key) {
- return 0;
- }
diff --git a/1c1912d0.patch b/1c1912d0.patch
deleted file mode 100644
index a7310d2..0000000
--- a/1c1912d0.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 1c1912d0061bb59525b870767d08b16c09acc8da Mon Sep 17 00:00:00 2001
-From: Michael Gratton <mike(a)vee.net>
-Date: Sat, 15 May 2021 22:14:49 +1000
-Subject: [PATCH] build: Remove explicit libsoup dependency
-
-Replace all uses of libsoup with their GLib equivalents, and remove the
-build dependency.
-
-See GNOME/gnome-build-meta#378
----
- meson.build | 1 -
- src/client/components/components-web-view.vala | 5 +----
- src/client/composer/composer-link-popover.vala | 10 +++++++---
- .../conversation-viewer/conversation-message.vala | 8 ++++----
- src/client/meson.build | 1 -
- src/client/plugin/meson.build | 1 -
- src/client/web-process/web-process-extension.vala | 7 ++++++-
- src/meson.build | 1 -
- 8 files changed, 18 insertions(+), 16 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index d0af9eef8..233e8c56b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -95,7 +95,6 @@ libpeas = dependency('libpeas-1.0', version: '>=
1.24.0')
- libpeas_gtk = dependency('libpeas-gtk-1.0', version: '>= 1.24.0')
- libsecret = dependency('libsecret-1', version: '>= 0.11')
- libstemmer_dep = cc.find_library('stemmer')
--libsoup = dependency('libsoup-2.4', version: '>= 2.48')
- libunwind_dep = dependency(
- 'libunwind', version: '>= 1.1', required:
get_option('libunwind')
- )
-diff --git a/src/client/components/components-web-view.vala
b/src/client/components/components-web-view.vala
-index fe3c036d2..4ec857f92 100644
---- a/src/client/components/components-web-view.vala
-+++ b/src/client/components/components-web-view.vala
-@@ -696,7 +696,7 @@ public abstract class Components.WebView : WebKit.WebView,
Geary.BaseInterface {
- }
-
- private bool handle_internal_response(WebKit.URISchemeRequest request) {
-- string name = soup_uri_decode(request.get_path());
-+ string name = GLib.Uri.unescape_string(request.get_path());
- Geary.Memory.Buffer? buf = this.internal_resources[name];
- bool handled = false;
- if (buf != null) {
-@@ -853,6 +853,3 @@ public abstract class Components.WebView : WebKit.WebView,
Geary.BaseInterface {
- }
-
- }
--
--// XXX this needs to be moved into the libsoup bindings
--extern string soup_uri_decode(string part);
-diff --git a/src/client/composer/composer-link-popover.vala
b/src/client/composer/composer-link-popover.vala
-index 63ec71ee5..c4bc3d963 100644
---- a/src/client/composer/composer-link-popover.vala
-+++ b/src/client/composer/composer-link-popover.vala
-@@ -52,7 +52,7 @@ public class Composer.LinkPopover : Gtk.Popover {
-
-
- /** Emitted when the link URL has changed. */
-- public signal void link_changed(Soup.URI? uri, bool is_valid);
-+ public signal void link_changed(GLib.Uri? uri, bool is_valid);
-
- /** Emitted when the link URL was activated. */
- public signal void link_activate();
-@@ -99,9 +99,13 @@ public class Composer.LinkPopover : Gtk.Popover {
- bool is_valid = false;
- bool is_nominal = false;
- bool is_mailto = false;
-- Soup.URI? url = null;
-+ GLib.Uri? url = null;
- if (!is_empty) {
-- url = new Soup.URI(text);
-+ try {
-+ url = GLib.Uri.parse(text, PARSE_RELAXED);
-+ } catch (GLib.UriError err) {
-+ debug("Invalid link URI: %s", err.message);
-+ }
- if (url != null) {
- is_valid = true;
-
-diff --git a/src/client/conversation-viewer/conversation-message.vala
b/src/client/conversation-viewer/conversation-message.vala
-index c15f3f8fc..d7492b9f8 100644
---- a/src/client/conversation-viewer/conversation-message.vala
-+++ b/src/client/conversation-viewer/conversation-message.vala
-@@ -1335,16 +1335,16 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface
{
- string href,
- Gdk.Rectangle location) {
- string text_href = text;
-- if (Uri.parse_scheme(text_href) == null) {
-+ if (GLib.Uri.parse_scheme(text_href) == null) {
- text_href = "http://" + text_href;
- }
-- string text_label = Soup.URI.decode(text_href);
-+ string? text_label = GLib.Uri.unescape_string(text_href) ??
_("(unknown)");
-
- string anchor_href = href;
-- if (Uri.parse_scheme(anchor_href) == null) {
-+ if (GLib.Uri.parse_scheme(anchor_href) == null) {
- anchor_href = "http://" + anchor_href;
- }
-- string anchor_label = Soup.URI.decode(anchor_href);
-+ string anchor_label = GLib.Uri.unescape_string(anchor_href) ??
_("(unknown)");
-
- Gtk.Builder builder = new Gtk.Builder.from_resource(
- "/org/gnome/Geary/conversation-message-link-popover.ui"
-diff --git a/src/client/meson.build b/src/client/meson.build
-index ff3c8a6d3..ba151e420 100644
---- a/src/client/meson.build
-+++ b/src/client/meson.build
-@@ -168,7 +168,6 @@ client_dependencies = [
- libpeas,
- libpeas_gtk,
- libsecret,
-- libsoup,
- libxml,
- posix,
- webkit2gtk,
-diff --git a/src/client/plugin/meson.build b/src/client/plugin/meson.build
-index e6db08535..b795237e8 100644
---- a/src/client/plugin/meson.build
-+++ b/src/client/plugin/meson.build
-@@ -16,7 +16,6 @@ plugin_dependencies = [
- libhandy,
- libmath,
- libpeas,
-- libsoup,
- webkit2gtk,
- ]
-
-diff --git a/src/client/web-process/web-process-extension.vala
b/src/client/web-process/web-process-extension.vala
-index c36c4e28d..dc686350a 100644
---- a/src/client/web-process/web-process-extension.vala
-+++ b/src/client/web-process/web-process-extension.vala
-@@ -68,7 +68,12 @@ public class GearyWebExtension : Object {
- WebKit.URIRequest request,
- WebKit.URIResponse? response) {
- bool should_load = false;
-- Soup.URI? uri = new Soup.URI(request.get_uri());
-+ GLib.Uri? uri = null;
-+ try {
-+ uri = GLib.Uri.parse(request.get_uri(), NONE);
-+ } catch (GLib.UriError err) {
-+ warning("Invalid request URI: %s", err.message);
-+ }
- if (uri != null && uri.get_scheme() in ALLOWED_SCHEMES) {
- // Always load internal resources
- should_load = true;
-diff --git a/src/meson.build b/src/meson.build
-index 5eded12e6..4e7752ab9 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -107,7 +107,6 @@ bin_dependencies = [
- libhandy,
- libmath,
- libpeas,
-- libsoup,
- webkit2gtk,
- ]
-
---
-GitLab
-
diff --git a/796845aa.patch b/796845aa.patch
deleted file mode 100644
index 2704525..0000000
--- a/796845aa.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 796845aaa7148076132af0ff074e9218d0c3f8b8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Bellegarde?= <cedric.bellegarde(a)adishatz.org>
-Date: Wed, 13 Jul 2022 20:10:02 +0200
-Subject: [PATCH] build: Fix building against libsoup3
-
-- Move to WebKitGTK 4.1
-- Remove commit hold on EDS
----
- meson.build | 6 +++---
- org.gnome.Geary.json | 4 +---
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 92b987925..27043e575 100644
---- a/meson.build
-+++ b/meson.build
-@@ -67,7 +67,7 @@ glib = dependency('glib-2.0', version: '>=' +
target_glib)
- gmime = dependency('gmime-3.0', version: '>= 3.2.4')
- gtk = dependency('gtk+-3.0', version: '>=' + target_gtk)
- sqlite = dependency('sqlite3', version: '>= 3.24')
--webkit2gtk = dependency('webkit2gtk-4.0', version: '>=' +
target_webkit)
-+webkit2gtk = dependency('webkit2gtk-4.1', version: '>=' +
target_webkit)
-
- # Secondary deps - keep sorted alphabetically
- # We need appdata.its from appstream-glib:
-@@ -87,7 +87,7 @@ gspell = dependency('gspell-1')
- gthread = dependency('gthread-2.0', version: '>=' + target_glib)
- icu_uc = dependency('icu-uc', version: '>=60')
- iso_codes = dependency('iso-codes')
--javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>='
+ target_webkit)
-+javascriptcoregtk = dependency('javascriptcoregtk-4.1', version: '>='
+ target_webkit)
- json_glib = dependency('json-glib-1.0', version: '>= 1.0')
- libhandy = dependency('libhandy-1', version: '>= 1.2.1', required:
false)
- libmath = cc.find_library('m')
-@@ -103,7 +103,7 @@ libunwind_generic_dep = dependency(
- libxml = dependency('libxml-2.0', version: '>= 2.7.8')
- libytnef = dependency('libytnef', version: '>= 1.9.3', required:
get_option('tnef'))
- posix = valac.find_library('posix')
--webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.0', version:
'>=' + target_webkit)
-+webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.1', version:
'>=' + target_webkit)
-
- # System dependencies above ensures appropriate versions for the
- # following libraries, but the declared dependency is what we actually
---
-GitLab
-
diff --git a/9bd4c829.patch b/9bd4c829.patch
deleted file mode 100644
index 2d071a1..0000000
--- a/9bd4c829.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz(a)ubuntu.com>
-Date: Tue, 30 Nov 2021 15:31:31 +0100
-Subject: [PATCH] Fix accessibility issues with initializer of constants
-
----
- src/client/application/application-client.vala | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/client/application/application-client.vala
b/src/client/application/application-client.vala
-index 6ce19ce2a..e6ba85331 100644
---- a/src/client/application/application-client.vala
-+++ b/src/client/application/application-client.vala
-@@ -8,16 +8,16 @@
-
- // Defined by CMake build script.
- extern const string GETTEXT_PACKAGE;
--extern const string _APP_ID;
--extern const string _BUILD_ROOT_DIR;
--extern const string _GSETTINGS_DIR;
--extern const string _INSTALL_PREFIX;
--extern const string _NAME_SUFFIX;
-+public extern const string _APP_ID;
-+public extern const string _BUILD_ROOT_DIR;
-+public extern const string _GSETTINGS_DIR;
-+public extern const string _INSTALL_PREFIX;
-+public extern const string _NAME_SUFFIX;
- extern const string _PLUGINS_DIR;
- extern const string _PROFILE;
- extern const string _REVNO;
--extern const string _SOURCE_ROOT_DIR;
--extern const string _VERSION;
-+public extern const string _SOURCE_ROOT_DIR;
-+public extern const string _VERSION;
- extern const string _WEB_EXTENSIONS_DIR;
-
-
---
-GitLab
-
diff --git a/geary.spec b/geary.spec
index 68bc065..978c1f5 100644
--- a/geary.spec
+++ b/geary.spec
@@ -1,8 +1,8 @@
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: geary
-Version: 40.0
-Release: 9%{?dist}
+Version: 43.0
+Release: 1%{?dist}
Summary: A lightweight email program designed around conversations
# Geary is under LGPLv2+.
# SQLite3-unicodesn code is in the Public Domain.
@@ -15,14 +15,7 @@ Summary: A lightweight email program designed around conversations
# the whole binary, so we don't need to specify BSD and MIT separately.
License: LGPLv2+ and CC-BY and CC-BY-SA and Public Domain
URL:
https://wiki.gnome.org/Apps/Geary
-Source0:
https://download.gnome.org/sources/geary/40/%{name}-%{tarball_version}.ta...
-# Fix accessibility issues with initializer of constants
-Patch0: 9bd4c829.patch
-# Workaround missing generic type argument
-Patch1: 0f75e7a8.patch
-# Build against libsoup 3
-Patch2: 1c1912d0.patch
-Patch3: 796845aa.patch
+Source0:
https://download.gnome.org/sources/geary/43/%{name}-%{tarball_version}.ta...
BuildRequires: meson >= 0.49
BuildRequires: vala >= 0.26.0
@@ -50,7 +43,7 @@ BuildRequires: pkgconfig(gspell-1)
BuildRequires: pkgconfig(gthread-2.0) >= 2.54
BuildRequires: pkgconfig(icu-uc)
BuildRequires: pkgconfig(iso-codes)
-BuildRequires: pkgconfig(javascriptcoregtk-4.0) >= 2.24
+BuildRequires: pkgconfig(javascriptcoregtk-4.1)
BuildRequires: pkgconfig(json-glib-1.0) >= 1.0
BuildRequires: pkgconfig(libhandy-1) >= 1.2.1
BuildRequires: pkgconfig(libpeas-1.0)
@@ -60,7 +53,7 @@ BuildRequires: pkgconfig(libunwind) >= 1.1
BuildRequires: pkgconfig(libunwind-generic) >= 1.1
BuildRequires: pkgconfig(libxml-2.0) >= 2.7.8
BuildRequires: pkgconfig(libytnef) >= 1.9.3
-BuildRequires: pkgconfig(webkit2gtk-web-extension-4.0) >= 2.24
+BuildRequires: pkgconfig(webkit2gtk-web-extension-4.1)
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -119,6 +112,9 @@ popd
%changelog
+* Fri Sep 30 2022 Kalev Lember <klember(a)redhat.com> - 43.0-1
+- Update to 43.0
+
* Thu Aug 18 2022 Kalev Lember <klember(a)redhat.com> - 40.0-9
- Build against libsoup 3 (rhbz#2119119)
diff --git a/sources b/sources
index 400f344..ef17326 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (geary-40.0.tar.xz) =
d31716121be63a9d39caf4bffacce0109cebcc8048127c37fac6969b4103ab2cf12aac9bed73623b0f3baf7f39996b8f0b0fe9b57968054d51ae3e209f6b1522
+SHA512 (geary-43.0.tar.xz) =
71bf774aa27d4edef61932197bbf9b58b67ace8dd7969c4669fcd45e33c05a08d3d6eae280ea6a7e9f58db626f541f15b0f0d33f3162bef5fd21a368122dbba0
https://src.fedoraproject.org/rpms/geary/c/e07930fffbd0cd4d124c1edf5ab69f...