Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package terminus for openSUSE:Factory checked in at 2021-07-14 23:58:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/terminus (Old) and /work/SRC/openSUSE:Factory/.terminus.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "terminus" Wed Jul 14 23:58:41 2021 rev:10 rq:906197 version:1.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/terminus/terminus.changes 2020-05-14 23:26:01.001141012 +0200 +++ /work/SRC/openSUSE:Factory/.terminus.new.2625/terminus.changes 2021-07-14 23:59:05.409468673 +0200 @@ -1,0 +2,9 @@ +Thu Jul 1 13:46:09 UTC 2021 - Ferdinand Thiessen <[email protected]> + +- Update to version 1.13.0 + * Fixed guake mode gets the focus under X11 in gnome shell + * If there is already a terminus instance when the extension is + launched, it only shows the notification once + * Fixed several warnings + +------------------------------------------------------------------- Old: ---- terminus-1.12.0.tar.gz New: ---- terminus-1.13.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ terminus.spec ++++++ --- /var/tmp/diff_new_pack.lQfZit/_old 2021-07-14 23:59:07.149455935 +0200 +++ /var/tmp/diff_new_pack.lQfZit/_new 2021-07-14 23:59:07.149455935 +0200 @@ -1,7 +1,7 @@ # # spec file for package terminus # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: terminus -Version: 1.12.0 +Version: 1.13.0 Release: 0 Summary: An X terminal written in Vala License: GPL-3.0-only Group: System/X11/Terminals URL: https://www.rastersoft.com/programas/terminus.html -Source: https://gitlab.com/rastersoft/terminus/-/archive/%{version}/%{name}-%{version}.tar.gz +Source: https://gitlab.com/rastersoft/terminus/-/archive/%{version}/%{name}-%{version}.tar.bz2 BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: meson >= 0.40.0 ++++++ terminus-1.12.0.tar.gz -> terminus-1.13.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminus-1.12.0/HISTORY.md new/terminus-1.13.0/HISTORY.md --- old/terminus-1.12.0/HISTORY.md 2020-04-24 21:45:52.000000000 +0200 +++ new/terminus-1.13.0/HISTORY.md 2020-11-28 01:58:00.000000000 +0100 @@ -1,5 +1,9 @@ # History of versions # +* Version 1.13.0 (2020-11-23) + * Now the guake mode REALLY gets the focus under X11 in gnome shell + * If there is already a terminus instance when the extension is launched, it only shows the notification once + * Fixed several warnings * Version 1.12.0 (2020-04-24) * Fix popup menu translations * Version 1.11.0 (2020-04-16) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminus-1.12.0/PKGBUILD new/terminus-1.13.0/PKGBUILD --- old/terminus-1.12.0/PKGBUILD 2020-04-24 21:45:52.000000000 +0200 +++ new/terminus-1.13.0/PKGBUILD 2020-11-28 01:58:00.000000000 +0100 @@ -1,5 +1,5 @@ pkgname=terminus -pkgver=1.12.0 +pkgver=1.13.0 pkgrel=1 pkgdesc="A new terminal for XWindows " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminus-1.12.0/README.md new/terminus-1.13.0/README.md --- old/terminus-1.12.0/README.md 2020-04-24 21:45:52.000000000 +0200 +++ new/terminus-1.13.0/README.md 2020-11-28 01:58:00.000000000 +0100 @@ -49,6 +49,9 @@ Currently the number of options modificable is small, but more will become available. +Under Gnome Shell (and derived desktops) be sure to enable the extension, to allow +you to launch the Guake mode terminal. + ## Creating new palettes ## It is very easy to add new palettes to Terminus. Just edit a file with *.color_scheme* @@ -102,9 +105,10 @@ ## FAQ ## -**Q:** I use Gnome-Shell and when I show the Quake terminal, it doesn't get the focus. -**A:** It seems that installing the "Steal my focus" extension fix it. It can be found at -https://extensions.gnome.org/extension/234/steal-my-focus/ +**Q:** I use Gnome-Shell/Ubuntu desktop and when I show the Quake terminal, it doesn't get the focus. +**A:** Be sure to install and enable the Terminus extension, even under X11. +Then do a *killall terminus* to relaunch it from the extension, and everything +should work fine. **Q:** I'm using Wayland, and pressing Alt+F12 (or my keybinding) doesn't show the Quake-like terminal. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminus-1.12.0/debian/changelog new/terminus-1.13.0/debian/changelog --- old/terminus-1.12.0/debian/changelog 2020-04-24 21:45:52.000000000 +0200 +++ new/terminus-1.13.0/debian/changelog 2020-11-28 01:58:00.000000000 +0100 @@ -1,3 +1,12 @@ +terminus (1.13.0-Debian1) sid; urgency=low + + * Now the guake mode REALLY gets the focus under X11 in gnome shell + * If there is already a terminus instance when the extension is +launched, it only shows the notification once + * Fixed several warnings + + -- Sergio Costas Rodriguez <[email protected]> Mon, 23 Nov 2020 23:55:00 +0200 + terminus (1.12.0-Debian1) sid; urgency=low * Fix popup menu translations diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminus-1.12.0/debian/control new/terminus-1.13.0/debian/control --- old/terminus-1.12.0/debian/control 2020-04-24 21:45:52.000000000 +0200 +++ new/terminus-1.13.0/debian/control 2020-11-28 01:58:00.000000000 +0100 @@ -8,7 +8,7 @@ Package: terminus Architecture: any -Version: 1.12.0 +Version: 1.13.0 Depends: libgee-0.8-2, libkeybinder-3.0-0, libvte-2.91-0, libpcre3, libglib2.0-bin Description: A new terminal for X11 and Wayland both for classic, in-window terminal, and Guake-like (hot-key drop-down mode) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminus-1.12.0/meson.build new/terminus-1.13.0/meson.build --- old/terminus-1.12.0/meson.build 2020-04-24 21:45:52.000000000 +0200 +++ new/terminus-1.13.0/meson.build 2020-11-28 01:58:00.000000000 +0100 @@ -1,6 +1,6 @@ project('terminus', ['c','vala'], - version: '1.12.0') + version: '1.13.0') add_global_arguments('-DGETTEXT_PACKAGE="terminus"',language: 'c') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminus-1.12.0/rpmbuild/SPECS/terminus.spec new/terminus-1.13.0/rpmbuild/SPECS/terminus.spec --- old/terminus-1.12.0/rpmbuild/SPECS/terminus.spec 2020-04-24 21:45:52.000000000 +0200 +++ new/terminus-1.13.0/rpmbuild/SPECS/terminus.spec 2020-11-28 01:58:00.000000000 +0100 @@ -1,5 +1,5 @@ Name: terminus -Version: 1.12.0 +Version: 1.13.0 Release: 1 License: Unknown/not set Summary: A new terminal for XWindows and Wayland diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminus-1.12.0/src/CMakeLists.txt new/terminus-1.13.0/src/CMakeLists.txt --- old/terminus-1.12.0/src/CMakeLists.txt 2020-04-24 21:45:52.000000000 +0200 +++ new/terminus-1.13.0/src/CMakeLists.txt 2020-11-28 01:58:00.000000000 +0100 @@ -7,13 +7,13 @@ set (RELEASE_NAME "terminus") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "1.12.0") +set (VERSION "1.13.0") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (DOLLAR "$") configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.base ${CMAKE_BINARY_DIR}/src/Config.vala) add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") -set (VERSION "1.12.0") +set (VERSION "1.13.0") add_definitions (${DEPS_CFLAGS}) link_libraries ( ${DEPS_LIBRARIES} ) link_directories ( ${DEPS_LIBRARY_DIRS} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminus-1.12.0/src/meson.build new/terminus-1.13.0/src/meson.build --- old/terminus-1.12.0/src/meson.build 2020-04-24 21:45:52.000000000 +0200 +++ new/terminus-1.13.0/src/meson.build 2020-11-28 01:58:00.000000000 +0100 @@ -4,7 +4,7 @@ cfg_terminus.set('GETTEXT_PACKAGE', 'terminus') cfg_terminus.set('RELEASE_NAME', 'terminus') cfg_terminus.set('PREFIX', get_option('prefix')) -cfg_terminus.set('VERSION', '1.12.0') +cfg_terminus.set('VERSION', '1.13.0') cfg_terminus.set('TESTSRCDIR', meson.source_root()) cfgfile_2 = configure_file( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminus-1.12.0/src/params.vala new/terminus-1.13.0/src/params.vala --- old/terminus-1.12.0/src/params.vala 2020-04-24 21:45:52.000000000 +0200 +++ new/terminus-1.13.0/src/params.vala 2020-11-28 01:58:00.000000000 +0100 @@ -70,6 +70,16 @@ if (check_wayland() != 0) { Posix.exit(0); } + if (GLib.Environment.get_variable("XDG_CURRENT_DESKTOP").index_of("GNOME") != -1) { + Posix.exit(0); // under Gnome Shell and family, always rely on the extension + } + this.check_guake = true; + continue; + } + if (argv[param_counter] == "--check_guake_x11") { + if (check_wayland() != 0) { + Posix.exit(0); + } this.check_guake = true; continue; } @@ -144,8 +154,9 @@ -e, --command=STRING launches a new Terminus window and execute the argument inside the terminal --working-directory=DIRNAME sets the terminal directory to DIRNAME --guake launch Terminus in background - --check_guake launch Terminus in background and return if there is already another Terminus process, or in Wayland + --check_guake launch Terminus in background and return if there is already another Terminus process, or in Wayland, or in GNOME Shell --check_guake_wayland launch Terminus in background and return if there is already another Terminus process, or in X11 + --check_guake_x11 launch Terminus in background and return if there is already another Terminus process, or in Wayland --nobindkey don't try to bind the Quake-mode key (useful for gnome shell) """)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminus-1.12.0/src/settings.vala new/terminus-1.13.0/src/settings.vala --- old/terminus-1.12.0/src/settings.vala 2020-04-24 21:45:52.000000000 +0200 +++ new/terminus-1.13.0/src/settings.vala 2020-11-28 01:58:00.000000000 +0100 @@ -333,7 +333,7 @@ if (key == "fg-color") { changed_text_colors = true; - var color = (this.fg_color as Gtk.ColorChooser).rgba; + var color = this.fg_color.rgba; var htmlcolor = "#%02X%02X%02X".printf((uint) (255 * color.red), (uint) (255 * color.green), (uint) (255 * color.blue)); if (Terminus.settings.get_string("fg-color") != htmlcolor) { Terminus.settings.set_string("fg-color", htmlcolor); @@ -343,7 +343,7 @@ if (key == "bg-color") { changed_text_colors = true; - var color = (this.bg_color as Gtk.ColorChooser).rgba; + var color = this.bg_color.rgba; var htmlcolor = "#%02X%02X%02X".printf((uint) (255 * color.red), (uint) (255 * color.green), (uint) (255 * color.blue)); if (Terminus.settings.get_string("bg-color") != htmlcolor) { Terminus.settings.set_string("bg-color", htmlcolor); @@ -353,7 +353,7 @@ if (key == "bold-color") { string htmlcolor; if (this.use_bold_color.active) { - var color = (this.bold_color as Gtk.ColorChooser).rgba; + var color = this.bold_color.rgba; htmlcolor = "#%02X%02X%02X".printf((uint) (255 * color.red), (uint) (255 * color.green), (uint) (255 * color.blue)); } else { htmlcolor = ""; @@ -365,7 +365,7 @@ if ((key == "cursor-fg-color") || changed_text_colors) { string htmlcolor; if (this.use_cursor_color.active) { - var color = (this.cursor_color_fg as Gtk.ColorChooser).rgba; + var color = this.cursor_color_fg.rgba; htmlcolor = "#%02X%02X%02X".printf((uint) (255 * color.red), (uint) (255 * color.green), (uint) (255 * color.blue)); } else { htmlcolor = ""; @@ -377,7 +377,7 @@ if ((key == "cursor-bg-color") || changed_text_colors) { string htmlcolor; if (this.use_cursor_color.active) { - var color = (this.cursor_color_bg as Gtk.ColorChooser).rgba; + var color = this.cursor_color_bg.rgba; htmlcolor = "#%02X%02X%02X".printf((uint) (255 * color.red), (uint) (255 * color.green), (uint) (255 * color.blue)); } else { htmlcolor = ""; @@ -389,7 +389,7 @@ if (key == "highlight-fg-color") { string htmlcolor; if (this.use_highlight_color.active) { - var color = (this.highlight_color_fg as Gtk.ColorChooser).rgba; + var color = this.highlight_color_fg.rgba; htmlcolor = "#%02X%02X%02X".printf((uint) (255 * color.red), (uint) (255 * color.green), (uint) (255 * color.blue)); } else { htmlcolor = ""; @@ -401,7 +401,7 @@ if (key == "highlight-bg-color") { string htmlcolor; if (this.use_highlight_color.active) { - var color = (this.highlight_color_bg as Gtk.ColorChooser).rgba; + var color = this.highlight_color_bg.rgba; htmlcolor = "#%02X%02X%02X".printf((uint) (255 * color.red), (uint) (255 * color.green), (uint) (255 * color.blue)); } else { htmlcolor = ""; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminus-1.12.0/src/terminus.vala new/terminus-1.13.0/src/terminus.vala --- old/terminus-1.12.0/src/terminus.vala 2020-04-24 21:45:52.000000000 +0200 +++ new/terminus-1.13.0/src/terminus.vala 2020-11-28 01:58:00.000000000 +0100 @@ -415,7 +415,7 @@ this.guake_window.hide(); } else { if (check_wayland() == 0) { - this.guake_window.set_screen(null); + this.guake_window.set_screen(Gdk.Screen.get_default()); } this.guake_window.present(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminus-1.12.0/terminus.avprj new/terminus-1.13.0/terminus.avprj --- old/terminus-1.12.0/terminus.avprj 2020-04-24 21:45:52.000000000 +0200 +++ new/terminus-1.13.0/terminus.avprj 2020-11-28 01:58:00.000000000 +0100 @@ -1,7 +1,7 @@ ### AutoVala Project ### autovala_version: 30 project_name: terminus -project_version: 1.12.0 +project_version: 1.13.0 vala_version: 0.30 custom: terminus_gnome_shell/extension.js share/gnome-shell/extensions/[email protected] @@ -12,7 +12,7 @@ *vapidir: src/vapidir vala_binary: src/terminus -*version: 1.12.0 +*version: 1.13.0 use_gresource: extras_gresource_xml vala_vapi: checkwayland.vapi *vala_package: posix diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminus-1.12.0/terminus_gnome_shell/extension.js new/terminus-1.13.0/terminus_gnome_shell/extension.js --- old/terminus-1.12.0/terminus_gnome_shell/extension.js 2020-04-24 21:45:52.000000000 +0200 +++ new/terminus-1.13.0/terminus_gnome_shell/extension.js 2020-11-28 01:58:00.000000000 +0100 @@ -53,7 +53,11 @@ _launch_process() { let argv = []; argv.push("terminus"); - argv.push("--check_guake_wayland"); + if (Meta.is_wayland_compositor()) { + argv.push("--check_guake_wayland"); + } else { + argv.push("--check_guake_x11"); + } this._currentProcess = new LaunchSubprocess(0, "TERMINUS", "--uuid"); this._currentProcess.spawnv(argv); this._currentProcess.subprocess.wait_async(null, () => { @@ -61,7 +65,10 @@ if (this._currentProcess.subprocess.get_if_exited()) { let retVal = this._currentProcess.subprocess.get_exit_status(); if (retVal == 1) { - Main.notify("Can't launch Terminus", "There is already an instance of Terminus running. You must kill all of them to allow Terminus guake mode to work."); + if (!this._shown_error) { + // show it only once + Main.notify("Can't launch Terminus", "There is already an instance of Terminus running. You must kill all of them to allow Terminus guake mode to work."); + } this._shown_error = true; this._reloadTime = 1000; } else { @@ -136,6 +143,7 @@ window.make_above(); window.stick(); this._set_window_position(window); + window.focus(0); window.connect('position-changed', () => { this._set_window_position(window); }); @@ -172,19 +180,15 @@ function init() { // delegate everything to the main program when running under X11 - if (Meta.is_wayland_compositor()) - terminusObject = new TerminusClass(); + terminusObject = new TerminusClass(); } function enable() { - if (Meta.is_wayland_compositor()) - terminusObject.enable(); + terminusObject.enable(); } function disable() { - if (Meta.is_wayland_compositor()) { - terminusObject.disable(); - } + terminusObject.disable(); } /** @@ -205,9 +209,7 @@ this._cmd_parameter = cmd_parameter; this._UUID = null; this._flags = flags | Gio.SubprocessFlags.STDOUT_PIPE | Gio.SubprocessFlags.STDERR_MERGE; - if (Meta.is_wayland_compositor()) { - this._flags |= Gio.SubprocessFlags.STDIN_PIPE; - } + this._flags |= Gio.SubprocessFlags.STDIN_PIPE; this._launcher = new Gio.SubprocessLauncher({ flags: this._flags }); this.subprocess = null; this.process_running = false; @@ -215,18 +217,16 @@ spawnv(argv) { let UUID_string = null; - if (Meta.is_wayland_compositor()) { - /* - * Generate a random UUID to allow the extension to identify the window. It must be random - * to avoid other programs to cheat and pose themselves as the true process. This also means that - * launching the program from the command line won't give "superpowers" to it, - * but will work like any other program. Of course, under X11 it doesn't matter, but it does - * under Wayland. - */ - this._UUID = GLib.uuid_string_random(); - UUID_string = this._UUID + '\n'; - argv.push(this._cmd_parameter); - } + /* + * Generate a random UUID to allow the extension to identify the window. It must be random + * to avoid other programs to cheat and pose themselves as the true process. This also means that + * launching the program from the command line won't give "superpowers" to it, + * but will work like any other program. Of course, under X11 it doesn't matter, but it does + * under Wayland. + */ + this._UUID = GLib.uuid_string_random(); + UUID_string = this._UUID + '\n'; + argv.push(this._cmd_parameter); this.subprocess = this._launcher.spawnv(argv); if (this.subprocess) { /* @@ -265,9 +265,6 @@ * @param {MetaWindow} window The window to check. */ query_window_belongs_to(window) { - if (!Meta.is_wayland_compositor()) { - throw new Error("Not in wayland"); - } if (this._UUID == null) { throw new Error("No process running"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/terminus-1.12.0/terminus_gnome_shell/metadata.json new/terminus-1.13.0/terminus_gnome_shell/metadata.json --- old/terminus-1.12.0/terminus_gnome_shell/metadata.json 2020-04-24 21:45:52.000000000 +0200 +++ new/terminus-1.13.0/terminus_gnome_shell/metadata.json 2020-11-28 01:58:00.000000000 +0100 @@ -1,4 +1,4 @@ {"uuid": "[email protected]", "name": "Show Terminus Quake Mode", -"shell-version": ["3.22", "3.24", "3.26"], +"shell-version": ["3.22", "3.24", "3.26", "3.28", "3.36", "3.38"], "description": "Allows to show the Quake-like terminal from Terminus by pressing the defined hotkey. Useful when using Wayland, since there Terminus can't create hotkeys and must rely on the desktop."}
