Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package gthumb for openSUSE:Factory checked 
in at 2023-07-19 19:10:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gthumb (Old)
 and      /work/SRC/openSUSE:Factory/.gthumb.new.5570 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gthumb"

Wed Jul 19 19:10:34 2023 rev:114 rq:1099348 version:3.12.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/gthumb/gthumb.changes    2023-07-05 
16:04:59.542817495 +0200
+++ /work/SRC/openSUSE:Factory/.gthumb.new.5570/gthumb.changes  2023-07-19 
19:10:36.700558303 +0200
@@ -1,0 +2,8 @@
+Fri Jul 14 13:42:16 UTC 2023 - Muhammad Akbar Yanuar Mantari <mantari...@pm.me>
+
+- Add pkgconfig(libjxl) BuildRequires: enable JPEG XL image
+  support.
+- Add c97a8aaa.patch: desktop background: fixed when using the dark
+  color scheme
+
+-------------------------------------------------------------------

New:
----
  c97a8aaa.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gthumb.spec ++++++
--- /var/tmp/diff_new_pack.m9t2st/_old  2023-07-19 19:10:37.428562561 +0200
+++ /var/tmp/diff_new_pack.m9t2st/_new  2023-07-19 19:10:37.432562585 +0200
@@ -29,6 +29,8 @@
 Patch0:         https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22.patch
 # PATCH-FIX-UPSTREAM 3376550a.patch -- exiv2: added support for version 0.28
 Patch1:         https://gitlab.gnome.org/GNOME/gthumb/-/commit/3376550a.patch
+# PATCH-FIX-UPSTREAM c97a8aaa.patch desktop background: fixed when using the 
dark color scheme
+Patch2:         https://gitlab.gnome.org/GNOME/gthumb/-/commit/c97a8aaa.patch
 
 BuildRequires:  AppStream
 BuildRequires:  bison
@@ -62,6 +64,7 @@
 BuildRequires:  pkgconfig(lcms2) >= 2.6
 BuildRequires:  pkgconfig(libbrasero-burn3) >= 3.2.0
 BuildRequires:  pkgconfig(libheif) >= 1.11
+BuildRequires:  pkgconfig(libjxl)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libraw) >= 0.14
 BuildRequires:  pkgconfig(librsvg-2.0) >= 2.34.0

++++++ c97a8aaa.patch ++++++
>From c97a8aaa6ca23800bfce6eda62f2fc9719c0fd58 Mon Sep 17 00:00:00 2001
From: Paolo Bacchilega <pao...@src.gnome.org>
Date: Wed, 10 Aug 2022 12:09:24 +0200
Subject: [PATCH] desktop background: fixed when using the dark color scheme

Set the dark variant as well.
---
 extensions/desktop_background/actions.c | 64 ++++++++++++++++++-------
 1 file changed, 47 insertions(+), 17 deletions(-)

diff --git a/extensions/desktop_background/actions.c 
b/extensions/desktop_background/actions.c
index e0ac853ae..c22e7a772 100644
--- a/extensions/desktop_background/actions.c
+++ b/extensions/desktop_background/actions.c
@@ -31,6 +31,7 @@
 #define DESKTOP_BACKGROUND_PROPERTIES_UNITY_COMMAND "unity-control-center 
appearance"
 #define DESKTOP_BACKGROUND_SCHEMA "org.gnome.desktop.background"
 #define DESKTOP_BACKGROUND_FILE_KEY "picture-uri"
+#define DESKTOP_BACKGROUND_FILE_DARK_KEY "picture-uri-dark"
 #define DESKTOP_BACKGROUND_STYLE_KEY "picture-options"
 
 
@@ -47,6 +48,8 @@ typedef enum {
 
 typedef struct {
        GFile           *file;
+       GFile           *file_light;
+       GFile           *file_dark;
        BackgroundStyle  background_style;
 } WallpaperStyle;
 
@@ -63,6 +66,8 @@ static void
 wallpaper_style_init (WallpaperStyle *style)
 {
        style->file = NULL;
+       style->file_light = NULL;
+       style->file_dark = NULL;
        style->background_style = BACKGROUND_STYLE_WALLPAPER;
 }
 
@@ -74,11 +79,17 @@ wallpaper_style_init_from_current (WallpaperStyle *style)
        char      *uri;
 
        settings = g_settings_new (DESKTOP_BACKGROUND_SCHEMA);
+
        uri = g_settings_get_string (settings, DESKTOP_BACKGROUND_FILE_KEY);
-       style->file = (uri != NULL) ? g_file_new_for_uri (uri) : NULL;
-       style->background_style = g_settings_get_enum (settings, 
DESKTOP_BACKGROUND_STYLE_KEY);
+       style->file_light = (uri != NULL) ? g_file_new_for_uri (uri) : NULL;
+       g_free (uri);
 
+       uri = g_settings_get_string (settings, 
DESKTOP_BACKGROUND_FILE_DARK_KEY);
+       style->file_dark = (uri != NULL) ? g_file_new_for_uri (uri) : NULL;
        g_free (uri);
+
+       style->background_style = g_settings_get_enum (settings, 
DESKTOP_BACKGROUND_STYLE_KEY);
+
        g_object_unref (settings);
 }
 
@@ -86,23 +97,26 @@ wallpaper_style_init_from_current (WallpaperStyle *style)
 static void
 wallpaper_style_set_as_current (WallpaperStyle *style)
 {
-       char *uri;
+       GSettings *settings;
+       char      *uri_light;
+       char      *uri_dark;
 
-       if (style->file == NULL)
-               return;
+       settings = g_settings_new (DESKTOP_BACKGROUND_SCHEMA);
 
-       uri = g_file_get_uri (style->file);
-       if (uri != NULL) {
-               GSettings *settings;
+       uri_light = (style->file_light != NULL) ? g_file_get_uri 
(style->file_light) : NULL;
+       if (uri_light != NULL)
+               g_settings_set_string (settings, DESKTOP_BACKGROUND_FILE_KEY, 
uri_light);
 
-               settings = g_settings_new (DESKTOP_BACKGROUND_SCHEMA);
-               g_settings_set_string (settings, DESKTOP_BACKGROUND_FILE_KEY, 
uri);
-               g_settings_set_enum (settings, DESKTOP_BACKGROUND_STYLE_KEY, 
style->background_style);
+       uri_dark = (style->file_dark != NULL) ? g_file_get_uri 
(style->file_dark) : NULL;
+       if (uri_dark != NULL)
+               g_settings_set_string (settings, 
DESKTOP_BACKGROUND_FILE_DARK_KEY, uri_dark);
 
-               g_object_unref (settings);
-       }
+       if ((uri_light != NULL) || (uri_dark != NULL))
+               g_settings_set_enum (settings, DESKTOP_BACKGROUND_STYLE_KEY, 
style->background_style);
 
-       g_free (uri);
+       g_free (uri_dark);
+       g_free (uri_light);
+       g_object_unref (settings);
 }
 
 
@@ -110,6 +124,8 @@ static void
 wallpaper_style_free (WallpaperStyle *style)
 {
        _g_object_unref (style->file);
+       _g_object_unref (style->file_light);
+       _g_object_unref (style->file_dark);
        wallpaper_style_init (style);
 }
 
@@ -232,6 +248,21 @@ get_new_wallpaper_file_finish (GAsyncResult  *result,
 }
 
 
+static void
+wallpaper_data_set_new_style_file (WallpaperData *wdata,
+                                  GFile         *file)
+{
+       _g_object_unref (wdata->new_style.file);
+       wdata->new_style.file = g_object_ref (file);
+
+       _g_object_unref (wdata->new_style.file_dark);
+       wdata->new_style.file_dark = g_object_ref (file);
+
+       _g_object_unref (wdata->new_style.file_light);
+       wdata->new_style.file_light = g_object_ref (file);
+}
+
+
 static WallpaperData *
 wallpaper_data_new (GthBrowser *browser,
                    GFile      *wallpaper_file)
@@ -242,7 +273,7 @@ wallpaper_data_new (GthBrowser *browser,
        wdata->browser = browser;
        wallpaper_style_init_from_current (&wdata->old_style);
        wallpaper_style_init (&wdata->new_style);
-       wdata->new_style.file = g_object_ref (wallpaper_file);
+       wallpaper_data_set_new_style_file (wdata, wallpaper_file);
 
        return wdata;
 }
@@ -510,8 +541,7 @@ wallpaper_file_read_cb (GObject      *source_object,
                return;
 
        if (g_file_is_native (file_data->file)) {
-               _g_object_unref (wdata->new_style.file);
-               wdata->new_style.file = g_file_dup (file_data->file);
+               wallpaper_data_set_new_style_file (wdata, file_data->file);
                wallpaper_data_set (wdata);
        }
        else
-- 
GitLab

Reply via email to