Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Librem5
Geary
Commits
cc4b5715
Commit
cc4b5715
authored
Jul 02, 2021
by
Guido Gunther
Browse files
Rediff patches
Get rid of the diff noise
parent
33d9c90f
Changes
3
Hide whitespace changes
Inline
Side-by-side
debian/patches/pureos/backport/Bump-version-of-libhandy-to-1.0-in-order-to-fix-issu.patch
View file @
cc4b5715
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
...
...
@@ -9,10 +8,10 @@ Subject: [PATCH 1/3] Bump version of libhandy to 1.0 in order to fix issue
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index
85f256e9..3f2772d8
100644
index
37b5270..2260724
100644
--- a/meson.build
+++ b/meson.build
@@ -8
8
,7 +8
8
,7 @@
gthread
= dependency('
gthread-2.0
', version: '>=
' + target_glib
)
@@ -8
9
,7 +8
9
,7 @@
icu_uc
= dependency('
icu-uc
', version: '>=
60'
)
iso_codes = dependency('iso-codes')
javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit)
json_glib = dependency('json-glib-1.0', version: '>= 1.0')
...
...
@@ -21,6 +20,3 @@ index 85f256e9..3f2772d8 100644
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
debian/patches/pureos/backport/Bumped-version-of-libhandy-to-1.0.1.patch
View file @
cc4b5715
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
...
...
@@ -8,10 +7,10 @@ Subject: [PATCH 3/3] Bumped version of libhandy to 1.0.1
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index
3f2772d8..2ce78816
100644
index
2260724..31a784e
100644
--- a/meson.build
+++ b/meson.build
@@ -8
8
,7 +8
8
,7 @@
gthread
= dependency('
gthread-2.0
', version: '>=
' + target_glib
)
@@ -8
9
,7 +8
9
,7 @@
icu_uc
= dependency('
icu-uc
', version: '>=
60'
)
iso_codes = dependency('iso-codes')
javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit)
json_glib = dependency('json-glib-1.0', version: '>= 1.0')
...
...
@@ -20,6 +19,3 @@ index 3f2772d8..2ce78816 100644
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
debian/patches/pureos/backport/Removed-hack-workarround-for-libhandy-issue-305.patch
View file @
cc4b5715
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
...
...
@@ -8,10 +7,10 @@ Subject: [PATCH 2/3] Removed hack/workarround for libhandy issue #305
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
index
19992ed..6191b85
100644
--- a/src/client/application/application-client.vala
+++ b/src/client/application/application-client.vala
@@ -93
5
,15 +93
5
,6 @@
public class Application.Client : Gtk.Application {
@@ -93
7
,15 +93
7
,6 @@
public class Application.Client : Gtk.Application {
}
private MainWindow new_main_window(bool select_first_inbox) {
...
...
@@ -27,6 +26,3 @@ index 0bd704fc..85af509f 100644
MainWindow window = new MainWindow(this);
this.controller.register_window(window);
window.focus_in_event.connect(on_main_window_focus_in);
--
2.30.2
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment