Hello community, here is the log from the commit of package nwg-launchers for openSUSE:Factory checked in at 2020-09-17 14:51:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nwg-launchers (Old) and /work/SRC/openSUSE:Factory/.nwg-launchers.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nwg-launchers" Thu Sep 17 14:51:29 2020 rev:3 rq:835109 version:0.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/nwg-launchers/nwg-launchers.changes 2020-09-14 12:35:09.121359737 +0200 +++ /work/SRC/openSUSE:Factory/.nwg-launchers.new.4249/nwg-launchers.changes 2020-09-17 15:00:24.252457162 +0200 @@ -1,0 +2,8 @@ +Thu Sep 17 07:01:43 UTC 2020 - Michael Vetter <[email protected]> + +- Update to 0.3.4: + * fixed Clang build broken in v0.3.3 #109 + * [nwggrid] added /usr/share/pixmaps/ path to look for icons #111 + * fixed crash on $LANG unset (regression in v0.3.3) #114 + +------------------------------------------------------------------- Old: ---- v0.3.3.tar.gz New: ---- v0.3.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nwg-launchers.spec ++++++ --- /var/tmp/diff_new_pack.xmgxEA/_old 2020-09-17 15:00:33.532465975 +0200 +++ /var/tmp/diff_new_pack.xmgxEA/_new 2020-09-17 15:00:33.536465979 +0200 @@ -17,7 +17,7 @@ Name: nwg-launchers -Version: 0.3.3 +Version: 0.3.4 Release: 0 Summary: GTK launchers and menu for sway and i3 License: GPL-3.0-or-later ++++++ v0.3.3.tar.gz -> v0.3.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nwg-launchers-0.3.3/.travis.yml new/nwg-launchers-0.3.4/.travis.yml --- old/nwg-launchers-0.3.3/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/nwg-launchers-0.3.4/.travis.yml 2020-09-16 23:58:07.000000000 +0200 @@ -0,0 +1,11 @@ +language: cpp + +os: + - freebsd # clang/libc++ + +before_install: + - sudo pkg install -y meson pkgconf gtkmm30 nlohmann-json + +script: + - meson _build + - meson compile -C _build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nwg-launchers-0.3.3/README.md new/nwg-launchers-0.3.4/README.md --- old/nwg-launchers-0.3.3/README.md 2020-09-08 10:28:55.000000000 +0200 +++ new/nwg-launchers-0.3.4/README.md 2020-09-16 23:58:07.000000000 +0200 @@ -9,7 +9,7 @@ It's damned difficult to make all the stuff behave properly on all window managers. My priorities are: 1. it **must work well** on sway; -2. it **should work as well as possible** on i3, dwm and Openbox. +2. it **should work as well as possible** on Wayfire, i3, dwm and Openbox. Feel free to report issues you encounter on other window managers / desktop environments, but they may or may not be resolved. @@ -169,6 +169,10 @@ ] ``` +**Wayfire note** + +For the Logout button, as in the bar above, you may use [wayland-logout](https://github.com/soreau/wayland-logout) by @soreau. + You may use as many templates as you need, with the `-t` argument. All of them must be placed in the config directory. You may use own icon files instead of icon names, like `/path/to/the/file/my_icon.svg`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nwg-launchers-0.3.3/common/nwg_tools.cc new/nwg-launchers-0.3.4/common/nwg_tools.cc --- old/nwg-launchers-0.3.3/common/nwg_tools.cc 2020-09-08 10:28:55.000000000 +0200 +++ new/nwg-launchers-0.3.4/common/nwg_tools.cc 2020-09-16 23:58:07.000000000 +0200 @@ -161,7 +161,11 @@ pixbuf = Gdk::Pixbuf::create_from_file(icon, image_size, image_size, true); } } catch (...) { - pixbuf = Gdk::Pixbuf::create_from_file(DATA_DIR_STR "/nwgbar/icon-missing.svg", image_size, image_size, true); + try { + pixbuf = Gdk::Pixbuf::create_from_file("/usr/share/pixmaps/" + icon, image_size, image_size, true); + } catch (...) { + pixbuf = Gdk::Pixbuf::create_from_file(DATA_DIR_STR "/nwgbar/icon-missing.svg", image_size, image_size, true); + } } auto image = Gtk::manage(new Gtk::Image(pixbuf)); @@ -172,13 +176,16 @@ * Returns current locale * */ std::string get_locale() { - std::string loc = getenv("LANG"); - if (!loc.empty()) { - auto idx = loc.find_first_of("_"); - if (idx != std::string::npos) { - loc.resize(idx); + // avoid crash when LANG unset at all (regressed by #83 in v0.3.3) #114 + if (getenv("LANG") != NULL) { + std::string loc = getenv("LANG"); + if (!loc.empty()) { + auto idx = loc.find_first_of("_"); + if (idx != std::string::npos) { + loc.resize(idx); + } + return loc; } - return loc; } return "en"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nwg-launchers-0.3.3/grid/grid_tools.cc new/nwg-launchers-0.3.4/grid/grid_tools.cc --- old/nwg-launchers-0.3.3/grid/grid_tools.cc 2020-09-08 10:28:55.000000000 +0200 +++ new/nwg-launchers-0.3.4/grid/grid_tools.cc 2020-09-16 23:58:07.000000000 +0200 @@ -156,8 +156,8 @@ std::variant<nop_t, cut_t> tag; }; struct Result { - bool found; - size_t index; + bool ok; + size_t pos; }; Match matches[] = { { "Name="sv, &entry.name, nop }, @@ -197,9 +197,11 @@ // See https://wiki.archlinux.org/index.php/desktop_entries#Hide_desktop_entries entry.no_display = true; } - for (auto& [prefix, dest, tag] : matches) { - auto [ok, pos] = try_strip_prefix(prefix); - if (ok) { + for (auto& match : matches) { + auto result = try_strip_prefix(match.prefix); + auto& dest = match.dest; // it was 2020, clang failed to capture + auto pos = result.pos; // var from structured binding, so we had to write it by hand + if (result.ok) { std::visit(visitor { [dest, pos, &view](nop_t) { *dest = view.substr(pos); }, [dest, pos, &view](cut_t) { @@ -210,7 +212,7 @@ *dest = view.substr(pos, idx - pos); } }, - tag); + match.tag); break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nwg-launchers-0.3.3/meson.build new/nwg-launchers-0.3.4/meson.build --- old/nwg-launchers-0.3.3/meson.build 2020-09-08 10:28:55.000000000 +0200 +++ new/nwg-launchers-0.3.4/meson.build 2020-09-16 23:58:07.000000000 +0200 @@ -4,7 +4,7 @@ 'warning_level=3' ], license: 'GPL-3.0-or-later', - version: '0.3.3' + version: '0.3.4' ) compiler = meson.get_compiler('cpp')
