Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package geary for openSUSE:Factory checked
in at 2023-04-03 17:46:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/geary (Old)
and /work/SRC/openSUSE:Factory/.geary.new.9019 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geary"
Mon Apr 3 17:46:21 2023 rev:61 rq:1076876 version:43.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/geary/geary.changes 2022-09-30
17:59:04.125412054 +0200
+++ /work/SRC/openSUSE:Factory/.geary.new.9019/geary.changes 2023-04-03
17:46:22.806137352 +0200
@@ -1,0 +2,9 @@
+Thu Mar 16 11:24:51 UTC 2023 - Bjørn Lie <bjorn....@gmail.com>
+
+- Add Support-GNOME-42-dark-theme-preference.patch: Support GNOME
+ 42 dark theme preference, patch taken from debian (also subbed
+ upstream, but not yet merged.
+- Add Support-dark-theme-webview.patch: Support dark mode in email
+ bodies, patch from upstream git, not yet merged.
+
+-------------------------------------------------------------------
New:
----
Support-GNOME-42-dark-theme-preference.patch
Support-dark-theme-webview.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ geary.spec ++++++
--- /var/tmp/diff_new_pack.8iP8sl/_old 2023-04-03 17:46:23.678618027 +0200
+++ /var/tmp/diff_new_pack.8iP8sl/_new 2023-04-03 17:46:23.686659323 +0200
@@ -1,7 +1,7 @@
#
# spec file for package geary
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,11 @@
# Source service, tracking git stable tags.
Source0: %{name}-%{version}.tar.xz
+# PATCH-FEATURE-OPENSUSE Support-GNOME-42-dark-theme-preference.patch --
Support GNOME 42 dark theme preference
+Patch0: Support-GNOME-42-dark-theme-preference.patch
+# PATCH-FEATURE-OPENSUSE Support-dark-theme-webview.patch -- Support dark mode
for email bodies
+Patch1: Support-dark-theme-webview.patch
+
BuildRequires: fdupes
BuildRequires: itstool
BuildRequires: meson
++++++ Support-GNOME-42-dark-theme-preference.patch ++++++
From: Jeremy Bicha <jbi...@debian.org>
Date: Tue, 15 Feb 2022 08:40:35 -0500
Subject: Support GNOME 42 dark theme preference
---
meson.build | 2 +-
src/client/application/application-client.vala | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index d563dd0..5b63b12 100644
--- a/meson.build
+++ b/meson.build
@@ -89,7 +89,7 @@ icu_uc = dependency('icu-uc', version: '>=60')
iso_codes = dependency('iso-codes')
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)
+libhandy = dependency('libhandy-1', version: '>= 1.6.0', required: false)
libmath = cc.find_library('m')
libpeas = dependency('libpeas-1.0', version: '>= 1.24.0')
libsecret = dependency('libsecret-1', version: '>= 0.11')
diff --git a/src/client/application/application-client.vala
b/src/client/application/application-client.vala
index 04b73f8..e098266 100644
--- a/src/client/application/application-client.vala
+++ b/src/client/application/application-client.vala
@@ -372,6 +372,8 @@ public class Application.Client : Gtk.Application {
// Calls Gtk.init(), amongst other things
base.startup();
Hdy.init();
+ Hdy.StyleManager.get_default().set_color_scheme(
+ Hdy.ColorScheme.PREFER_LIGHT);
this.engine = new Geary.Engine(get_resource_directory());
this.config = new Configuration(SCHEMA_ID);
++++++ Support-dark-theme-webview.patch ++++++
>From 39d975d0f49b38f313442184710a14c56fec2b18 Mon Sep 17 00:00:00 2001
From: mooff <mo...@together.beer>
Date: Mon, 23 Aug 2021 20:26:18 +0100
Subject: [PATCH 1/4] ui: Simplify style rules for body.plain in the composer
Setting these rules on `body.plain *` is not needed: they will cascade
quite happily on their own, with easier maintenance and readability for
humans
Also applies to rules whose values are unchanged from those on `body` -
better to keep these DRY
---
ui/composer-web-view.css | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
Index: geary-43.0/ui/composer-web-view.css
===================================================================
--- geary-43.0.orig/ui/composer-web-view.css
+++ geary-43.0/ui/composer-web-view.css
@@ -12,12 +12,8 @@ body {
font-size: medium !important;
}
-body.plain, body.plain * {
- font-family: monospace !important;
- font-weight: normal;
- font-style: normal;
- font-size: medium !important;
- color: black !important;
+body.plain {
+ font-family: monospace;
text-decoration: none;
}
@@ -25,6 +21,17 @@ body.plain a {
cursor: text;
}
+@media (prefers-color-scheme: dark) {
+ body {
+ color: #eeeeee;
+ background-color: #353535;
+ }
+
+ a {
+ color: #3484e4;
+ }
+}
+
body > *.geary-no-display {
display: none !important;
}
@@ -47,6 +54,12 @@ body > div:focus-within {
background-color: white;
}
+@media (prefers-color-scheme: dark) {
+ body > div:focus-within {
+ background-color: #393a3a;
+ }
+}
+
body > div#geary-signature:focus-within,
body > div#geary-quote:focus-within {
outline: 1px dashed #ccc !important;
Index: geary-43.0/src/client/accounts/accounts-signature-web-view.vala
===================================================================
--- geary-43.0.orig/src/client/accounts/accounts-signature-web-view.vala
+++ geary-43.0/src/client/accounts/accounts-signature-web-view.vala
@@ -12,18 +12,23 @@ public class Accounts.SignatureWebView :
private static WebKit.UserScript? app_script = null;
+ private static WebKit.UserStyleSheet? app_stylesheet = null;
public static new void load_resources()
throws GLib.Error {
SignatureWebView.app_script = Components.WebView.load_app_script(
"signature-web-view.js"
);
+ SignatureWebView.app_stylesheet =
Components.WebView.load_app_stylesheet(
+ "signature-web-view.css"
+ );
}
public SignatureWebView(Application.Configuration config) {
base(config);
this.user_content_manager.add_script(SignatureWebView.app_script);
+
this.user_content_manager.add_style_sheet(SignatureWebView.app_stylesheet);
}
}
Index: geary-43.0/ui/org.gnome.Geary.gresource.xml
===================================================================
--- geary-43.0.orig/ui/org.gnome.Geary.gresource.xml
+++ geary-43.0/ui/org.gnome.Geary.gresource.xml
@@ -47,6 +47,7 @@
<file compressed="true"
preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
<file compressed="true"
preprocess="xml-stripblanks">password-dialog.glade</file>
<file compressed="true"
preprocess="xml-stripblanks">problem-details-dialog.ui</file>
+ <file compressed="true">signature-web-view.css</file>
<file compressed="true">signature-web-view.js</file>
<file compressed="true">geary.css</file>
<file compressed="true">single-key-shortcuts.css</file>
Index: geary-43.0/ui/signature-web-view.css
===================================================================
--- /dev/null
+++ geary-43.0/ui/signature-web-view.css
@@ -0,0 +1,6 @@
+@media (prefers-color-scheme: dark) {
+ body {
+ color: #eeeeee;
+ background-color: #353535;
+ }
+}
Index: geary-43.0/ui/conversation-web-view.css
===================================================================
--- geary-43.0.orig/ui/conversation-web-view.css
+++ geary-43.0/ui/conversation-web-view.css
@@ -52,6 +52,24 @@ body {
height: auto !important;
}
+@media (prefers-color-scheme: dark) {
+ :root, body {
+ color: #eeeeee;
+ background-color: #353535;
+ }
+
+ /* Using :root here gives the selector enough specificity to
+ override the normal rule below without using !important */
+ :root .geary-quote-container {
+ color: #eeeeee;
+ background-color: #393c3c;
+ }
+
+ a {
+ color: #3484e4;
+ }
+}
+
table {
/* By default, tables reset the font properties to "normal" */
font-size: inherit;
