Accepting request 1318429 from GNOME:Apps

OBS-URL: https://build.opensuse.org/request/show/1318429
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/geary?expand=0&rev=70

Support-GNOME-42-dark-theme-preference.patch

@@ -1,35 +0,0 @@
-From: Jeremy Bicha <jbicha@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(-)
-
-Index: geary-44.0/meson.build
-===================================================================
---- geary-44.0.orig/meson.build
-+++ geary-44.0/meson.build
-@@ -89,7 +89,7 @@ icu_uc = dependency('icu-uc', version: '
- 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')
-Index: geary-44.0/src/client/application/application-client.vala
-===================================================================
---- geary-44.0.orig/src/client/application/application-client.vala
-+++ geary-44.0/src/client/application/application-client.vala
-@@ -372,6 +372,8 @@ public class Application.Client : Gtk.Ap
-         // 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

@@ -13,26 +13,11 @@ better to keep these DRY
  ui/composer-web-view.css | 8 ++------
  1 file changed, 2 insertions(+), 6 deletions(-)
 
-Index: geary-44.0/ui/composer-web-view.css
+Index: geary-46.0+61/ui/composer-web-view.css
 ===================================================================
---- geary-44.0.orig/ui/composer-web-view.css
-+++ geary-44.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 {
+--- geary-46.0+61.orig/ui/composer-web-view.css
++++ geary-46.0+61/ui/composer-web-view.css
+@@ -24,6 +24,17 @@ body.plain a {
    cursor: text;
  }
  
@@ -50,7 +35,7 @@ Index: geary-44.0/ui/composer-web-view.css
  body > *.geary-no-display {
    display: none !important;
  }
-@@ -47,6 +54,12 @@ body > div:focus-within {
+@@ -46,6 +57,12 @@ body > div:focus-within {
    background-color: white;
  }
  
@@ -63,10 +48,10 @@ Index: geary-44.0/ui/composer-web-view.css
  body > div#geary-signature:focus-within,
  body > div#geary-quote:focus-within {
    outline: 1px dashed #ccc !important;
-Index: geary-44.0/src/client/accounts/accounts-signature-web-view.vala
+Index: geary-46.0+61/src/client/accounts/accounts-signature-web-view.vala
 ===================================================================
---- geary-44.0.orig/src/client/accounts/accounts-signature-web-view.vala
-+++ geary-44.0/src/client/accounts/accounts-signature-web-view.vala
+--- geary-46.0+61.orig/src/client/accounts/accounts-signature-web-view.vala
++++ geary-46.0+61/src/client/accounts/accounts-signature-web-view.vala
 @@ -12,18 +12,23 @@ public class Accounts.SignatureWebView :
  
  
@@ -91,11 +76,11 @@ Index: geary-44.0/src/client/accounts/accounts-signature-web-view.vala
      }
  
  }
-Index: geary-44.0/ui/org.gnome.Geary.gresource.xml
+Index: geary-46.0+61/ui/org.gnome.Geary.gresource.xml
 ===================================================================
---- geary-44.0.orig/ui/org.gnome.Geary.gresource.xml
-+++ geary-44.0/ui/org.gnome.Geary.gresource.xml
-@@ -49,6 +49,7 @@
+--- geary-46.0+61.orig/ui/org.gnome.Geary.gresource.xml
++++ geary-46.0+61/ui/org.gnome.Geary.gresource.xml
+@@ -51,6 +51,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>
@@ -103,10 +88,10 @@ Index: geary-44.0/ui/org.gnome.Geary.gresource.xml
      <file compressed="true">signature-web-view.js</file>
      <file compressed="true">geary.css</file>
      <file compressed="true">single-key-shortcuts.css</file>
-Index: geary-44.0/ui/signature-web-view.css
+Index: geary-46.0+61/ui/signature-web-view.css
 ===================================================================
 --- /dev/null
-+++ geary-44.0/ui/signature-web-view.css
++++ geary-46.0+61/ui/signature-web-view.css
 @@ -0,0 +1,6 @@
 +@media (prefers-color-scheme: dark) {
 +  body {
@@ -114,11 +99,11 @@ Index: geary-44.0/ui/signature-web-view.css
 +    background-color: #353535;
 +  }
 +}
-Index: geary-44.0/ui/conversation-web-view.css
+Index: geary-46.0+61/ui/conversation-web-view.css
 ===================================================================
---- geary-44.0.orig/ui/conversation-web-view.css
-+++ geary-44.0/ui/conversation-web-view.css
-@@ -52,6 +52,24 @@ body {
+--- geary-46.0+61.orig/ui/conversation-web-view.css
++++ geary-46.0+61/ui/conversation-web-view.css
+@@ -40,6 +40,24 @@ body {
    height: auto !important;
  }
  

_service

@@ -3,17 +3,17 @@
   <service name="obs_scm" mode="manual">
     <param name="scm">git</param>
     <param name="url">https://gitlab.gnome.org/GNOME/geary.git</param>
-    <param name="revision">46.0</param>
+    <param name="revision">746efdc41baee416dfbb8f67b00e9667809829c9</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
 <!--    <param name="versionrewrite-pattern">gnome-(.*)</param> -->
     <param name="versionrewrite-pattern">(.*)\+0</param>
     <param name="versionrewrite-replacement">\1</param>
-<!--    <param name="changesgenerate">enable</param> -->
+    <param name="changesgenerate">enable</param>
   </service>
   <service name="tar" mode="buildtime"/>
   <service name="recompress" mode="buildtime">
     <param name="file">*.tar</param>
-    <param name="compression">xz</param>
+    <param name="compression">zst</param>
   </service>
   <service name="set_version" mode="manual" />
 </services>

_servicedata

@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">https://gitlab.gnome.org/GNOME/geary.git</param>
+              <param name="changesrevision">746efdc41baee416dfbb8f67b00e9667809829c9</param></service></servicedata>

geary-46.0+61.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:333d278e4112c5f33a6cb636d3ce4580be044d0acaecd77be69f646b1d70fdd5
+size 13599245

geary-46.0.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e6ede5d51f7437fe5b2f66d2cf29d0a49c99a417973ee91bf9971422f08c7ef7
-size 13257229

geary.changes

@@ -1,3 +1,61 @@
+-------------------------------------------------------------------
+Fri Nov 07 09:39:11 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 46.0+61:
+  * client: conversation-list: Show recipients in Sent folder
+  * engine: Detect mime encoding constraint from server EHLO
+  * feat: Use DarkReader for dark mode emails
+  * tests: Fix ImapDB test after C.UTF-8 change
+  * desktop: Rename appdata to metainfo
+  * make sure the C.UTF-8 locale is installed on the system
+  * migrate locale from en_US.UTF-8 to C.UTF-8
+  * chore: Remove trailing newline
+  * dev: Add .editorconfig for consistent file formatting
+  * Update BUILDING.md
+  * client: Go to next pane once something has been selected
+  * Support GNOME 42 dark theme preference
+  * build: Set minimum libhandy to 1.6
+  * client: Support Dark Mode
+  * Implement dark mode using color-scheme CSS property
+  * ui: Simplify style rules for body.plain in the composer
+  * client: Fix invalid conversion from points to pixels
+  * fix(ci): Allow flatpak build to fail
+  * Added close quote in ca.po
+  * client: Fix incorrect height being set for a WebView, when
+    using font scaling
+  * Updated translations.
+- Drop patch merged upstream:
+  * Support-GNOME-42-dark-theme-preference.patch
+- Rebase patch partly merged upstream:
+  * Support-dark-theme-webview.patch
+
+-------------------------------------------------------------------
+Fri Mar 07 07:39:11 UTC 2025 - bjorn.lie@gmail.com
+
+- Update to version 46.0+24:
+  * Move screenshots from wiki.gnome.org
+  * build: Use appstream for appdata validation test
+  * flatpak: folks now uses main instead of master
+  * appdata: Fix bugtracker URL
+  * Updated translations.
+- Drop update-desktop-files and pkgconfig(appstream-glib)
+  BuildRequires following upstream changes and deprecation of
+  update-desktop-files.
+- Add desktop-file-utils BuildRequires.
+
+-------------------------------------------------------------------
+Thu Oct 03 15:07:07 UTC 2024 - bjorn.lie@gmail.com
+
+- Update to version 46.0+16:
+  * flatpak: Add appstream-glib module
+  * flatpak: Update gmime module
+  * Set prgname to application ID
+  * flatpak: gspell switched to meson on master
+  * ci: Use dbus-run-session for tests
+  * flatpak: Bump libsecret version
+  * Fix crash with drag-and-drop in conversations view
+  * Updated translations.
+
 -------------------------------------------------------------------
 Tue May 21 11:03:12 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

geary.obsinfo

@@ -1,4 +1,4 @@
 name: geary
-version: 46.0
-mtime: 1716195993
-commit: 46e93c0c0dafc381e8a308b1befb07e908121722
+version: 46.0+61
+mtime: 1761553381
+commit: 746efdc41baee416dfbb8f67b00e9667809829c9

geary.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package geary
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,28 +17,23 @@
 
 
 Name:           geary
-Version:        46.0
+Version:        46.0+61
 Release:        0
 Summary:        An email reader for the GNOME desktop
 License:        BSD-2-Clause AND CC-BY-3.0 AND LGPL-2.1-or-later
 Group:          Productivity/Networking/Email/Clients
 URL:            https://wiki.gnome.org/Apps/Geary
-# 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
+Source0:        %{name}-%{version}.tar.zst
 # PATCH-FEATURE-OPENSUSE Support-dark-theme-webview.patch -- Support dark mode for email bodies
 Patch1:         Support-dark-theme-webview.patch
 
+BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  itstool
 BuildRequires:  meson
 BuildRequires:  pkgconfig
 BuildRequires:  snowball-devel
-BuildRequires:  update-desktop-files
 BuildRequires:  xml2po
-BuildRequires:  pkgconfig(appstream-glib)
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(enchant-2) >= 2.1
 BuildRequires:  pkgconfig(folks)
@@ -92,7 +87,6 @@ export CFLAGS="%{optflags} -Wno-error=return-type"
 
 %install
 %meson_install
-%suse_update_desktop_file org.gnome.Geary
 %find_lang %{name} %{?no_lang_C}
 %fdupes %{buildroot}%{_datadir}
 
@@ -107,8 +101,7 @@ export CFLAGS="%{optflags} -Wno-error=return-type"
 %{_libdir}/%{name}/plugins/
 %dir %{_libdir}/%{name}/web-extensions
 %{_libdir}/%{name}/web-extensions/libgeary-web-process.so
-%dir %{_datadir}/metainfo
-%{_datadir}/metainfo/org.gnome.Geary.appdata.xml
+%{_datadir}/metainfo/org.gnome.Geary.metainfo.xml
 %{_datadir}/applications/org.gnome.Geary.desktop
 %{_datadir}/applications/geary-autostart.desktop
 %{_datadir}/icons/hicolor/