February 2021 - openSUSE Commits - openSUSE Mailing Lists

commit sbd for openSUSE:Factory
by Source-Sync 01 Feb '21

01 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sbd for openSUSE:Factory checked in at 2021-02-01 13:29:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sbd (Old) and /work/SRC/openSUSE:Factory/.sbd.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sbd" Mon Feb 1 13:29:23 2021 rev:39 rq:868348 version:1.4.2+20210129.5e2100f Changes: -------- --- /work/SRC/openSUSE:Factory/sbd/sbd.changes 2021-01-22 21:53:27.977946282 +0100 +++ /work/SRC/openSUSE:Factory/.sbd.new.28504/sbd.changes 2021-02-01 13:31:09.214360914 +0100 @@ -1,0 +2,12 @@ +Fri Jan 29 13:19:29 UTC 2021 - Yan Gao <ygao(a)suse.com> + +- sbd-inquisitor: downgrade the warning about SBD_SYNC_RESOURCE_STARTUP to notice (bsc#1180966) + * bsc#1180966-0001-Log-sbd-inquisitor-downgrade-the-warning-about-SBD_S.patch + +------------------------------------------------------------------- +Fri Jan 29 10:57:17 UTC 2021 - Yan Gao <ygao(a)suse.com> + +- Update to version 1.4.2+20210129.5e2100f: +- Doc: adapt description of startup/shutdown sync with pacemaker + +------------------------------------------------------------------- Old: ---- sbd-1.4.2+20201214.01c18c7.tar.xz New: ---- bsc#1180966-0001-Log-sbd-inquisitor-downgrade-the-warning-about-SBD_S.patch sbd-1.4.2+20210129.5e2100f.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sbd.spec ++++++ --- /var/tmp/diff_new_pack.QebYFh/_old 2021-02-01 13:31:09.798361633 +0100 +++ /var/tmp/diff_new_pack.QebYFh/_new 2021-02-01 13:31:09.802361639 +0100 @@ -33,7 +33,7 @@ %global sync_resource_startup_sysconfig no Name: sbd -Version: 1.4.2+20201214.01c18c7 +Version: 1.4.2+20210129.5e2100f Release: 0 Summary: Storage-based death License: GPL-2.0-or-later @@ -41,6 +41,7 @@ URL: https://github.com/ClusterLabs/sbd Source: %{name}-%{version}.tar.xz Patch1: bsc#1140065-Fix-sbd-cluster-exit-if-cmap-is-disconnected.patch +Patch2: bsc#1180966-0001-Log-sbd-inquisitor-downgrade-the-warning-about-SBD_S.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: e2fsprogs-devel ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.QebYFh/_old 2021-02-01 13:31:09.854361703 +0100 +++ /var/tmp/diff_new_pack.QebYFh/_new 2021-02-01 13:31:09.858361707 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/ClusterLabs/sbd.git</param> - <param name="changesrevision">cc46bb4aaa8c0cde5c09f6d71471e402663f96e0</param> + <param name="changesrevision">542bf70c701083df032eb22cf59f4027ee88e60f</param> </service> </servicedata> \ No newline at end of file ++++++ bsc#1180966-0001-Log-sbd-inquisitor-downgrade-the-warning-about-SBD_S.patch ++++++ From debebb2dcdd7af99b16c34f9bab2d91c42ae6cdd Mon Sep 17 00:00:00 2001 From: "Gao,Yan" <ygao(a)suse.com> Date: Fri, 29 Jan 2021 14:14:44 +0100 Subject: [PATCH] Log: sbd-inquisitor: downgrade the warning about SBD_SYNC_RESOURCE_STARTUP to notice --- src/sbd-inquisitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sbd-inquisitor.c b/src/sbd-inquisitor.c index c943030..b527218 100644 --- a/src/sbd-inquisitor.c +++ b/src/sbd-inquisitor.c @@ -1122,7 +1122,7 @@ int main(int argc, char **argv, char **envp) } #else if (!sync_resource_startup) { - cl_log(LOG_WARNING, "SBD built against pacemaker supporting " + cl_log(LOG_NOTICE, "SBD built against pacemaker supporting " "pacemakerd-API. Should think about enabling " "SBD_SYNC_RESOURCE_STARTUP."); } -- 2.26.2 ++++++ sbd-1.4.2+20201214.01c18c7.tar.xz -> sbd-1.4.2+20210129.5e2100f.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.4.2+20201214.01c18c7/src/sbd.sysconfig.in new/sbd-1.4.2+20210129.5e2100f/src/sbd.sysconfig.in --- old/sbd-1.4.2+20201214.01c18c7/src/sbd.sysconfig.in 2020-12-14 09:35:08.000000000 +0100 +++ new/sbd-1.4.2+20210129.5e2100f/src/sbd.sysconfig.in 2021-01-29 10:32:07.000000000 +0100 @@ -114,9 +114,14 @@ # On shutdown pacemakerd is going to wait in a state where it # has cleanly shutdown resources till sbd fetches that state. # -# Default is 'no' to prevent pacemaker from waiting for a -# ping that will never come when working together with an sbd -# version that doesn't support the feature. +# The default is set when building SBD and Pacemaker from source. +# Going for 'no' is safer if it can't be assured that SBD and +# Pacemaker installed do both support the synchronization feature. +# When going with 'yes' - also using package dependencies to +# assure SBD & Pacemaker both support the synchronization +# feature and are assuming the same default - an SBD configuration +# inherited via an upgrade doesn't have to be altered to still +# benefit from the new feature. # SBD_SYNC_RESOURCE_STARTUP=@SBD_SYNC_RESOURCE_STARTUP_SYSCONFIG@

1 0

commit greetd for openSUSE:Factory
by Source-Sync 01 Feb '21

01 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package greetd for openSUSE:Factory checked in at 2021-02-01 13:29:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/greetd (Old) and /work/SRC/openSUSE:Factory/.greetd.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "greetd" Mon Feb 1 13:29:21 2021 rev:3 rq:868338 version:0.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/greetd/greetd.changes 2020-11-05 21:56:35.227959273 +0100 +++ /work/SRC/openSUSE:Factory/.greetd.new.28504/greetd.changes 2021-02-01 13:31:06.942358114 +0100 @@ -1,0 +2,22 @@ +Sat Jan 30 18:46:49 UTC 2021 - Andr��s Barrantes Silman <andresbs(a)opensuse.org> + +- Version bump to 0.7.0 + * Use additional pam service config for greeter + * greetd: Added tuigreet to known greeters list. + * terminal: Use direct open, proper errors + * worker: Unconditionally set up tty + * terminal: Forcibly take terminal + * session: Do not log pam_conv after start + * ci: Build both arch and alpine + * Use per-pid socket paths + * Terminate cleanly on SIGINT + * Use stdin as VT for current/none vt selections + * config: Skip reading config in session worker + * config: Add general.source_profile + * config: Fix tests for general section + * docs: Document new general section + * ci: Disable automatic github mirroring + * Add installation instructions on Gentoo + * Make sure to require codec in tokio-codec feature + +------------------------------------------------------------------- Old: ---- greetd-0.6.1.obscpio New: ---- greetd-0.7.0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ greetd.spec ++++++ --- /var/tmp/diff_new_pack.IQ5DHq/_old 2021-02-01 13:31:08.722360308 +0100 +++ /var/tmp/diff_new_pack.IQ5DHq/_new 2021-02-01 13:31:08.726360312 +0100 @@ -1,7 +1,7 @@ # # spec file for package greetd # -# 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 @@ -15,21 +15,22 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: greetd -Version: 0.6.1 +Version: 0.7.0 Release: 0 Summary: Minimal and flexible login manager daemon -License: GPL-3.0 +License: GPL-3.0-only Group: System/Management URL: https://git.sr.ht/~kennylevinsen/greetd Source: %{name}-%{version}.tar.gz Source1: vendor.tar.gz Source2: cargo_config Source3: greetd.pam -BuildRequires: rust BuildRequires: cargo -BuildRequires: rust-packaging BuildRequires: pam-devel +BuildRequires: rust +BuildRequires: rust-packaging BuildRequires: systemd-rpm-macros Requires(post): diffutils Requires(pre): %{_bindir}/getent ++++++ _service ++++++ --- /var/tmp/diff_new_pack.IQ5DHq/_old 2021-02-01 13:31:08.806360411 +0100 +++ /var/tmp/diff_new_pack.IQ5DHq/_new 2021-02-01 13:31:08.806360411 +0100 @@ -2,7 +2,7 @@ <service name="obs_scm" mode="disabled"> <param name="url">https://git.sr.ht/~kennylevinsen/greetd</param> <param name="scm">git</param> - <param name="revision">0.6.1</param> + <param name="revision">0.7.0</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> </service> ++++++ greetd-0.6.1.obscpio -> greetd-0.7.0.obscpio ++++++ /work/SRC/openSUSE:Factory/greetd/greetd-0.6.1.obscpio /work/SRC/openSUSE:Factory/.greetd.new.28504/greetd-0.7.0.obscpio differ: char 19, line 1 ++++++ greetd.obsinfo ++++++ --- /var/tmp/diff_new_pack.IQ5DHq/_old 2021-02-01 13:31:08.870360489 +0100 +++ /var/tmp/diff_new_pack.IQ5DHq/_new 2021-02-01 13:31:08.870360489 +0100 @@ -1,5 +1,5 @@ name: greetd -version: 0.6.1 -mtime: 1589645902 -commit: c9a2ce68a47182ba8c2519be4acdb58cfb866e0d +version: 0.7.0 +mtime: 1608636588 +commit: b25b72ae51b3b6dca945b6078e55b593b02fb7a5 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/greetd/vendor.tar.gz /work/SRC/openSUSE:Factory/.greetd.new.28504/vendor.tar.gz differ: char 5, line 1

1 0

commit mraa for openSUSE:Factory
by Source-Sync 01 Feb '21

01 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mraa for openSUSE:Factory checked in at 2021-02-01 13:29:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mraa (Old) and /work/SRC/openSUSE:Factory/.mraa.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mraa" Mon Feb 1 13:29:20 2021 rev:16 rq:868315 version:2.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mraa/mraa.changes 2020-12-30 17:13:53.376427032 +0100 +++ /work/SRC/openSUSE:Factory/.mraa.new.28504/mraa.changes 2021-02-01 13:31:05.862356782 +0100 @@ -1,0 +2,5 @@ +Mon Feb 1 10:03:36 UTC 2021 - Martin Pluskal <mpluskal(a)suse.com> + +- Update project url + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mraa.spec ++++++ --- /var/tmp/diff_new_pack.EghJ8E/_old 2021-02-01 13:31:06.670357779 +0100 +++ /var/tmp/diff_new_pack.EghJ8E/_new 2021-02-01 13:31:06.674357783 +0100 @@ -1,7 +1,7 @@ # # spec file for package mraa # -# 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 @@ -23,8 +23,8 @@ Summary: Low Level Skeleton Library for IO Communication License: MIT Group: Hardware/Other -URL: https://github.com/intel-iot-devkit/mraa -Source: https://github.com/intel-iot-devkit/mraa/archive/v%{version}.tar.gz#/%{name… +URL: https://github.com/eclipse/mraa +Source: https://github.com/eclipse/mraa/archive/v%{version}.tar.gz#/%{name}-%{versi… Patch0: mraa-i686.patch BuildRequires: cmake BuildRequires: gcc-c++

1 0

commit live-net-installer for openSUSE:Factory
by Source-Sync 01 Feb '21

01 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package live-net-installer for openSUSE:Factory checked in at 2021-02-01 13:29:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/live-net-installer (Old) and /work/SRC/openSUSE:Factory/.live-net-installer.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "live-net-installer" Mon Feb 1 13:29:18 2021 rev:13 rq:868312 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/live-net-installer/live-net-installer.changes 2021-01-07 21:26:08.777749996 +0100 +++ /work/SRC/openSUSE:Factory/.live-net-installer.new.28504/live-net-installer.changes 2021-02-01 13:31:04.890355585 +0100 @@ -1,0 +2,5 @@ +Mon Feb 1 09:50:26 UTC 2021 - Fabian Vogt <fvogt(a)suse.com> + +- Fix typo breaking the URL on Leap 15.3 on aarch64 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ live-net-installer.spec ++++++ --- /var/tmp/diff_new_pack.mDzaaH/_old 2021-02-01 13:31:05.574356428 +0100 +++ /var/tmp/diff_new_pack.mDzaaH/_new 2021-02-01 13:31:05.574356428 +0100 @@ -1,7 +1,7 @@ # # spec file for package live-net-installer # -# 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 @@ -19,7 +19,7 @@ %define base_url http://download.opensuse.org # AArch64 has a different repo url on TW and Leap < 15.3 -%if !0%{?sle_version} || !0%{?sle_version} < 150300 +%if !0%{?sle_version} || 0%{?sle_version} < 150300 %ifarch aarch64 %define base_url http://download.opensuse.org/ports/aarch64 %endif

1 0

commit telegram-desktop for openSUSE:Factory
by Source-Sync 01 Feb '21

01 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package telegram-desktop for openSUSE:Factory checked in at 2021-02-01 13:29:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/telegram-desktop (Old) and /work/SRC/openSUSE:Factory/.telegram-desktop.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "telegram-desktop" Mon Feb 1 13:29:13 2021 rev:53 rq:868309 version:2.5.8 Changes: -------- --- /work/SRC/openSUSE:Factory/telegram-desktop/telegram-desktop.changes 2021-01-29 15:03:59.078117408 +0100 +++ /work/SRC/openSUSE:Factory/.telegram-desktop.new.28504/telegram-desktop.changes 2021-02-01 13:31:03.570353957 +0100 @@ -1,0 +2,9 @@ +Sun Jan 31 14:57:11 UTC 2021 - Marcel Kuehlhorn <tux93(a)opensuse.org> + +- Update to 2.5.8 + * Fix OpenAL device closing in calls and voice chats. + * Fix video chat rotation when calling from iOS. + * Fix scheduling messages without sound. + * Remove redundant Cancel button in ScheduleBox. + +------------------------------------------------------------------- Old: ---- tdesktop-2.5.7-full.tar.gz New: ---- tdesktop-2.5.8-full.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telegram-desktop.spec ++++++ --- /var/tmp/diff_new_pack.nb4ZaP/_old 2021-02-01 13:31:04.658355298 +0100 +++ /var/tmp/diff_new_pack.nb4ZaP/_new 2021-02-01 13:31:04.662355303 +0100 @@ -31,7 +31,7 @@ %define __builder ninja Name: telegram-desktop -Version: 2.5.7 +Version: 2.5.8 Release: 0 Summary: Messaging application with a focus on speed and security License: GPL-3.0-only ++++++ tdesktop-2.5.7-full.tar.gz -> tdesktop-2.5.8-full.tar.gz ++++++ /work/SRC/openSUSE:Factory/telegram-desktop/tdesktop-2.5.7-full.tar.gz /work/SRC/openSUSE:Factory/.telegram-desktop.new.28504/tdesktop-2.5.8-full.tar.gz differ: char 5, line 1

1 0

commit vokoscreenNG for openSUSE:Factory
by Source-Sync 01 Feb '21

01 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vokoscreenNG for openSUSE:Factory checked in at 2021-02-01 13:29:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vokoscreenNG (Old) and /work/SRC/openSUSE:Factory/.vokoscreenNG.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vokoscreenNG" Mon Feb 1 13:29:10 2021 rev:10 rq:868306 version:3.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/vokoscreenNG/vokoscreenNG.changes 2020-10-02 17:42:09.902912571 +0200 +++ /work/SRC/openSUSE:Factory/.vokoscreenNG.new.28504/vokoscreenNG.changes 2021-02-01 13:31:01.142350965 +0100 @@ -1,0 +2,13 @@ +Sun Jan 31 17:50:13 UTC 2021 - Marcel Kuehlhorn <tux93(a)opensuse.org> + +- Update to 3.0.8 + * Remove unneeded x264 presets + * Remove predefined recording areas + * Add h264parse to vaapih264enc + * Add resolution combobox for camera recording in the dialog window + * Limit fps to the vertical refresh rate of the screen in Hz + * Add CPU count to info output + * Translation updates +- Adapt add_appstream_metadata.patch + +------------------------------------------------------------------- Old: ---- 3.0.7.tar.gz New: ---- 3.0.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vokoscreenNG.spec ++++++ --- /var/tmp/diff_new_pack.jogUuI/_old 2021-02-01 13:31:02.094352137 +0100 +++ /var/tmp/diff_new_pack.jogUuI/_new 2021-02-01 13:31:02.098352143 +0100 @@ -1,7 +1,7 @@ # # spec file for package vokoscreenNG # -# 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,7 +17,7 @@ Name: vokoscreenNG -Version: 3.0.7 +Version: 3.0.8 Release: 0 Summary: Screencast creator License: GPL-2.0-only ++++++ 3.0.7.tar.gz -> 3.0.8.tar.gz ++++++ ++++ 17747 lines of diff (skipped) ++++++ add_appstream_metadata.patch ++++++ --- /var/tmp/diff_new_pack.jogUuI/_old 2021-02-01 13:31:02.322352419 +0100 +++ /var/tmp/diff_new_pack.jogUuI/_new 2021-02-01 13:31:02.322352419 +0100 @@ -74,9 +74,9 @@ index 69bc5a33..fdf7fd07 100644 --- a/src/vokoscreenNG.pro +++ b/src/vokoscreenNG.pro -@@ -157,5 +157,30 @@ include(loadExtensions/loadExtensions.pri) - # systrayAlternative - include(systrayAlternative/systrayAlternative.pri) +@@ -65,6 +65,30 @@ TRANSLATIONS = $$files(language/*.ts) + } + else: message(No translation files in project) +unix:!macx { + isEmpty(PREFIX) { @@ -102,6 +102,7 @@ + + INSTALLS += target icon desktop appdata +} -+ - # ciscoOpenh264 - # include(ciscoOpenh264/ciscoOpenh264.pri) + + # Clean target + QMAKE_CLEAN += $$TARGET */*~ +

1 0

commit rdesktop for openSUSE:Factory
by Source-Sync 01 Feb '21

01 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rdesktop for openSUSE:Factory checked in at 2021-02-01 13:29:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rdesktop (Old) and /work/SRC/openSUSE:Factory/.rdesktop.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rdesktop" Mon Feb 1 13:29:08 2021 rev:44 rq:868305 version:1.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rdesktop/rdesktop.changes 2019-12-31 10:28:23.070950651 +0100 +++ /work/SRC/openSUSE:Factory/.rdesktop.new.28504/rdesktop.changes 2021-02-01 13:31:00.102349682 +0100 @@ -1,0 +2,7 @@ +Wed Jan 27 10:30:05 UTC 2021 - seife+obs(a)b1-systems.com + +- remove dependency on python2 + * add rdesktop-convert-map.python3.patch, remove obsolete + rdesktop-Fix-keymap-script.patch + +------------------------------------------------------------------- Old: ---- rdesktop-Fix-keymap-script.patch New: ---- rdesktop-convert-map.python3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rdesktop.spec ++++++ --- /var/tmp/diff_new_pack.OgnwPk/_old 2021-02-01 13:31:00.750350481 +0100 +++ /var/tmp/diff_new_pack.OgnwPk/_new 2021-02-01 13:31:00.754350486 +0100 @@ -1,7 +1,7 @@ # # spec file for package rdesktop # -# Copyright (c) 2019 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 @@ -26,8 +26,8 @@ Source: https://github.com/rdesktop/rdesktop/releases/download/v%{version}/%{name}-… ## FIX-openSUSE: remove "Don't depend on pkg-config" Patch0: rdesktop-fix_pkgconfig_check.patch -# PATCH-FIX-OPENSUSE rdesktop-Fix-keymap-script.patch -Patch3: rdesktop-Fix-keymap-script.patch +# PATCH-FIX-OPENSUSE rdesktop-convert-map.python3.patch -- seife+obs(a)b1-systems.com +Patch3: rdesktop-convert-map.python3.patch # PATCH-FIX-UPSTREAM rdesktop-fix_segfault_in_rdssl_rkey_get_exp_mod.patch Patch4: rdesktop-fix_segfault_in_rdssl_rkey_get_exp_mod.patch BuildRequires: alsa-devel @@ -57,7 +57,7 @@ %prep %setup -q %patch0 -%patch3 +%patch3 -p1 %patch4 -p1 ## rpmlint ++++++ rdesktop-convert-map.python3.patch ++++++ Index: b/keymaps/convert-map =================================================================== --- a/keymaps/convert-map +++ b/keymaps/convert-map @@ -1,4 +1,5 @@ -#!/usr/bin/env python2 +#!/usr/bin/python3 +# -*- coding: utf-8 -*- # -*-Python-*- # # Copyright 2001 Peter ��strand <astrand(a)cendio.se> for Cendio AB @@ -25,13 +26,13 @@ def main(): if not line: break if line.startswith("#") or line.startswith("include"): - print line, + print(line, end=' ') continue fields = line.split() if line.startswith("map"): - print "map 0x%s" % fields[1] + print("map 0x%s" % fields[1]) continue scancode = fields[0] @@ -47,16 +48,16 @@ def main(): elif pos == 4: modifiers = "shift altgr" else: - raise("Invalid line: %s" % line) + raise "Invalid line: %s" - print "%s 0x%s %s" % (keysym, scancode, modifiers) + print("%s 0x%s %s" % (keysym, scancode, modifiers)) if __name__ == "__main__": if len(sys.argv) < 2: - print "Convert old-style keymaps to new style" - print "Usage: %s <old-style-keymap>" % sys.argv[0] + print("Convert old-style keymaps to new style") + print("Usage: %s <old-style-keymap>" % sys.argv[0]) sys.exit(1) else: main()

1 0

commit makeself for openSUSE:Factory
by Source-Sync 01 Feb '21

01 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package makeself for openSUSE:Factory checked in at 2021-02-01 13:29:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/makeself (Old) and /work/SRC/openSUSE:Factory/.makeself.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "makeself" Mon Feb 1 13:29:06 2021 rev:13 rq:868300 version:2.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/makeself/makeself.changes 2020-06-16 13:47:00.942380835 +0200 +++ /work/SRC/openSUSE:Factory/.makeself.new.28504/makeself.changes 2021-02-01 13:30:59.130348484 +0100 @@ -1,0 +2,8 @@ +Sat Jan 30 15:51:03 UTC 2021 - Dirk M��ller <dmueller(a)suse.com> + +- update to 2.4.3: + * includes a number of bug fixes. + * POSIX tar archive format is now explicitly set to increase compatibility + between GNU and BSD variants of the command. + +------------------------------------------------------------------- Old: ---- makeself-2.4.2.tar.gz New: ---- makeself-2.4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ makeself.spec ++++++ --- /var/tmp/diff_new_pack.q9PjQT/_old 2021-02-01 13:30:59.758349258 +0100 +++ /var/tmp/diff_new_pack.q9PjQT/_new 2021-02-01 13:30:59.758349258 +0100 @@ -18,7 +18,7 @@ Name: makeself -Version: 2.4.2 +Version: 2.4.3 Release: 0 Summary: Make self-extractable archives on Unix License: GPL-2.0-or-later ++++++ makeself-2.4.2.tar.gz -> makeself-2.4.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeself-release-2.4.2/.github/workflows/build.yml new/makeself-release-2.4.3/.github/workflows/build.yml --- old/makeself-release-2.4.2/.github/workflows/build.yml 2020-04-27 12:59:03.000000000 +0200 +++ new/makeself-release-2.4.3/.github/workflows/build.yml 2021-01-16 14:33:11.000000000 +0100 @@ -42,7 +42,7 @@ - name: Checkout Makeself uses: actions/checkout@v2 - name: Run ShellCheck - uses: azohra/shell-linter@feature/add-severity-mode + uses: megastep/shell-linter@develop with: path: "makeself.sh" severity: "error" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeself-release-2.4.2/README.md new/makeself-release-2.4.3/README.md --- old/makeself-release-2.4.2/README.md 2020-04-27 12:59:03.000000000 +0200 +++ new/makeself-release-2.4.3/README.md 2021-01-16 14:33:11.000000000 +0100 @@ -111,7 +111,6 @@ * **`--packaging-date date`** : Use provided string as the packaging date instead of the current date. * **`--license`** : Append a license file. * **`--nooverwrite`** : Do not extract the archive if the specified target directory already exists. - * **`--header file`** : Specify the location of the header script file (default `makeself-header.sh`) * **`--help-header file`** : Add a header to the archive's `--help` output. * `archive_dir` is the name of the directory that contains the files to be archived * `file_name` is the name of the archive to be created @@ -200,11 +199,12 @@ * **v2.1.3:** Bug fixes with the command line when spawning terminals. Added `--tar`, `--noexec` for archives. Added `--nomd5` and `--nocrc` to avoid creating checksums in archives. The embedded script is now run through "eval". The `--info` output now includes the command used to create the archive. A man page was contributed by Bartosz Fenski. * **v2.1.4:** Fixed `--info` output. Generate random directory name when extracting files to . to avoid problems. Better handling of errors with wrong permissions for the directory containing the files. Avoid some race conditions, Unset the $CDPATH variable to avoid problems if it is set. Better handling of dot files in the archive directory. * **v2.1.5:** Made the md5sum detection consistent with the header code. Check for the presence of the archive directory. Added `--encrypt` for symmetric encryption through gpg (Eric Windisch). Added support for the digest command on Solaris 10 for MD5 checksums. Check for available disk space before extracting to the target directory (Andreas Schweitzer). Allow extraction to run asynchronously (patch by Peter Hatch). Use file descriptors internally to avoid error messages (patch by Kay Tiong Khoo). - * **v2.1.6:** Replaced one dot per file progress with a realtime progress percentage and a spining cursor. Added `--noprogress` to prevent showing the progress during the decompression. Added `--target` dir to allow extracting directly to a target directory. (Guy Baconniere) + * **v2.1.6:** Replaced one dot per file progress with a realtime progress percentage and a spinning cursor. Added `--noprogress` to prevent showing the progress during the decompression. Added `--target` dir to allow extracting directly to a target directory. (Guy Baconniere) * **v2.2.0:** First major new release in years! Includes many bugfixes and user contributions. Please look at the [project page on Github][10] for all the details. * **v2.3.0:** Support for archive encryption via GPG or OpenSSL. Added LZO and LZ4 compression support. Options to set the packaging date and stop the umask from being overriden. Optionally ignore check for available disk space when extracting. New option to check for root permissions before extracting. * **v2.3.1:** Various compatibility updates. Added unit tests for Travis CI in the GitHub repo. New `--tar-extra`, `--untar-extra`, `--gpg-extra`, `--gpg-asymmetric-encrypt-sign` options. * **v2.4.0:** Added optional support for SHA256 archive integrity checksums. + * **v2.4.2:** New --cleanup and --cleanup-args arguments for cleanup scripts. Added threading support for supported compressors. Now supports zstd compression. ## Links diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeself-release-2.4.2/VERSION new/makeself-release-2.4.3/VERSION --- old/makeself-release-2.4.2/VERSION 2020-04-27 12:59:03.000000000 +0200 +++ new/makeself-release-2.4.3/VERSION 2021-01-16 14:33:11.000000000 +0100 @@ -1 +1 @@ -2.4.2 +2.4.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeself-release-2.4.2/makeself-header.sh new/makeself-release-2.4.3/makeself-header.sh --- old/makeself-release-2.4.2/makeself-header.sh 2020-04-27 12:59:03.000000000 +0200 +++ new/makeself-release-2.4.3/makeself-header.sh 2021-01-16 14:33:11.000000000 +0100 @@ -14,7 +14,7 @@ TMPROOT=\${TMPDIR:=/tmp} USER_PWD="\$PWD" export USER_PWD -ARCHIVE_DIR=`dirname \$0` +ARCHIVE_DIR=\`dirname "\$0"\` export ARCHIVE_DIR label="$LABEL" @@ -25,6 +25,7 @@ helpheader='$HELPHEADER' targetdir="$archdirname" filesizes="$filesizes" +totalsize="$totalsize" keep="$KEEP" nooverwrite="$NOOVERWRITE" quiet="n" @@ -96,9 +97,14 @@ { blocks=\`expr \$3 / 1024\` bytes=\`expr \$3 % 1024\` - dd if="\$1" ibs=\$2 skip=1 obs=1024 conv=sync 2> /dev/null | \\ - { test \$blocks -gt 0 && dd ibs=1024 obs=1024 count=\$blocks ; \\ - test \$bytes -gt 0 && dd ibs=1 obs=1024 count=\$bytes ; } 2> /dev/null + # Test for ibs, obs and conv feature + if dd if=/dev/zero of=/dev/null count=1 ibs=512 obs=512 conv=sync 2> /dev/null; then + dd if="\$1" ibs=\$2 skip=1 obs=1024 conv=sync 2> /dev/null | \\ + { test \$blocks -gt 0 && dd ibs=1024 obs=1024 count=\$blocks ; \\ + test \$bytes -gt 0 && dd ibs=1 obs=1024 count=\$bytes ; } 2> /dev/null + else + dd if="\$1" bs=\$2 skip=1 2> /dev/null + fi } MS_dd_Progress() @@ -201,6 +207,11 @@ MS_Printf "Verifying archive integrity..." fi offset=\`head -n "\$skip" "\$1" | wc -c | tr -d " "\` + fsize=\`cat "\$1" | wc -c | tr -d " "\` + if test \$totalsize -ne \`expr \$fsize - \$offset\`; then + echo " Unexpected archive size." >&2 + exit 2 + fi verb=\$2 i=1 for s in \$filesizes @@ -337,7 +348,7 @@ echo Encryption: $ENCRYPT fi echo Date of packaging: $DATE - echo Built with Makeself version $MS_VERSION on $OSTYPE + echo Built with Makeself version $MS_VERSION echo Build command was: "$MS_COMMAND" if test x"\$script" != x; then echo Script run after extraction: @@ -366,6 +377,7 @@ echo NOOVERWRITE=$NOOVERWRITE echo COMPRESS=$COMPRESS echo filesizes=\"\$filesizes\" + echo totalsize=\"\$totalsize\" echo CRCsum=\"\$CRCsum\" echo MD5sum=\"\$MD5sum\" echo SHAsum=\"\$SHAsum\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeself-release-2.4.2/makeself.1 new/makeself-release-2.4.3/makeself.1 --- old/makeself-release-2.4.2/makeself.1 2020-04-27 12:59:03.000000000 +0200 +++ new/makeself-release-2.4.3/makeself.1 2021-01-16 14:33:11.000000000 +0100 @@ -1,19 +1,14 @@ -.TH "makeself" "1" "2.1.6" +.TH "MAKESELF" "1" "2.1.6" .SH "NAME" makeself \- An utility to generate self-extractable archives. .SH "SYNTAX" -.LP -.B makeself [\fIoptions\fP] archive_dir file_name label +.B makeself [\fIoptions\fP] archive_dir file_name label .B [\fIstartup_script\fP] [\fIargs\fP] .SH "DESCRIPTION" -.LP -This program is a free (GPL) utility designed to create self-extractable -archives from a directory. -.br +This program is a free (GPL) utility designed to create self-extractable +archives from a directory. .SH "OPTIONS" -.LP The following options are supported. -.LP .TP 15 .B -v, --version Prints out the makeself version number and exits. @@ -55,7 +50,7 @@ Specify the compression level for gzip,bzip2,pbzui2,xz,lzo or lz4 .TP .B --notemp -The archive will create archive_dir in the current directory and +The archive will create archive_dir in the current directory and uncompress in ./archive_dir. .TP .B --copy @@ -71,7 +66,7 @@ Extract directly to a target directory. Directory path can be either absolute or relative. .TP .B --header file -Specify location of the header script. +Specify location of the header script. .TP .B --cleanup file Specify a cleanup script that executes on interrupt and when finished successfully. @@ -98,10 +93,18 @@ LSM file describing the package. .B --packaging-date date Use provided string as the packaging date instead of the current date. -.PD +.SH "EXAMPLES" +Here is an example, assuming the user has a package image stored in a /home/joe/mysoft, +and he wants to generate a self-extracting package named mysoft.sh, which will launch +the "setup" script initially stored in /home/joe/mysoft: +.TP +makeself.sh /home/joe/mysoft mysoft.sh "Joe's Nice Software Package" ./setup +.TP +Here is also how I created the makeself.run archive which contains the Makeself distribution: +.TP +makeself.sh --notemp makeself makeself.run "Makeself by Stephane Peter" echo "Makeself has extracted itself" .SH "AUTHORS" -.LP -Makeself has been written by St�phane Peter <megastep(a)megastep.org>. -.BR -This man page was originally written by Bartosz Fenski <fenio(a)o2.pl> for the +Makeself has been written by St��phane Peter <megastep(a)megastep.org>. +.BR +This man page was originally written by Bartosz Fenski <fenio(a)o2.pl> for the Debian GNU/Linux distribution (but it may be used by others). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeself-release-2.4.2/makeself.sh new/makeself-release-2.4.3/makeself.sh --- old/makeself-release-2.4.2/makeself.sh 2020-04-27 12:59:03.000000000 +0200 +++ new/makeself-release-2.4.3/makeself.sh 2021-01-16 14:33:11.000000000 +0100 @@ -70,15 +70,16 @@ # - 2.4.0 : Optional support for SHA256 checksums in archives. # - 2.4.2 : Add support for threads for several compressors. (M. Limber) # Added zstd support. +# - 2.4.3 : Make explicit POSIX tar archives for increased compatibility. # -# (C) 1998-2020 by Stephane Peter <megastep(a)megastep.org> +# (C) 1998-2021 by Stephane Peter <megastep(a)megastep.org> # # This software is released under the terms of the GNU GPL version 2 and above # Please read the license at http://www.gnu.org/copyleft/gpl.html # Self-extracting archives created with this script are explictly NOT released under the term of the GPL # -MS_VERSION=2.4.2 +MS_VERSION=2.4.3 MS_COMMAND="$0" unset CDPATH @@ -97,8 +98,8 @@ MS_Usage() { - echo "Usage: $0 [params] archive_dir file_name label startup_script [args]" - echo "params can be one or more of the following :" + echo "Usage: $0 [args] archive_dir file_name label startup_script [script_args]" + echo "args can be one or more of the following :" echo " --version | -v : Print out Makeself version number and exit" echo " --help | -h : Print out this help message" echo " --tar-quietly : Suppress verbose output from the tar command" @@ -173,10 +174,13 @@ } # Default settings -if type gzip > /dev/null 2>&1; then +if type gzip >/dev/null 2>&1; then COMPRESS=gzip +elif type compress >/dev/null 2>&1; then + COMPRESS=compress else - COMPRESS=Unix + echo "ERROR: missing commands: gzip, compress" >&2 + MS_Usage fi ENCRYPT=n PASSWD="" @@ -251,7 +255,7 @@ shift ;; --compress) - COMPRESS=Unix + COMPRESS=compress shift ;; --base64) @@ -444,7 +448,7 @@ if test "$QUIET" = "y" || test "$TAR_QUIETLY" = "y"; then if test "$TAR_ARGS" = "rvf"; then TAR_ARGS="rf" - elif test "$TAR_ARGS" = "rvhf";then + elif test "$TAR_ARGS" = "rvhf"; then TAR_ARGS="rhf" fi fi @@ -461,6 +465,7 @@ exit 1 else eval "$OLDENV" + OLDSKIP=`expr $SKIP + 1` fi else if test "$KEEP" = n -a $# = 3; then @@ -550,9 +555,9 @@ GUNZIP_CMD="gpg --yes -d" ENCRYPT="gpg" ;; -Unix) - GZIP_CMD="compress -cf" - GUNZIP_CMD="exec 2>&-; uncompress -c || test \\\$? -eq 2 || gzip -cd" +compress) + GZIP_CMD="compress -fc" + GUNZIP_CMD="(type compress >/dev/null 2>&1 && compress -fcd || gzip -cd)" ;; none) GZIP_CMD="cat" @@ -587,22 +592,21 @@ archname="$tmpfile" # Generate a fake header to count its lines SKIP=0 - . "$HEADER" - SKIP=`cat "$tmpfile" |wc -l` + . "$HEADER" + SKIP=`cat "$tmpfile" |wc -l` # Get rid of any spaces SKIP=`expr $SKIP` rm -f "$tmpfile" - if test "$QUIET" = "n";then - echo "Header is $SKIP lines long" >&2 - fi - + if test "$QUIET" = "n"; then + echo "Header is $SKIP lines long" >&2 + fi archname="$oldarchname" else echo "Unable to open header file: $HEADER" >&2 exit 1 fi -if test "$QUIET" = "n";then +if test "$QUIET" = "n"; then echo fi @@ -629,13 +633,29 @@ tmparch="${TMPDIR:-/tmp}/mkself$$.tar" ( if test "$APPEND" = "y"; then - tail -n "+$OLDSKIP" "$archname" | $GUNZIP_CMD > "$tmparch" + tail -n "+$OLDSKIP" "$archname" | eval "$GUNZIP_CMD" > "$tmparch" fi cd "$archdir" - find . ! -type d -o -links 2 \ + # "Determining if a directory is empty" + # https://www.etalabs.net/sh_tricks.html + find . \ + $ \ + ! -type d \ + -o \ + \( -links 2 -exec sh -c ' + is_empty () ( + cd "$1" + set -- .[!.]* ; test -f "$1" && return 1 + set -- ..?* ; test -f "$1" && return 1 + set -- * ; test -f "$1" && return 1 + return 0 + ) + is_empty "$0"' {} \; \ + $ \ + \) -print \ | LC_ALL=C sort \ | sed 's/./\\&/g' \ - | xargs tar $TAR_EXTRA -$TAR_ARGS "$tmparch" + | xargs tar $TAR_EXTRA --posix -$TAR_ARGS "$tmparch" ) || { echo "ERROR: failed to create temporary archive: $tmparch" rm -f "$tmparch" "$tmpfile" @@ -666,12 +686,12 @@ crcsum=0000000000 if test "$NOCRC" = y; then - if test "$QUIET" = "n";then + if test "$QUIET" = "n"; then echo "skipping crc at user request" fi else crcsum=`CMD_ENV=xpg4 cksum < "$tmpfile" | sed -e 's/ /Z/' -e 's/ /Z/' | cut -dZ -f1` - if test "$QUIET" = "n";then + if test "$QUIET" = "n"; then echo "CRC: $crcsum" fi fi @@ -693,7 +713,7 @@ fi fi if test "$NOMD5" = y; then - if test "$QUIET" = "n";then + if test "$QUIET" = "n"; then echo "Skipping md5sum at user request" fi else @@ -710,16 +730,22 @@ MD5_ARG="-a md5" fi md5sum=`eval "$MD5_PATH $MD5_ARG" < "$tmpfile" | cut -b-32` - if test "$QUIET" = "n";then + if test "$QUIET" = "n"; then echo "MD5: $md5sum" fi else - if test "$QUIET" = "n";then + if test "$QUIET" = "n"; then echo "MD5: none, MD5 command not found" fi fi fi +totalsize=0 +for size in $fsize; +do + totalsize=`expr $totalsize + $size` +done + if test "$APPEND" = y; then mv "$archname" "$archname".bak || exit @@ -735,7 +761,7 @@ chmod +x "$archname" rm -f "$archname".bak - if test "$QUIET" = "n";then + if test "$QUIET" = "n"; then echo "Self-extractable archive \"$archname\" successfully updated." fi else @@ -748,12 +774,12 @@ . "$HEADER" # Append the compressed tar data after the stub - if test "$QUIET" = "n";then + if test "$QUIET" = "n"; then echo fi cat "$tmpfile" >> "$archname" chmod +x "$archname" - if test "$QUIET" = "n";then + if test "$QUIET" = "n"; then echo Self-extractable archive \"$archname\" successfully created. fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeself-release-2.4.2/test/appendtest new/makeself-release-2.4.3/test/appendtest --- old/makeself-release-2.4.2/test/appendtest 2020-04-27 12:59:03.000000000 +0200 +++ new/makeself-release-2.4.3/test/appendtest 2021-01-16 14:33:11.000000000 +0100 @@ -1,48 +1,100 @@ #!/bin/bash +# FIXME: These tests need to check that the concatenation of archives works -SUT=$(realpath $(dirname $0)/../makeself.sh) -SOURCE=$(realpath ..) +set -eu -setupTests() { - temp=`mktemp -d -t appendtest.XXXXX` - cd "$temp" - mkdir archive - cp -a $SOURCE archive/ - $SUT $* archive makeself-test.run "Test $*" echo Testing --tar-extra="--exclude .git" - mkdir -p append/append_dir/ - cp -a $SOURCE/makeself.sh append/append_dir/ +THIS="$(realpath "$0")" +WHAT="$(basename "${THIS}")" +HERE="$(dirname "${THIS}")" +SRCDIR="$(dirname "${HERE}")" +SUT="${SRCDIR}/makeself.sh" + +readonly archive_dir_create="$(mktemp -dt archive_dir_create.XXXXXX)" +readonly archive_dir_append="$(mktemp -dt archive_dir_append.XXXXXX)" +touch "${archive_dir_create}/fee" +touch "${archive_dir_create}/fie" +touch "${archive_dir_append}/foe" +touch "${archive_dir_append}/fum" + +evalAssert() { + eval "$@" + assertEqual "$?" "0" } +# $1 : file_name +doInfoListCheckExec() { + evalAssert "$1" --info + evalAssert "$1" --list + evalAssert "$1" --check + evalAssert "$1" +} -testGzip() -{ - setupTests --gzip - - $SUT --append append/ makeself-test.run - assertEqual $? 0 - ./makeself-test.run --check - assertEqual $? 0 +# $1 : file_name +# rest : content basenames +assertContains() { + local file_name="" + file_name="$(realpath "$1")" + shift + local target="${file_name}.d" + rm -rf "${target}" + mkdir -p "${target}" + evalAssert "${file_name}" --target "${target}" + assertEqual \ + "$(find "${target}" -type f -exec basename -a {} + | sort)" \ + "$(echo "$@" | sort)" + rm -rf "${target}" } +# $@ : makeself options +doTestOpts() { + local stem="" + stem="$(printf '%s' "${WHAT}" "$@" | tr -sc '[:alnum:]_.-' '_')" + local file_name="" + file_name="$(realpath "${stem}.run")" + + evalAssert "${SUT}" "$@" --sha256 \ + "${archive_dir_create}" \ + "${file_name}" \ + "${stem}" \ + "echo ${stem}" + doInfoListCheckExec "${file_name}" + assertContains "${file_name}" "fee" "fie" + + evalAssert "${SUT}" "$@" --sha256 \ + --append "${archive_dir_append}" \ + "${file_name}" + doInfoListCheckExec "${file_name}" + assertContains "${file_name}" "fee" "fie" "foe" "fum" -testNocomp() -{ - setupTests --nocomp - - $SUT --append append/ makeself-test.run - assertEqual $? 0 - ./makeself-test.run --check - assertEqual $? 0 + rm -f "${file_name}" } -testBzip2() -{ - setupTests --bzip2 - - $SUT --append append/ makeself-test.run - assertEqual $? 0 - ./makeself-test.run --check - assertEqual $? 0 +# $1 : compression option +doTestComp() { + if ! command -v "${1#--*}" >/dev/null 2>&1; then + echo "WARNING: missing command: ${1#--*}" >&2 + return 0 + fi + doTestOpts "$1" } +################################################################################ + +testDefault() { doTestOpts; } + +testNocomp() { doTestOpts --nocomp; } + +testBase64() { doTestComp --base64; } +testBzip2() { doTestComp --bzip2; } +testCompress() { doTestComp --compress; } +testGzip() { doTestComp --gzip; } +testLz4() { doTestComp --lz4; } +testLzo() { doTestComp --lzo; } +testPbzip2() { doTestComp --pbzip2; } +testPigz() { doTestComp --pigz; } +testXz() { doTestComp --xz; } +testZstd() { doTestComp --zstd; } + source bashunit/bashunit.bash + +rm -rf "${archive_dir_create}" "${archive_dir_append}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeself-release-2.4.2/test/corrupttest new/makeself-release-2.4.3/test/corrupttest --- old/makeself-release-2.4.2/test/corrupttest 1970-01-01 01:00:00.000000000 +0100 +++ new/makeself-release-2.4.3/test/corrupttest 2021-01-16 14:33:11.000000000 +0100 @@ -0,0 +1,38 @@ +#!/bin/bash +# Test that corrupted archives actually fail validation + +SUT=$(realpath $(dirname $0)/../makeself.sh) +SOURCE=$(realpath ..) + +setupTests() { + temp=`mktemp -d -t appendtest.XXXXX` + cd "$temp" + mkdir archive + cp -a $SOURCE archive/ + $SUT $* archive makeself-test.run "Test $*" echo Testing --tar-extra="--exclude .git" +} + +testExtraBytes() { + setupTests --sha256 + + ./makeself-test.run --check + assertEqual $? 0 + + echo "Adding a bunch of random characters at the end!!" >> makeself-test.run + + ./makeself-test.run --check + assertNotEqual $? 0 +} + +testTruncated() { + setupTests --sha256 + + ./makeself-test.run --check + assertEqual $? 0 + + dd if=makeself-test.run of=truncated.run bs=1 count=34303 + bash truncated.run --check + assertNotEqual $? 0 +} + +source bashunit/bashunit.bash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeself-release-2.4.2/test/infotest new/makeself-release-2.4.3/test/infotest --- old/makeself-release-2.4.2/test/infotest 1970-01-01 01:00:00.000000000 +0100 +++ new/makeself-release-2.4.3/test/infotest 2021-01-16 14:33:11.000000000 +0100 @@ -0,0 +1,122 @@ +#!/bin/bash + +# makeself/test/infotest + +THIS="$(realpath "$0")" +HERE="$(dirname "${THIS}")" +SRCDIR="$(dirname "${HERE}")" +VERSION="$(xargs printf '%s' <"${SRCDIR}/VERSION")" + +################################################################################ + +# Take makeself options, generate a predefined archive, print --info to stdout. +# +# $@ : makeself options +haveInfo() ( + cd "${SRCDIR}" || return 1 + mkdir -p infotest + ./makeself.sh "$@" ./infotest ./infotest.run infotest ls -lah >/dev/null 2>&1 + assertEqual "$?" 0 >&2 + ./infotest.run --info + assertEqual "$?" 0 >&2 + rm -rf infotest infotest.run +) + +# Read want.info from stdin. Generate have.info using given options. Invoke +# diff want.info have.info and return its exit status +# +# $@ : makeself options +diffInfo() { + local rc="" + cd "$(mktemp -d)" || return 1 + cat >want.info + haveInfo "$@" >have.info + if diff want.info have.info >&2; then + rc="$?" + else + rc="$?" + fi + rm -f have.info want.info + return "${rc}" +} + +testDefault() ( + cd "$(mktemp -d)" || return 1 + diffInfo --packaging-date "@0" <<EOF +Identification: infotest +Target directory: infotest +Uncompressed size: 12 KB +Compression: gzip +Encryption: n +Date of packaging: @0 +Built with Makeself version ${VERSION} +Build command was: ./makeself.sh \\ + "--packaging-date" \\ + "@0" \\ + "./infotest" \\ + "./infotest.run" \\ + "infotest" \\ + "ls" \\ + "-lah" +Script run after extraction: + ls -lah +infotest will be removed after extraction +EOF + assertEqual "$?" 0 +) + +testNocomp() ( + cd "$(mktemp -d)" || return 1 + diffInfo --packaging-date "@0" --nocomp <<EOF +Identification: infotest +Target directory: infotest +Uncompressed size: 12 KB +Compression: none +Encryption: n +Date of packaging: @0 +Built with Makeself version ${VERSION} +Build command was: ./makeself.sh \\ + "--packaging-date" \\ + "@0" \\ + "--nocomp" \\ + "./infotest" \\ + "./infotest.run" \\ + "infotest" \\ + "ls" \\ + "-lah" +Script run after extraction: + ls -lah +infotest will be removed after extraction +EOF + assertEqual "$?" 0 +) + +testNotemp() ( + cd "$(mktemp -d)" || return 1 + diffInfo --packaging-date "@0" --notemp <<EOF +Identification: infotest +Target directory: infotest +Uncompressed size: 12 KB +Compression: gzip +Encryption: n +Date of packaging: @0 +Built with Makeself version ${VERSION} +Build command was: ./makeself.sh \\ + "--packaging-date" \\ + "@0" \\ + "--notemp" \\ + "./infotest" \\ + "./infotest.run" \\ + "infotest" \\ + "ls" \\ + "-lah" +Script run after extraction: + ls -lah +directory infotest is permanent +EOF + assertEqual "$?" 0 +) + +################################################################################ + +source "${HERE}/bashunit/bashunit.bash" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeself-release-2.4.2/test/variabletest new/makeself-release-2.4.3/test/variabletest --- old/makeself-release-2.4.2/test/variabletest 1970-01-01 01:00:00.000000000 +0100 +++ new/makeself-release-2.4.3/test/variabletest 2021-01-16 14:33:11.000000000 +0100 @@ -0,0 +1,51 @@ +#!/usr/bin/env bash + +SUT=$(realpath $(dirname $0)/../makeself.sh) +SOURCE=$(realpath ..) + +setupTests() { + temp=`mktemp -d -t XXXXX` + cd "$temp" + mkdir archive + touch archive/file + + # $SUT archive makeself-test.run "Test $1" declare -p "${1}" + $SUT archive makeself-test.run "Test $1" echo \\\"\${${1}}\\\" +} + +testArchiveDir() +{ + setupTests ARCHIVE_DIR + local ans=$'./complicated\n dir\twith spaces' + mkdir "${ans}" + mv ./makeself-test.run "${ans}/" + actual_archive_dir="$("${ans}/makeself-test.run" --quiet)" + + assertEqual "${actual_archive_dir}" "${ans}" +} + +testTmpRoot() +{ + setupTests TMPROOT + local ans="${temp}"$'/complicated\n dir\twith spaces' + mkdir -p "${ans}" + + actual_tmp_root="$(TMPDIR="${ans}" "./makeself-test.run" --quiet)" + + assertEqual "${actual_tmp_root}" "${ans}" +} + +testUserPWD() +{ + setupTests USER_PWD + local ans="${temp}"$'/complicated\n dir\twith spaces' + mkdir -p "${ans}" + cd "${ans}" + + actual_user_pwd="$("${temp}/makeself-test.run" --quiet)" + + assertEqual "${actual_user_pwd}" "${ans}" +} + + +source bashunit/bashunit.bash

1 0

commit libvc for openSUSE:Factory
by Source-Sync 01 Feb '21

01 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libvc for openSUSE:Factory checked in at 2021-02-01 13:29:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvc (Old) and /work/SRC/openSUSE:Factory/.libvc.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvc" Mon Feb 1 13:29:04 2021 rev:4 rq:868297 version:008 Changes: -------- --- /work/SRC/openSUSE:Factory/libvc/libvc.changes 2020-07-16 12:17:07.830884505 +0200 +++ /work/SRC/openSUSE:Factory/.libvc.new.28504/libvc.changes 2021-02-01 13:30:58.010347104 +0100 @@ -1,0 +2,7 @@ +Mon Feb 1 09:10:59 UTC 2021 - Michael Vetter <mvetter(a)suse.com> + +- Update to 008: + * Properly parse multi-line values in MSDOS files, with line + ending CRLF + +------------------------------------------------------------------- Old: ---- v007.tar.gz New: ---- v008.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvc.spec ++++++ --- /var/tmp/diff_new_pack.NU8hAk/_old 2021-02-01 13:30:58.750348016 +0100 +++ /var/tmp/diff_new_pack.NU8hAk/_new 2021-02-01 13:30:58.754348021 +0100 @@ -1,7 +1,7 @@ # # spec file for package libvc # -# 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 @@ -18,7 +18,7 @@ %define c_lib libvc0 Name: libvc -Version: 007 +Version: 008 Release: 0 Summary: Library to read and write vcard files License: LGPL-2.1-only ++++++ v007.tar.gz -> v008.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvc-007/AUTHORS new/libvc-008/AUTHORS --- old/libvc-007/AUTHORS 2020-07-14 20:27:59.000000000 +0200 +++ new/libvc-008/AUTHORS 2021-01-30 17:41:34.000000000 +0100 @@ -1,2 +1,2 @@ Andrew Hsu <ahsu(a)users.sf.net> -Rafael Laboissiere <rafael(a)laboissiere.net> +Rafael Laboissi��re <rafael(a)laboissiere.net> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvc-007/NEWS new/libvc-008/NEWS --- old/libvc-007/NEWS 2020-07-14 20:27:59.000000000 +0200 +++ new/libvc-008/NEWS 2021-01-30 17:41:34.000000000 +0100 @@ -1,3 +1,8 @@ +libvc 008 (2021-01-30) + +* Properly parse multi-line values in MSDOS files, with line ending +CRLF. Thanks to Adrian Edwards (MoralCode @ github) for the patch. + libvc 007 (2020-07-14) * Use mktemp instead of deprecated tempfile in unit tests diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvc-007/configure.ac new/libvc-008/configure.ac --- old/libvc-007/configure.ac 2020-07-14 20:27:59.000000000 +0200 +++ new/libvc-008/configure.ac 2021-01-30 17:41:34.000000000 +0100 @@ -2,7 +2,7 @@ # $Id: configure.ac,v 1.3 2003/06/14 01:54:15 ahsu Rel $ ### Versioning -AC_INIT([libvc],[007],[rafael(a)laboissiere.net]) +AC_INIT([libvc],[008],[rafael(a)laboissiere.net]) LIBVC_ABI_VERSION=0:1:0 AC_SUBST(LIBVC_ABI_VERSION) @@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (C) 2003 Andrew Hsu -Copyright (C) 2017, 2019, 2020 Rafael Laboissiere]) +Copyright (C) 2017, 2019-2021 Rafael Laboissi��re]) AC_REVISION($Revision: 1.3 $) AC_CONFIG_SRCDIR([src/vc.c]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libvc-007/src/vc_scan.l new/libvc-008/src/vc_scan.l --- old/libvc-007/src/vc_scan.l 2020-07-14 20:27:59.000000000 +0200 +++ new/libvc-008/src/vc_scan.l 2021-01-30 17:41:34.000000000 +0100 @@ -58,7 +58,7 @@ "BEGIN:VCARD" { yylval = NULL; return TOK_BEGIN_VCARD; } "END:VCARD" { yylval = NULL; return TOK_END_VCARD; } -"\n" { yylval = NULL; return yytext[0]; } +{LF} { yylval = NULL; return yytext[0]; } "." { yylval = NULL; return yytext[0]; } ({ALPHA}|{DIGIT}|-)+/"." { yylval = yytext; return TOK_GROUP; } {NAME-CHAR}+ { yylval = yytext; return TOK_NAME; } @@ -67,8 +67,8 @@ <SC_VALUE> { -({VALUE-CHAR}|"\n ")* { yylval = yytext; return TOK_VALUE; } -"\n" { yylval = NULL; BEGIN(INITIAL); return yytext[0]; } +({VALUE-CHAR}|({CRLF}|{LF}){SP})* { yylval = yytext; return TOK_VALUE; } +{LF} { yylval = NULL; BEGIN(INITIAL); return yytext[0]; } } <SC_PARAM>

1 0

commit nwg-launchers for openSUSE:Factory
by Source-Sync 01 Feb '21

01 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nwg-launchers for openSUSE:Factory checked in at 2021-02-01 13:29:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nwg-launchers (Old) and /work/SRC/openSUSE:Factory/.nwg-launchers.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nwg-launchers" Mon Feb 1 13:29:03 2021 rev:8 rq:868301 version:0.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/nwg-launchers/nwg-launchers.changes 2021-01-06 19:56:55.125134375 +0100 +++ /work/SRC/openSUSE:Factory/.nwg-launchers.new.28504/nwg-launchers.changes 2021-02-01 13:30:57.182346084 +0100 @@ -1,0 +2,8 @@ +Mon Feb 1 09:13:00 UTC 2021 - Michael Vetter <mvetter(a)suse.com> + +- Update to 0.4.4: + * Fix desktop description line break (#151) + * Fix press entering (#152) + * Fix nwgdmenu error (#153) + +------------------------------------------------------------------- Old: ---- v0.4.3.tar.gz New: ---- v0.4.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nwg-launchers.spec ++++++ --- /var/tmp/diff_new_pack.hvmIoH/_old 2021-02-01 13:30:57.798346843 +0100 +++ /var/tmp/diff_new_pack.hvmIoH/_new 2021-02-01 13:30:57.798346843 +0100 @@ -17,7 +17,7 @@ Name: nwg-launchers -Version: 0.4.3 +Version: 0.4.4 Release: 0 Summary: GTK launchers and menu for sway and i3 License: GPL-3.0-or-later ++++++ v0.4.3.tar.gz -> v0.4.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nwg-launchers-0.4.3/dmenu/dmenu.cc new/nwg-launchers-0.4.4/dmenu/dmenu.cc --- old/nwg-launchers-0.4.3/dmenu/dmenu.cc 2021-01-05 01:35:48.000000000 +0100 +++ new/nwg-launchers-0.4.4/dmenu/dmenu.cc 2021-01-30 15:35:45.000000000 +0100 @@ -57,12 +57,12 @@ int main(int argc, char *argv[]) { std::string custom_css_file {"style.css"}; - /* For now the settings file only determines if case_sensitive was turned on. - * Let's just check if the file exists. - **/ + // For now the settings file only determines if case_sensitive was turned on. settings_file = get_settings_path(); - if (std::ifstream(settings_file)) { - case_sensitive = false; + if (std::ifstream settings{ settings_file }) { + std::string sensitivity; + settings >> sensitivity; + case_sensitive = sensitivity == "case_sensitive"; } create_pid_file_or_kill_pid("nwgdmenu"); @@ -188,7 +188,7 @@ sock.run("for_window [title=\"~nwgdmenu*\"] border none"); } - Gtk::Main kit(argc, argv); + auto app = Gtk::Application::create(); auto provider = Gtk::CssProvider::create(); auto display = Gdk::Display::get_default(); @@ -212,8 +212,8 @@ // For openbox and similar we'll need the window x, y coordinates window.show(); - DMenu menu; - Anchor anchor(&menu); + DMenu menu{window}; + Anchor anchor{menu}; window.anchor = &anchor; window.signal_button_press_event().connect(sigc::ptr_fun(&on_window_clicked)); @@ -262,30 +262,7 @@ //~ window.hide(); } - if (show_searchbox) { - auto search_item = new Gtk::MenuItem(); - search_item -> add(menu.searchbox); - search_item -> set_name("search_item"); - search_item -> set_sensitive(false); - menu.append(*search_item); - } - - menu.signal_deactivate().connect(sigc::ptr_fun(Gtk::Main::quit)); - - int cnt = 0; - for (auto& command : all_commands) { - auto item = new Gtk::MenuItem(); - item -> set_label(command); - item -> signal_activate().connect(sigc::bind<std::string>(sigc::ptr_fun(&on_item_clicked), - std::move(command))); - - menu.append(*item); - cnt++; - if (cnt > rows - 1) { - break; - } - } - + menu.signal_deactivate().connect(sigc::mem_fun(window, &MainWindow::close)); menu.set_reserve_toggle_size(false); menu.set_property("width_request", w / 8); @@ -318,7 +295,5 @@ menu.show_all(); - Gtk::Main::run(window); - - return 0; + return app->run(window); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nwg-launchers-0.4.3/dmenu/dmenu.h new/nwg-launchers-0.4.4/dmenu/dmenu.h --- old/nwg-launchers-0.4.3/dmenu/dmenu.h 2021-01-05 01:35:48.000000000 +0100 +++ new/nwg-launchers-0.4.4/dmenu/dmenu.h 2021-01-30 15:35:45.000000000 +0100 @@ -42,23 +42,38 @@ class DMenu : public Gtk::Menu { public: - DMenu(); - Gtk::SearchEntry searchbox; - Glib::ustring search_phrase; - + DMenu(Gtk::Window&); + ~DMenu(); + void emplace_back(const Glib::ustring&); + void show_all() { + Gtk::Menu::show_all(); + // required to have first item selected on launch + fix_selection(); + } + private: + Gtk::SearchEntry searchbox; + // parent window + Gtk::Window& main; + // the first item in list + Gtk::MenuItem* first_item = nullptr; + // whether case sensitivity was changed during run + bool case_sensitivity_changed = false; + bool on_key_press_event(GdkEventKey* event) override; void filter_view(); + void switch_case_sensitivity(); + void fix_selection(); void on_item_clicked(Glib::ustring cmd); }; class Anchor : public Gtk::Button { public: - Anchor(DMenu *); - + Anchor(DMenu&); private: bool on_focus_in_event(GdkEventFocus* focus_event) override; - DMenu *menu; + Gdk::Gravity gravity_widget, gravity_menu; + DMenu& menu; }; class MainWindow : public CommonWindow { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nwg-launchers-0.4.3/dmenu/dmenu_classes.cc new/nwg-launchers-0.4.4/dmenu/dmenu_classes.cc --- old/nwg-launchers-0.4.3/dmenu/dmenu_classes.cc 2021-01-05 01:35:48.000000000 +0100 +++ new/nwg-launchers-0.4.4/dmenu/dmenu_classes.cc 2021-01-30 15:35:45.000000000 +0100 @@ -16,102 +16,122 @@ #include "dmenu.h" -Anchor::Anchor(DMenu *menu) : menu{menu} {} +Anchor::Anchor(DMenu& menu): + gravity_widget{Gdk::GRAVITY_CENTER}, gravity_menu{Gdk::GRAVITY_CENTER}, menu{menu} +{ + constexpr std::array gravity { Gdk::GRAVITY_SOUTH, Gdk::GRAVITY_NORTH }; + auto is_sway_like = wm == "sway" || wm == "i3"; + if (v_align == "t") { + gravity_widget = gravity[is_sway_like]; + gravity_menu = gravity[is_sway_like]; + } else if (v_align == "b") { + gravity_widget = gravity[!is_sway_like]; + gravity_menu = gravity[!is_sway_like]; + } +} bool Anchor::on_focus_in_event(GdkEventFocus* focus_event) { (void) focus_event; // suppress warning + menu.popup_at_widget(this, gravity_widget, gravity_menu, nullptr); + return true; +} - Gdk::Gravity gravity_widget {Gdk::GRAVITY_CENTER}; - Gdk::Gravity gravity_menu {Gdk::GRAVITY_CENTER}; - if (wm == "sway" || wm == "i3") { - if (v_align == "t") { - gravity_widget = Gdk::GRAVITY_NORTH; - gravity_menu = Gdk::GRAVITY_NORTH; - } else if (v_align == "b") { - gravity_widget = Gdk::GRAVITY_SOUTH; - gravity_menu = Gdk::GRAVITY_SOUTH; - } - } else { - if (v_align == "t") { - gravity_widget = Gdk::GRAVITY_SOUTH; - gravity_menu = Gdk::GRAVITY_SOUTH; - } else if (v_align == "b") { - gravity_widget = Gdk::GRAVITY_NORTH; - gravity_menu = Gdk::GRAVITY_NORTH; - } +inline auto set_searchbox_placeholder = [](auto && searchbox, auto case_sensitive) { + constexpr std::array placeholders { "TYPE TO SEARCH", "Type to Search" }; + searchbox.set_placeholder_text(placeholders[case_sensitive]); +}; + +inline auto build_commands_list = [](auto && dmenu, auto && commands, auto max) { + decltype(max) count{ 0 }; + for (auto && command: commands) { + dmenu.emplace_back(command); + count++; + if (count == max) { + break; + } + } +}; + +DMenu::DMenu(Gtk::Window& main): main{main} { + set_searchbox_placeholder(searchbox, case_sensitive); + searchbox.set_sensitive(true); + searchbox.set_name("searchbox"); + searchbox.signal_search_changed() + .connect(sigc::mem_fun(*this, &DMenu::filter_view)); + // TODO: make searchbox return selection to items on focus_in event + if (show_searchbox) { + auto search_item = Gtk::manage(new Gtk::MenuItem{ searchbox }); + search_item->set_name("search_item"); + append(*search_item); } - menu->popup_at_widget(this, gravity_widget, gravity_menu, nullptr); + build_commands_list(*this, all_commands, rows); +} - return true; +DMenu::~DMenu() { + using namespace std::string_view_literals; + if (case_sensitivity_changed) { + std::ofstream file{ settings_file, std::ios::trunc }; + constexpr std::array values { "case_insensitive"sv, "case_sensitive"sv }; + file << values[case_sensitive]; + } } -DMenu::DMenu() { - if (case_sensitive) { - searchbox.set_text("Type To Search"); - } else { - searchbox.set_text("TYPE TO SEARCH"); +void DMenu::emplace_back(const Glib::ustring& cmd) { + auto item = Gtk::manage(new Gtk::MenuItem{ cmd }); + item->signal_activate() + .connect(sigc::bind<Glib::ustring>(sigc::mem_fun(*this, &DMenu::on_item_clicked), cmd)); + append(*item); + if (!first_item) { + first_item = item; } - searchbox.set_sensitive(false); - searchbox.set_name("searchbox"); - search_phrase = ""; } -void switch_case_sensitive(std::string filename, bool is_case_sensitive) { - if (is_case_sensitive) { - if (std::ifstream(filename)) { - int status = remove(filename.c_str()); - std::cout << "status = " << status << std::endl; - } - } else { - std::ofstream file(filename); - file << "case_sensitive"; +void DMenu::switch_case_sensitivity() { + case_sensitivity_changed = true; + case_sensitive = !case_sensitive; + searchbox.set_text(""); + set_searchbox_placeholder(searchbox, case_sensitive); +} + +void DMenu::fix_selection() { + if (first_item) { + this->select_item(*first_item); + first_item->grab_focus(); } } bool DMenu::on_key_press_event(GdkEventKey* key_event) { if (show_searchbox) { - if (key_event -> keyval == GDK_KEY_Escape) { - Gtk::Main::quit(); - return Gtk::Menu::on_key_press_event(key_event); - } else if (((key_event -> keyval >= GDK_KEY_A && key_event -> keyval <= GDK_KEY_Z) - || (key_event -> keyval >= GDK_KEY_a && key_event -> keyval <= GDK_KEY_z) - || (key_event -> keyval >= GDK_KEY_0 && key_event -> keyval <= GDK_KEY_9) - || key_event -> keyval == GDK_KEY_plus - || key_event -> keyval == GDK_KEY_minus - || key_event -> keyval == GDK_KEY_underscore - || key_event -> keyval == GDK_KEY_hyphen) - && key_event->type == GDK_KEY_PRESS) { - - char character = key_event -> keyval; - if (!case_sensitive) { - character = toupper(character); - } - this -> search_phrase += character; - - this -> searchbox.set_text(this -> search_phrase); - this -> filter_view(); - return true; - - } else if (key_event -> keyval == GDK_KEY_BackSpace && this -> search_phrase.size() > 0) { - this -> search_phrase = this -> search_phrase.substr(0, this -> search_phrase.size() - 1); - this -> searchbox.set_text(this -> search_phrase); - this -> filter_view(); - return true; - } else if (key_event -> keyval == GDK_KEY_Delete) { - this -> search_phrase = ""; - this -> searchbox.set_text(this -> search_phrase); - this -> filter_view(); - return true; - } else if (this -> get_children().size() == 2 && key_event -> keyval == GDK_KEY_Return) { - // Workaround to launch the single item which has been selected programmatically - this -> get_children()[1] -> activate(); - return true; - } else if (key_event -> keyval == GDK_KEY_Insert) { - this -> search_phrase = ""; - case_sensitive = !case_sensitive; - switch_case_sensitive(settings_file, case_sensitive); - this -> filter_view(); - return true; + switch (key_event->keyval) { + case GDK_KEY_Escape: + main.close(); + break; + case GDK_KEY_Delete: + searchbox.set_text(""); + break; + case GDK_KEY_Insert: + case_sensitive = !case_sensitive; + switch_case_sensitivity(); + searchbox.set_text(""); + break; + case GDK_KEY_Left: + case GDK_KEY_Right: + case GDK_KEY_Up: + case GDK_KEY_Down: + // seem to work fine as is + break; + case GDK_KEY_Return: + if (auto active = dynamic_cast<Gtk::MenuItem*>(get_selected_item())) { + if (active == dynamic_cast<Gtk::MenuItem*>(searchbox.get_parent())) { + // searchbox is active, move selection to the first item in list + fix_selection(); + } + } + break; + default: + searchbox.grab_focus(); + searchbox.select_region(0, 0); + searchbox.set_position(-1); } } //if the event has not been handled, call the base class @@ -126,44 +146,38 @@ } else { std::cout << cmd; } - Gtk::Main::quit(); + main.close(); } /* Rebuild menu to match the search phrase */ void DMenu::filter_view() { - if (this -> search_phrase.size() > 0) { + auto clear_children = [this]() { + this->foreach([this](auto && child) { + if (child.get_name() != "search_item") { + this->remove(child); + } + }); + this->first_item = nullptr; + }; + auto search_phrase = searchbox.get_text(); + if (search_phrase.size() > 0) { // remove all items except searchbox - for (auto item : this -> get_children()) { - if (item -> get_name() != "search_item") { - delete item; - } - } + clear_children(); int cnt = 0; bool limit_exhausted = false; + auto sf = search_phrase; + if (!case_sensitive) { + sf = sf.uppercase(); + } for (Glib::ustring command : all_commands) { - std::string sf = this -> search_phrase; - std::string cm = command; + auto cm = command; if (!case_sensitive) { - for(unsigned int l = 0; l < sf.length(); l++) { - sf[l] = toupper(sf[l]); - } - for(unsigned int l = 0; l < cm.length(); l++) { - cm[l] = toupper(cm[l]); - } + cm = cm.uppercase(); } if (cm.find(sf) == 0) { - Gtk::MenuItem *item = new Gtk::MenuItem(); - item -> set_label(command); - item -> signal_activate().connect(sigc::bind<Glib::ustring>(sigc::mem_fun - (*this, &DMenu::on_item_clicked), command)); - this -> append(*item); - // This will highlight 1st menu item, still it won't start on Enter. - // See workaround in on_key_press_event. - if (cnt == 0) { - item -> select(); - } + emplace_back(command); cnt++; - if (cnt > rows - 1) { + if (cnt == rows) { limit_exhausted = true; break; } @@ -171,24 +185,14 @@ } if (!limit_exhausted) { for (Glib::ustring command : all_commands) { - std::string sf = this -> search_phrase; - std::string cm = command; + auto cm = command; if (!case_sensitive) { - for(unsigned int l = 0; l < sf.length(); l++) { - sf[l] = toupper(sf[l]); - } - for(unsigned int l = 0; l < cm.length(); l++) { - cm[l] = toupper(cm[l]); - } + cm = cm.uppercase(); } - if (cm.find(sf) != std::string::npos && cm.find(sf) != 0) { - Gtk::MenuItem *item = new Gtk::MenuItem(); - item -> set_label(command); - item -> signal_activate().connect(sigc::bind<Glib::ustring>(sigc::mem_fun - (*this, &DMenu::on_item_clicked), cm)); - this -> append(*item); + if (cm.find(sf) != cm.npos && cm.find(sf) != 0) { + emplace_back(command); cnt++; - if (cnt > rows - 1) { + if (cnt == rows) { break; } } @@ -197,30 +201,14 @@ this -> show_all(); } else { - if (case_sensitive) { - this -> searchbox.set_text("Type To Search"); - } else { - this -> searchbox.set_text("TYPE TO SEARCH"); - } + set_searchbox_placeholder(searchbox, case_sensitive); // remove all items except searchbox - for (auto item : this -> get_children()) { - if (item -> get_name() != "search_item") { - delete item; - } - } - int cnt = 0; - for (Glib::ustring command : all_commands) { - Gtk::MenuItem *item = new Gtk::MenuItem(); - item -> set_label(command); - item -> signal_activate().connect(sigc::bind<Glib::ustring>(sigc::mem_fun(*this, &DMenu::on_item_clicked), command)); - this -> append(*item); - cnt++; - if (cnt > rows - 1) { - break; - } - } + clear_children(); + build_commands_list(*this, all_commands, rows); this -> show_all(); } + fix_selection(); + } MainWindow::MainWindow() : CommonWindow("~nwgdmenu", "~nwgdmenu"), menu(nullptr) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nwg-launchers-0.4.3/grid/grid_classes.cc new/nwg-launchers-0.4.4/grid/grid_classes.cc --- old/nwg-launchers-0.4.3/grid/grid_classes.cc 2021-01-05 01:35:48.000000000 +0100 +++ new/nwg-launchers-0.4.4/grid/grid_classes.cc 2021-01-30 15:35:45.000000000 +0100 @@ -57,6 +57,7 @@ apps_grid.set_sort_func(&by_name); favs_grid.set_sort_func(&by_clicks); + description.set_ellipsize(Pango::ELLIPSIZE_END); description.set_text(""); description.set_name("description"); separator.set_orientation(Gtk::ORIENTATION_HORIZONTAL); @@ -351,7 +352,7 @@ : name(std::move(name)), comment(std::move(comment)), desktop_id(&id), index(index) { // As we sort dynamically by actual names, we need to avoid shortening them, or long names will remain unsorted. // See the issue: https://github.com/nwg-piotr/nwg-launchers/issues/128 - std::string display_name = this->name; + auto display_name = this->name; if (display_name.length() > 25) { display_name.resize(22); display_name += "...";

1 0