diff --git a/.gitignore b/.gitignore index 55c4934..84f6eb3 100644 --- a/.gitignore +++ b/.gitignore @@ -153,3 +153,4 @@ eog-2.31.4-20100623git.tar.bz2 /eog-41.1.tar.xz /eog-42.alpha.tar.xz /eog-42.beta.tar.xz +/eog-42.rc.tar.xz diff --git a/0001-Replace-gtk_window_set_title-with-hdy_header_bar_set.patch b/0001-Replace-gtk_window_set_title-with-hdy_header_bar_set.patch deleted file mode 100644 index 0aee8e9..0000000 --- a/0001-Replace-gtk_window_set_title-with-hdy_header_bar_set.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 72439f78b4b44f08a0eedc8b4ade496a0bb8446c Mon Sep 17 00:00:00 2001 -From: Krifa75 -Date: Thu, 17 Feb 2022 22:23:55 +0100 -Subject: [PATCH] Replace gtk_window_set_title with hdy_header_bar_set_title - ---- - src/eog-window.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/eog-window.c b/src/eog-window.c -index cc7bccb2..ea18ab87 100644 ---- a/src/eog-window.c -+++ b/src/eog-window.c -@@ -995,7 +995,7 @@ eog_window_display_image (EogWindow *window, EogImage *image) - - eog_scroll_view_set_image (EOG_SCROLL_VIEW (priv->view), image); - -- gtk_window_set_title (GTK_WINDOW (window), eog_image_get_caption (image)); -+ hdy_header_bar_set_title (HDY_HEADER_BAR (priv->headerbar), eog_image_get_caption (image)); - - update_status_bar (window); - -@@ -1422,7 +1422,7 @@ eog_job_load_cb (EogJobLoad *job, gpointer data) - window); - - gtk_window_set_icon (GTK_WINDOW (window), NULL); -- gtk_window_set_title (GTK_WINDOW (window), -+ hdy_header_bar_set_title (HDY_HEADER_BAR (priv->headerbar), - eog_image_get_caption (job->image)); - - eog_window_set_message_area (window, message_area); -@@ -1560,7 +1560,7 @@ handle_image_selection_changed_cb (EogThumbView *thumbview, EogWindow *window) - priv = window->priv; - - if (eog_list_store_length (EOG_LIST_STORE (priv->store)) == 0) { -- gtk_window_set_title (GTK_WINDOW (window), -+ hdy_header_bar_set_title (HDY_HEADER_BAR (priv->headerbar), - g_get_application_name()); - gtk_statusbar_remove_all (GTK_STATUSBAR (priv->statusbar), - priv->image_info_message_cid); -@@ -2353,7 +2353,7 @@ eog_job_close_save_cb (EogJobSave *job, gpointer user_data) - window); - - gtk_window_set_icon (GTK_WINDOW (window), NULL); -- gtk_window_set_title (GTK_WINDOW (window), -+ hdy_header_bar_set_title (HDY_HEADER_BAR (window->priv->headerbar), - eog_image_get_caption (job->current_image)); - - eog_window_set_message_area (window, message_area); -@@ -2776,7 +2776,7 @@ eog_job_save_cb (EogJobSave *job, gpointer user_data) - /* check if job contains any error */ - if (EOG_JOB (job)->error == NULL) { - update_status_bar (window); -- gtk_window_set_title (GTK_WINDOW (window), -+ hdy_header_bar_set_title (HDY_HEADER_BAR (window->priv->headerbar), - eog_image_get_caption (job->current_image)); - - g_simple_action_set_enabled (G_SIMPLE_ACTION (action_save), FALSE); -@@ -2793,7 +2793,7 @@ eog_job_save_cb (EogJobSave *job, gpointer user_data) - window); - - gtk_window_set_icon (GTK_WINDOW (window), NULL); -- gtk_window_set_title (GTK_WINDOW (window), -+ hdy_header_bar_set_title (HDY_HEADER_BAR (window->priv->headerbar), - eog_image_get_caption (job->current_image)); - - eog_window_set_message_area (window, message_area); --- -2.35.1 - diff --git a/eog.spec b/eog.spec index f24be68..cacc8d1 100644 --- a/eog.spec +++ b/eog.spec @@ -7,8 +7,8 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: eog -Version: 42~beta -Release: 2%{?dist} +Version: 42~rc +Release: 1%{?dist} Summary: Eye of GNOME image viewer # The GFDL has an "or later version" clause embedded inside the license. @@ -16,9 +16,6 @@ Summary: Eye of GNOME image viewer License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/EyeOfGnome Source0: https://download.gnome.org/sources/%{name}/42/%{name}-%{tarball_version}.tar.xz -# Fix setting the window title -# https://gitlab.gnome.org/GNOME/eog/-/merge_requests/122 -Patch0: 0001-Replace-gtk_window_set_title-with-hdy_header_bar_set.patch BuildRequires: pkgconfig(exempi-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) @@ -138,6 +135,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.eog.deskto %endif %changelog +* Tue Mar 08 2022 David King - 42~rc-1 +- Update to 42.rc + * Fri Mar 04 2022 Adam Williamson - 42~beta-2 - Backport MR#122 to fix setting window title diff --git a/sources b/sources index 48ccf91..bf2908b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (eog-42.beta.tar.xz) = c2e8e3221cf4fd18c3466481692c888a560b5a41a57e78a2e86c2235628e8a7e80623dd9035f277729a3a5c22445526f871541394a058119adec2d40f31f4dfd +SHA512 (eog-42.rc.tar.xz) = 61d80f123a412d3bed9c1857bf617136e541a20aefbee9f01535e8d6eed27906df220008fc440c9fb639e14f1606c575b1c62fe6e3a151e938b6127743531a82