Skip to content
Snippets Groups Projects
Commit 0b803cc1 authored by Evangelos Ribeiro Tzaras's avatar Evangelos Ribeiro Tzaras
Browse files

d/patches: Use newer libhandy and remove hacks

parent 5a7b6d1c
No related branches found
No related tags found
1 merge request!16d/patches: Use newer libhandy and remove hacks
Pipeline #66541 passed with stages
in 22 minutes and 45 seconds
From 0475949ee1a41e3a2b24681c6799f584c508ca0d Mon Sep 17 00:00:00 2001
From: Yuri Edward <yuri6037@outlook.com>
Date: Sat, 9 Jan 2021 22:24:11 +0100
Subject: [PATCH 1/3] Bump version of libhandy to 1.0 in order to fix issue
#305
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 85f256e9..3f2772d8 100644
--- a/meson.build
+++ b/meson.build
@@ -88,7 +88,7 @@ gthread = dependency('gthread-2.0', version: '>=' + target_glib)
iso_codes = dependency('iso-codes')
javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit)
json_glib = dependency('json-glib-1.0', version: '>= 1.0')
-libhandy = dependency('libhandy-1', version: '>= 0.90')
+libhandy = dependency('libhandy-1', version: '>= 1.0')
libmath = cc.find_library('m')
libpeas = dependency('libpeas-1.0', version: '>= 1.24.0')
libpeas_gtk = dependency('libpeas-gtk-1.0', version: '>= 1.24.0')
--
2.30.2
From f31164cc9bd71a5ba613b2323a462a829dea83aa Mon Sep 17 00:00:00 2001
From: Yuri Edward <yuri6037@outlook.com>
Date: Sun, 10 Jan 2021 23:54:46 +0100
Subject: [PATCH 3/3] Bumped version of libhandy to 1.0.1
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 3f2772d8..2ce78816 100644
--- a/meson.build
+++ b/meson.build
@@ -88,7 +88,7 @@ gthread = dependency('gthread-2.0', version: '>=' + target_glib)
iso_codes = dependency('iso-codes')
javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit)
json_glib = dependency('json-glib-1.0', version: '>= 1.0')
-libhandy = dependency('libhandy-1', version: '>= 1.0')
+libhandy = dependency('libhandy-1', version: '>= 1.0.1')
libmath = cc.find_library('m')
libpeas = dependency('libpeas-1.0', version: '>= 1.24.0')
libpeas_gtk = dependency('libpeas-gtk-1.0', version: '>= 1.24.0')
--
2.30.2
From b815ddf37030d7674a6cc5459af33d0bde4cf922 Mon Sep 17 00:00:00 2001
From: Yuri Edward <yuri6037@outlook.com>
Date: Sat, 9 Jan 2021 22:24:43 +0100
Subject: [PATCH 2/3] Removed hack/workarround for libhandy issue #305
---
src/client/application/application-client.vala | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala
index 0bd704fc..85af509f 100644
--- a/src/client/application/application-client.vala
+++ b/src/client/application/application-client.vala
@@ -935,15 +935,6 @@ public class Application.Client : Gtk.Application {
}
private MainWindow new_main_window(bool select_first_inbox) {
- // Work around warning caused by GNOME/libhandy#305 which
- // makes it a pita to run with G_DEBUG=fatal-warnings. Remove
- // once the fix for that issue has been released and packaged.
- GLib.Test.expect_message(
- "GLib-GObject",
- LEVEL_WARNING,
- "g_object_weak_unref: couldn't find weak ref *"
- );
-
MainWindow window = new MainWindow(this);
this.controller.register_window(window);
window.focus_in_event.connect(on_main_window_focus_in);
--
2.30.2
pureos/backport/Geary.Imap.FolderSession-Don-t-crash-on-empty-preview.patch
pureos/backport/Bump-version-of-libhandy-to-1.0-in-order-to-fix-issu.patch
pureos/backport/Removed-hack-workarround-for-libhandy-issue-305.patch
pureos/backport/Bumped-version-of-libhandy-to-1.0.1.patch
pureos/mr/Geary.RFC822.Message-Handle-0-size-of-body-and-header-in-.patch
pureos/mr/tests-Use-longer-timeout-for-client-tests.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment