!3 Update to 43.0

From: @dwl301 
Reviewed-by: @zhang__3125 
Signed-off-by: @zhang__3125
This commit is contained in:
openeuler-ci-bot 2023-02-17 06:46:33 +00:00 committed by Gitee
commit d5659fafa6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 12 additions and 111 deletions

View File

@ -1,86 +0,0 @@
From 41f0321b2ee83e1bd670177e5960c4d5dcbb281f Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Mon, 28 Mar 2022 23:16:26 -0700
Subject: [PATCH] Enable Ctrl+PgUp/PgDn to switch tabs if there are multiple
tabs
Users expect Ctrl+PgUp/PgDn to switch tabs, but some terminal
applications want to be able to use these keys themselves. Make the
same compromise that gnome-terminal does, and let these keys switch
tabs _if_ there are multiple tabs in the current window to switch
between.
Fixes https://gitlab.gnome.org/GNOME/console/-/issues/118.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
src/kgx-pages.c | 19 +++++++++++++++++++
src/kgx-pages.h | 1 +
src/kgx-window.c | 9 +++++----
3 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/kgx-pages.c b/src/kgx-pages.c
index 0b7c37a..4084efd 100644
--- a/src/kgx-pages.c
+++ b/src/kgx-pages.c
@@ -819,6 +819,25 @@ kgx_pages_current_status (KgxPages *self)
}
+/**
+ * kgx_pages_count:
+ * @self: the #KgxPages
+ *
+ * Returns: number of #KgxTab s in @self
+ */
+int
+kgx_pages_count (KgxPages *self)
+{
+ KgxPagesPrivate *priv;
+
+ g_return_val_if_fail (KGX_IS_PAGES (self), KGX_NONE);
+
+ priv = kgx_pages_get_instance_private (self);
+
+ return hdy_tab_view_get_n_pages (HDY_TAB_VIEW (priv->view));
+}
+
+
/**
* kgx_pages_get_children:
* @self: the #KgxPages
diff --git a/src/kgx-pages.h b/src/kgx-pages.h
index 9fbaae6..9a03c77 100644
--- a/src/kgx-pages.h
+++ b/src/kgx-pages.h
@@ -45,6 +45,7 @@ void kgx_pages_add_page (KgxPages *self,
KgxTab *page);
void kgx_pages_remove_page (KgxPages *self,
KgxTab *page);
+int kgx_pages_count (KgxPages *self);
GPtrArray *kgx_pages_get_children (KgxPages *self);
void kgx_pages_focus_page (KgxPages *self,
KgxTab *page);
diff --git a/src/kgx-window.c b/src/kgx-window.c
index acddf60..3bc1d0c 100644
--- a/src/kgx-window.c
+++ b/src/kgx-window.c
@@ -260,10 +260,11 @@ key_press_event (GtkWidget *widget,
*
* See https://gitlab.gnome.org/GNOME/libhandy/-/issues/422
*/
- if ((keyval == GDK_KEY_Page_Up ||
- keyval == GDK_KEY_KP_Page_Up ||
- keyval == GDK_KEY_Page_Down ||
- keyval == GDK_KEY_KP_Page_Down ||
+ if ((((keyval == GDK_KEY_Page_Up ||
+ keyval == GDK_KEY_KP_Page_Up ||
+ keyval == GDK_KEY_Page_Down ||
+ keyval == GDK_KEY_KP_Page_Down) &&
+ kgx_pages_count (KGX_PAGES (self->pages)) <= 1) ||
keyval == GDK_KEY_Home ||
keyval == GDK_KEY_KP_Home ||
keyval == GDK_KEY_End ||
--
2.35.1

Binary file not shown.

Binary file not shown.

BIN
gnome-console-43.0.tar.xz Normal file

Binary file not shown.

View File

@ -1,44 +1,31 @@
Name: gnome-console
Version: 42.0
Version: 43.0
Release: 1
Summary: Simple user-friendly terminal emulator for the GNOME desktop
License: GPLv3+
URL: https://gitlab.gnome.org/GNOME/console
Source: https://download.gnome.org/sources/gnome-console/42/gnome-console-%{version}.tar.xz
Patch0: 0001-Enable-Ctrl-PgUp-PgDn-to-switch-tabs-if-there-are-mu.patch
Source: https://download.gnome.org/sources/gnome-console/43/gnome-console-%{version}.tar.xz
BuildRequires: meson >= 0.59.0
BuildRequires: gcc
BuildRequires: pkgconfig(gio-2.0) >= 2.66
BuildRequires: pkgconfig(gtk+-3.0) >= 3.24
BuildRequires: pkgconfig(libhandy-1) >= 1.5
BuildRequires: pkgconfig(vte-2.91) >= 0.67
BuildRequires: pkgconfig(gtk4)
BuildRequires: pkgconfig(libadwaita-1)
BuildRequires: pkgconfig(vte-2.91-gtk4)
BuildRequires: pkgconfig(libgtop-2.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas)
BuildRequires: sassc
BuildRequires: /usr/bin/desktop-file-validate
#BuildRequires: /usr/bin/appstreamcli
BuildRequires: pkgconfig(libnautilus-extension)
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: desktop-file-utils
BuildRequires: appstream
%description
%{summary}.
%package nautilus
Summary: Nautilus integration with %{name}
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Supplements: (nautilus and %{name})
%description nautilus
%{summary}.
%prep
%autosetup -p1 -n %{name}-%{version}
sed -i -r -e '/(werror=|glib_compile_schemas|gtk_update_icon_cache|update_desktop_database)/s/true/false/' meson.build
%build
%meson -D nautilus=enabled -D sassc=enabled
%meson
%meson_build
%install
@ -47,7 +34,7 @@ sed -i -r -e '/(werror=|glib_compile_schemas|gtk_update_icon_cache|update_deskto
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Console.desktop
#appstreamcli validate --no-net %{buildroot}%{_metainfodir}/org.gnome.Console.metainfo.xml
appstreamcli validate --no-net %{buildroot}%{_metainfodir}/org.gnome.Console.metainfo.xml
%files -f kgx.lang
%{_bindir}/kgx
@ -58,10 +45,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Console.des
%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Console.svg
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Console-symbolic.svg
%files nautilus
%{_libdir}/nautilus/extensions-3.0/libkgx-nautilus.so
%changelog
* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> 43.0-1
- Update to 43.0
* Mon Jul 11 2022 lin zhang <lin.zhang@turbolinux.com.cn> 42.0-1
- Update to 42.0