rpms/gnome-logs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import gnome-logs-3.36.0-8.el9

Browse Source
This commit is contained in:
CentOS Sources 2023-03-28 10:12:38 +00:00 committed by Stepan Oksanichenko
parent 09c2fae32b
commit 6e0bb7dbf6
4 changed files with 256 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
SOURCES/0001-gl-application.c-add-four-shortcuts.patch Normal file
View File

@ -0,0 +1,101 @@
From 8b7f222e75d006cc3573c9b545c26d6fac56b5ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sabri=20=C3=9Cnal?= <libreajans@gmail.com>
Date: Fri, 3 Apr 2020 15:09:26 +0300
Subject: [PATCH 1/2] gl-application.c: add four shortcuts
F1: Help
Ctrl+E: Export
Ctrl+N: New window
Ctrl+question: Keyboard shortcuts
---
src/gl-application.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/src/gl-application.c b/src/gl-application.c
index c20052c..b2ef1f7 100644
--- a/src/gl-application.c
+++ b/src/gl-application.c
@@ -178,67 +178,80 @@ on_monospace_font_name_changed (GSettings *settings,
}
}
static GActionEntry actions[] = {
{ "new-window", on_new_window },
{ "help", on_help },
{ "about", on_about }
};
static void
gl_application_startup (GApplication *application)
{
g_action_map_add_action_entries (G_ACTION_MAP (application), actions,
G_N_ELEMENTS (actions), application);
/* Calls gtk_init() with no arguments. */
G_APPLICATION_CLASS (gl_application_parent_class)->startup (application);
/* gtk_init() calls setlocale(), so gettext must be called after that. */
g_set_application_name (_(PACKAGE_NAME));
gtk_window_set_default_icon_name (PACKAGE_TARNAME);
}
static void
gl_application_activate (GApplication *application)
{
GtkWidget *window;
GlApplicationPrivate *priv;
const gchar * const close_accel[] = { "<Primary>w", NULL };
const gchar * const search_accel[] = { "<Primary>f", NULL };
+ const gchar * const export_accel[] = { "<Primary>e", NULL };
+ const gchar * const help_accel[] = { "F1", NULL };
+ const gchar * const new_window_accel[] = { "<Primary>n", NULL };
+ const gchar * const help_overlay_accel[] = { "<Primary>question", NULL };
window = gl_window_new (GTK_APPLICATION (application));
gtk_widget_show (window);
gtk_application_set_accels_for_action (GTK_APPLICATION (application),
"win.close", close_accel);
gtk_application_set_accels_for_action (GTK_APPLICATION (application),
"win.search", search_accel);
+ gtk_application_set_accels_for_action (GTK_APPLICATION (application),
+ "win.export", export_accel);
+ gtk_application_set_accels_for_action (GTK_APPLICATION (application),
+ "app.help", help_accel);
+ gtk_application_set_accels_for_action (GTK_APPLICATION (application),
+ "app.new-window", new_window_accel);
+ gtk_application_set_accels_for_action (GTK_APPLICATION (application),
+ "win.show-help-overlay",
+ help_overlay_accel);
priv = gl_application_get_instance_private (GL_APPLICATION (application));
on_monospace_font_name_changed (priv->desktop, DESKTOP_MONOSPACE_FONT_NAME,
priv);
}
static const GOptionEntry options[] =
{
{ "version", 'v', 0, G_OPTION_ARG_NONE, NULL,
N_("Print version information and exit"), NULL },
{ NULL }
};
static gint
gl_application_handle_local_options (GApplication *application,
GVariantDict *options)
{
if (g_variant_dict_contains (options, "version"))
{
g_print ("%s - Version %s\n", g_get_application_name (), PACKAGE_VERSION);
return 0;
}
return -1;
}
static void
gl_application_finalize (GObject *object)
{
--
2.35.1

55
SOURCES/0001-gl-window-Set-default-width-height.patch Normal file
View File

@ -0,0 +1,55 @@
From ef4c13a2ec49d94495370bcdb0870252ba43bfd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Tue, 27 Jul 2021 11:35:09 +0200
Subject: [PATCH] gl-window: Set default-{width,height}
Instead of limiting the minimal size rather make those values the
default so the window can shring to smaller sizes on e.g. phones.
---
data/gl-window.ui | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/gl-window.ui b/data/gl-window.ui
index e20569d..28e3fc8 100644
--- a/data/gl-window.ui
+++ b/data/gl-window.ui
@@ -1,34 +1,34 @@
<interface domain="gnome-logs">
<template class="GlWindow" parent="GtkApplicationWindow">
- <property name="height-request">780</property>
- <property name="width-request">1200</property>
+ <property name="default-width">1200</property>
+ <property name="default-height">600</property>
<signal name="key-press-event" handler="on_gl_window_key_press_event"/>
<child type="titlebar">
<object class="GlEventToolbar" id="event_toolbar">
</object>
</child>
<child>
<object class="GtkBox" id="event_box">
<property name="orientation">vertical</property>
<property name="visible">True</property>
<child>
<object class="GtkInfoBar" id="info_bar">
<property name="message-type">GTK_MESSAGE_ERROR</property>
<child>
<object class="GtkButtonBox" id="action_area">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<property name="layout_style">center</property>
<child>
<object class="GtkButton" id="help_button">
<property name="visible">True</property>
<property name="halign">center</property>
<property name="label" translatable="yes">Help</property>
<signal name="clicked" handler="on_help_button_clicked" object="GlWindow"/>
</object>
</child>
<child>
<object class="GtkButton" id="ignore_button">
<property name="visible">True</property>
<property name="halign">center</property>
<property name="label" translatable="yes">Ignore</property>
--
2.35.1

84
SOURCES/0002-help-overlay.ui-Add-three-shortcuts.patch Normal file
View File

@ -0,0 +1,84 @@
From df0c7e7e2475c05acac5bb491788e72eb5b850cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sabri=20=C3=9Cnal?= <libreajans@gmail.com>
Date: Fri, 3 Apr 2020 15:17:28 +0300
Subject: [PATCH 2/2] help-overlay.ui: Add three shortcuts
F1: Show help
Ctrl+question: Keyboard shortcuts
Ctrl+e: Export logs to a file
---
data/help-overlay.ui | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/data/help-overlay.ui b/data/help-overlay.ui
index 881503e..4427e7c 100644
--- a/data/help-overlay.ui
+++ b/data/help-overlay.ui
@@ -1,42 +1,63 @@
<interface domain="gnome-logs">
<object class="GtkShortcutsWindow" id="help_overlay">
<child>
<object class="GtkShortcutsSection">
<property name="visible">True</property>
<child>
<object class="GtkShortcutsGroup">
<property name="title" translatable="yes" context="shortcut window">General</property>
<property name="visible">True</property>
<child>
<object class="GtkShortcutsShortcut">
<property name="accelerator">&lt;Primary&gt;n</property>
<property name="title" translatable="yes" context="shortcut window">Open a new window</property>
<property name="visible">True</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="accelerator">&lt;Primary&gt;w</property>
<property name="title" translatable="yes" context="shortcut window">Close a window</property>
<property name="visible">True</property>
</object>
</child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="accelerator">F1</property>
+ <property name="title" translatable="yes" context="shortcut window">Show help</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="accelerator">&lt;Primary&gt;question</property>
+ <property name="title" translatable="yes" context="shortcut window">Keyboard shorcuts</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
</child>
<child>
<object class="GtkShortcutsGroup">
- <property name="title" translatable="yes" context="shortcut window">Search</property>
+ <property name="title" translatable="yes" context="shortcut window">Application</property>
<property name="visible">True</property>
<child>
<object class="GtkShortcutsShortcut">
<property name="accelerator">&lt;Primary&gt;f</property>
<property name="title" translatable="yes" context="shortcut window">Find</property>
<property name="visible">True</property>
</object>
</child>
+ <child>
+ <object class="GtkShortcutsShortcut">
+ <property name="accelerator">&lt;Primary&gt;e</property>
+ <property name="title" translatable="yes" context="shortcut window">Export logs to a file</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
</child>
</object>
</child>
</object>
</interface>
--
2.35.1

18
SPECS/gnome-logs.spec
View File

@ -1,6 +1,6 @@
Name: gnome-logs
Version: 3.36.0
Release: 6%{?dist}
Release: 8%{?dist}
Summary: Log viewer for the systemd journal
License: GPLv3+
@ -11,6 +11,7 @@ BuildRequires: desktop-file-utils
BuildRequires: docbook-dtds
BuildRequires: docbook-style-xsl
BuildRequires: gcc
BuildRequires: git
BuildRequires: itstool
BuildRequires: libxslt
BuildRequires: meson
@ -19,11 +20,16 @@ BuildRequires: pkgconfig(libsystemd)
BuildRequires: /usr/bin/appstream-util
Requires: gsettings-desktop-schemas
Patch10001: 0001-gl-application.c-add-four-shortcuts.patch
Patch10002: 0002-help-overlay.ui-Add-three-shortcuts.patch
Patch20001: 0001-gl-window-Set-default-width-height.patch
%description
A log viewer for the systemd journal.
%prep
%setup -q
%autosetup -S git
%build
@ -55,6 +61,14 @@ A log viewer for the systemd journal.
%changelog
* Wed Jan 25 2023 Ray Strode <rstrode@redhat.com> - 3.36.0-8
- Fix window resizing
Resolves: #2035832
* Wed Dec 14 2022 Ray Strode <rstrode@redhat.com> - 3.36.0-7
- Fix shortcuts
Resolves: #2062860
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.36.0-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688