Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package macchina for openSUSE:Factory checked in at 2021-11-12 15:59:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/macchina (Old) and /work/SRC/openSUSE:Factory/.macchina.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "macchina" Fri Nov 12 15:59:18 2021 rev:2 rq:930981 version:5.0.4~git0.72b9c2b Changes: -------- --- /work/SRC/openSUSE:Factory/macchina/macchina.changes 2021-11-05 22:59:14.756305512 +0100 +++ /work/SRC/openSUSE:Factory/.macchina.new.1890/macchina.changes 2021-11-12 16:00:05.366587830 +0100 @@ -1,0 +2,15 @@ +Thu Nov 11 11:41:10 UTC 2021 - [email protected] + +- Update to version 5.0.4~git0.72b9c2b: + * remove a change that doesn't apply yet + * Fix compilation error upon cargo installation (closes #216) + * Add Packaging status (#215) + * docs: macchina should be lowercase + * docs: update preview image + * [DOC] Add zypper instructions for openSUSE Tumbleweed (#197) + * slight changes to README + * slight changes to README (and reference docs in themes) + * update macchina.toml + * typo + +------------------------------------------------------------------- Old: ---- macchina-5.0.3~git0.303b6e7.tar.xz New: ---- macchina-5.0.4~git0.72b9c2b.tar.xz macchina.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ macchina.spec ++++++ --- /var/tmp/diff_new_pack.jqpyPx/_old 2021-11-12 16:00:06.554588380 +0100 +++ /var/tmp/diff_new_pack.jqpyPx/_new 2021-11-12 16:00:06.562588384 +0100 @@ -1,7 +1,7 @@ # # spec file for package macchina # -# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -12,17 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: macchina -Version: 5.0.3~git0.303b6e7 +Version: 5.0.4~git0.72b9c2b Release: 0 Summary: Fast, minimal and customizable system information frontend License: MIT Group: Productivity/Text/Utilities -Url: https://github.com/Macchina-CLI/macchina#macchina +URL: https://github.com/Macchina-CLI/macchina#macchina Source0: %{name}-%{version}.tar.xz Source1: vendor.tar.xz Source2: cargo_config @@ -56,7 +56,6 @@ true # Skipping tests on other archs than x86_64 due to SIGSEGV on arm64 %endif - %files %license LICENSE %doc CHANGELOG.txt README.md ++++++ _service ++++++ --- /var/tmp/diff_new_pack.jqpyPx/_old 2021-11-12 16:00:06.598588401 +0100 +++ /var/tmp/diff_new_pack.jqpyPx/_new 2021-11-12 16:00:06.598588401 +0100 @@ -3,7 +3,7 @@ <param name="url">https://github.com/Macchina-CLI/macchina.git</param> <param name="versionformat">@PARENT_TAG@~git@TAG_OFFSET@.%h</param> <param name="scm">git</param> - <param name="revision">v5.0.3</param> + <param name="revision">v5.0.4</param> <param name="match-tag">*</param> <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param> <param name="versionrewrite-replacement">\1</param> ++++++ macchina-5.0.3~git0.303b6e7.tar.xz -> macchina-5.0.4~git0.72b9c2b.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/macchina-5.0.3~git0.303b6e7/CHANGELOG.txt new/macchina-5.0.4~git0.72b9c2b/CHANGELOG.txt --- old/macchina-5.0.3~git0.303b6e7/CHANGELOG.txt 2021-11-02 19:08:38.000000000 +0100 +++ new/macchina-5.0.4~git0.72b9c2b/CHANGELOG.txt 2021-11-10 20:17:33.000000000 +0100 @@ -1,6 +1,7 @@ # Changelog -## macchina v5.0.3 +## macchina v5.0.4 -- general: moved miscellaneous theme structures to separate modules. -- netbsd: subtract "one" from pkgsrc's package count. +- Fixed a compilation error upon cargo installation. +- Windows' dependencies have been bumped. (libmacchina#93) +- Windows' Local IP readout is a lot more user-friendly now. (libmacchina#94) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/macchina-5.0.3~git0.303b6e7/Cargo.lock new/macchina-5.0.4~git0.72b9c2b/Cargo.lock --- old/macchina-5.0.3~git0.303b6e7/Cargo.lock 2021-11-02 19:08:38.000000000 +0100 +++ new/macchina-5.0.4~git0.72b9c2b/Cargo.lock 2021-11-10 20:17:33.000000000 +0100 @@ -54,9 +54,9 @@ [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "byte-unit" @@ -409,9 +409,9 @@ [[package]] name = "libc" -version = "0.2.104" +version = "0.2.107" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "7b2f96d100e1cf1929e7719b7edb3b90ab5298072638fccd77be9ce942ecdfce" +checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219" [[package]] name = "libgit2-sys" @@ -427,9 +427,9 @@ [[package]] name = "libmacchina" -version = "3.4.3" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "ada721c3b9c24812ddb8bfbbdb43aff6022cb0f4f35bab2db18f42474b4b3934" +checksum = "7e0321d6f19276ddf27d6c9f5fee0e7f8bc4f4dbd0a9bdadc3d8dd99f3d4c46c" dependencies = [ "byte-unit", "cfg-if", @@ -440,6 +440,7 @@ "itertools", "lazy_static", "libc", + "local-ip-address", "mach", "nix", "num_cpus", @@ -449,7 +450,8 @@ "sqlite", "sysctl", "vergen", - "windows", + "walkdir", + "windows 0.25.0", "winreg", ] @@ -466,6 +468,19 @@ ] [[package]] +name = "local-ip-address" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "8b143c6ef86e36328caa40a7578e95d1544aca8a1740235fd2b416a69441a5c7" +dependencies = [ + "libc", + "memalloc", + "neli", + "thiserror", + "windows 0.18.0", +] + +[[package]] name = "lock_api" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -485,7 +500,7 @@ [[package]] name = "macchina" -version = "5.0.3" +version = "5.0.4" dependencies = [ "ansi-to-tui", "atty", @@ -521,6 +536,12 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] +name = "memalloc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" + +[[package]] name = "memchr" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -558,10 +579,20 @@ ] [[package]] +name = "neli" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "9053554eb5dcb7e10d9cdab1206965bde870eed5d0d341532ca035e3ba221508" +dependencies = [ + "byteorder", + "libc", +] + +[[package]] name = "nix" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "e7555d6c7164cc913be1ce7f95cbecdabda61eb2ccd89008524af306fb7f5031" +checksum = "f305c2c2e4c39a82f7bf0bf65fb557f9070ce06781d4f2454295cc34b1c43188" dependencies = [ "bitflags", "cc", @@ -918,12 +949,6 @@ ] [[package]] -name = "squote" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "1fccf17fd09e2455ea796d2ad267b64fa2c5cbd8701b2a93b555d2aa73449f7d" - -[[package]] name = "strsim" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -966,9 +991,9 @@ [[package]] name = "sysctl" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "963488c73b34185a9028742c2be0219ed1d8558e59f85c3b466a4f54affba936" +checksum = "feb3f7a32e17639e3705d2e05da40f485877cb97fdf0f3240e519e525e6cdb4d" dependencies = [ "bitflags", "byteorder", @@ -1189,9 +1214,9 @@ [[package]] name = "windows" -version = "0.4.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "015de964f21e0b20b9744ebc6f3a3e4dfdd1788f133a4aeec09c035748f88a21" +checksum = "68088239696c06152844eadc03d262f088932cce50c67e4ace86e19d95e976fe" dependencies = [ "const-sha1", "windows_gen", @@ -1199,43 +1224,65 @@ ] [[package]] -name = "windows_gen" -version = "0.4.0" +name = "windows" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "70028758c92f5ed61ce12ab8e7482dce152418bac41dbefe794511b9fb673022" +checksum = "e46c474738425c090573ecf5472d54ee5f78132e6195d0bbfcc2aabc0ed29f37" dependencies = [ - "proc-macro2", - "quote", - "squote", - "syn", - "windows_gen_macros", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", ] [[package]] -name = "windows_gen_macros" -version = "0.4.0" +name = "windows_aarch64_msvc" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "1a4e4aa3c108fc3112bb797662b14958d088d3b989f2560d89335775c566c88d" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "3022d174000fcaeb6f95933fb04171ea0e21b9289ac57fe4400bfa148e41df79" + +[[package]] +name = "windows_gen" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "cf583322dc423ee021035b358e535015f7fd163058a31e2d37b99a939141121d" + +[[package]] +name = "windows_i686_gnu" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "03b1584eebf06654708eab4301152032c13c1e47f4a754ffc93c733f10993e85" + +[[package]] +name = "windows_i686_msvc" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "f49df16591e9ad429997ec57d462b0cc45168f639d03489e8c2e933ea9c389d7" [[package]] name = "windows_macros" -version = "0.4.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "87e5b872245607ec18bf35eaa7a6146831c07449c0b724afd7403d732c6da856" +checksum = "58acfb8832e9f707f8997bd161e537a1c1f603e60a5bd9c3cf53484fdcc998f3" dependencies = [ - "proc-macro2", - "quote", - "squote", "syn", "windows_gen", ] [[package]] +name = "windows_x86_64_gnu" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "2cb06177184100374f97d5e7261ee0b6adefa8ee32e38f87518ca22b519bb80e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "c3c27bcbb33ddbed3569e36c14775c99f72b97c72ce49f81d128637fb48a061f" + +[[package]] name = "winreg" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/macchina-5.0.3~git0.303b6e7/Cargo.toml new/macchina-5.0.4~git0.72b9c2b/Cargo.toml --- old/macchina-5.0.3~git0.303b6e7/Cargo.toml 2021-11-02 19:08:38.000000000 +0100 +++ new/macchina-5.0.4~git0.72b9c2b/Cargo.toml 2021-11-10 20:17:33.000000000 +0100 @@ -1,6 +1,6 @@ [package] name = "macchina" -version = "5.0.3" +version = "5.0.4" authors = ["Aziz Ben Ali <[email protected]>", "Marvin Haschker <[email protected]>", "Uttarayan Mondal <[email protected]>"] edition = "2018" description = "A system information fetcher, with an (unhealthy) emphasis on performance." @@ -11,7 +11,7 @@ build = "build.rs" [dependencies] -libmacchina = "3.4.3" +libmacchina = "3.8.1" bytesize = "1.0.1" clap = "2.33.3" tui = { version = "0.16.0", default-features = false, features = ["crossterm"] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/macchina-5.0.3~git0.303b6e7/README.md new/macchina-5.0.4~git0.72b9c2b/README.md --- old/macchina-5.0.3~git0.303b6e7/README.md 2021-11-02 19:08:38.000000000 +0100 +++ new/macchina-5.0.4~git0.72b9c2b/README.md 2021-11-10 20:17:33.000000000 +0100 @@ -1,5 +1,5 @@ <div align="center"> -<h1>Macchina</h1> +<h1>macchina</h1> Fast, minimal and customizable system information frontend. @@ -17,23 +17,19 @@ </div> ---- - # Table of Contents - [About](#about) -- [What's new in v5.0](#changelog) - [Performance](#performance) - [Features](#features) - [Configuration](#configuration) - [Customization](#customization) - [Dependencies](#dependencies) - [Installation](#installation) +- [Packaging Status](#packaging-status) - [Contributors](#contributors) - [ASCII Art](#ascii-art) ---- - # About _macchina_ lets you view system information, like your kernel version, uptime, @@ -43,43 +39,9 @@ have a look at [libmacchina](https://github.com/Macchina-CLI/libmacchina); fetching-related issues should be filed on that repository. ---- - -# ??? What's new in `v5.0` <a name="changelog"></a> - -## Command-line flags - -The following flags have been deprecated and can only be specified in your -theme: -- `--no-ascii` -- `--custom-ascii` -- `--palette` -- `--hide-delimiters` - -> Note that the values they accept hasn't changed. - -**Why?** - -- They do not define the behavior of macchina, rather the look of it. So we - moved them to their new home. - -**Where can I see an updated list of the current command-line flags?** - -In our wiki, -[follow this link](https://github.com/Macchina-CLI/macchina/wiki/Usage). - -## Themes - -As previously mentioned, themes have gotten two new additions. Also, the -`color` option has been renamed to `key_color` to avoid ambiguity. Have a look -at at the provided [example -theme](https://github.com/Macchina-CLI/macchina/blob/main/themes/Hydrogen.toml). - ---- - # Performance <a name="performance"></a> -_macchina_ is lightning fast, see for yourself: +_macchina_ is **lightning fast**, see for yourself: > Execution time is measured using > [hyperfine](https://github.com/sharkdp/hyperfine) @@ -112,18 +74,17 @@ | :--------- | --------: | -------: | -------: | | `macchina` | 9.0 ?? 0.4 | 8.2 | 11.7 | ---- - # Features ## Themes _macchina_ has a theming system which you can use to customize pretty much any -visual aspect of the program. Themes live __outside__ the configuration file, -so you can create a bunch of them and switch between them at any time. +visual aspect of the program. Themes live **outside** the configuration file, +so you can create a bunch of them and switch between them at any time. -Learn how to [make your own](#customization); [themes are documented](https://github.com/Macchina-CLI/macchina/wiki/Theme-Documentation) in case -something isn't clear. +Learn how to [make your own](#customization) ??? there is +[documentation](https://github.com/Macchina-CLI/macchina/wiki/Theme-Documentation) +in case something is not quite so clear. ## Doctor @@ -131,11 +92,9 @@ a feature in place that describes why they failed. You don't have to guess what went wrong, `--doctor` has your back! ---- - # Configuration -The configuration file define the behavior of macchina, it does not allow for +The configuration file defines the behavior of macchina, it does not allow for much customization. See [macchina.toml](https://github.com/Macchina-CLI/macchina/blob/main/macchina.toml) for an example configuration file. @@ -167,28 +126,26 @@ `macchina.toml` 3. You're good to go! _macchina_ will start using your theme. ---- - # Dependencies -## Build dependencies +### Build dependencies The following are required dependencies if you're building from source or installing through `cargo`: - _libgit2_ -## Runtime dependencies +### Runtime dependencies The following are _optional_ dependencies, they only extend what macchina can fetch: **Linux**: + - _wmctrl_ - - **Gentoo**: _portage-utils_ + - **Gentoo**: _portage-utils_ **NetBSD**: -- _wmctrl_ ---- +- _wmctrl_ # Installation @@ -204,6 +161,12 @@ pkgin install macchina ``` +### openSUSE Tumbleweed + +``` +zypper in macchina +``` + ### Homebrew ``` @@ -257,20 +220,22 @@ [prebuilt binary](https://github.com/grtcdr/macchina/releases) that corresponds with your operating system. ---- +# Packaging Status + +[](https://repology.org/project/macchina/versions) # Contributors [](https://github.com/grtcdr/macchina/graphs/contributors) -_macchina_, like many other open-source projects, would not be where it is right -now without the help of its contributors, thank you all so much! +_macchina_, like many other open-source projects, would not be where it is +right now without the help of its contributors, thank you all so much! - Support for **NetBSD** would not have been possible without the help and testing of NetBSD/pkgsrc package maintainer [pin](https://pkgsrc.se/[email protected]) -- Support for **macOS** and **Windows** would not have been possible without the - help, testing and major contributions of +- Support for **macOS** and **Windows** would not have been possible without + the help, testing and major contributions of [123marvin123](https://github.com/123marvin123) - Support for **OpenWrt** and **Android** was made possible through the many contributions of [uttarayan21](https://github.com/uttarayan21) @@ -288,5 +253,5 @@ [Neofetch](https://github.com/dylanaraps/neofetch) - macOS ASCII art (small variant) was made by Joan Stark (jgs) - Linux ASCII art (big variant) was made by Joan Stark (jgs) -- Linux ASCII art (small variant) was taken from Christopher Johnson's ASCII art - collection (unknown artist) +- Linux ASCII art (small variant) was taken from Christopher Johnson's ASCII + art collection (unknown artist) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/macchina-5.0.3~git0.303b6e7/macchina.toml new/macchina-5.0.4~git0.72b9c2b/macchina.toml --- old/macchina-5.0.3~git0.303b6e7/macchina.toml 2021-11-02 19:08:38.000000000 +0100 +++ new/macchina-5.0.4~git0.72b9c2b/macchina.toml 2021-11-10 20:17:33.000000000 +0100 @@ -7,7 +7,7 @@ # Lengthen shell output long_shell = false -# Lengthen shell output +# Lengthen kernel output long_kernel = false # Toggle between displaying the current shell or your user's default one. @@ -21,7 +21,6 @@ # theme = "" # Displays only the specified readouts. -# Conflicts with: hide # Accepted values (case-sensitive): # - Host # - Machine @@ -31,7 +30,7 @@ # - DesktopEnvironment # - WindowManager # - Resolution -# - Backlight [Linux/NetBSD only] +# - Backlight # - Packages # - LocalIP # - Terminal Binary files old/macchina-5.0.3~git0.303b6e7/screenshots/preview.png and new/macchina-5.0.4~git0.72b9c2b/screenshots/preview.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/macchina-5.0.3~git0.303b6e7/src/main.rs new/macchina-5.0.4~git0.72b9c2b/src/main.rs --- old/macchina-5.0.3~git0.303b6e7/src/main.rs 2021-11-02 19:08:38.000000000 +0100 +++ new/macchina-5.0.4~git0.72b9c2b/src/main.rs 2021-11-10 20:17:33.000000000 +0100 @@ -107,7 +107,7 @@ fn create_theme(opt: &Opt) -> Theme { let mut found = false; let mut theme = Theme::default(); - let dirs = [dirs::config_dir(), libmacchina::extra::localbase_dir()]; + let dirs = [dirs::config_dir(), libmacchina::dirs::localbase_dir()]; if let Some(opt_theme) = &opt.theme { for dir in array::IntoIter::new(dirs) { @@ -171,7 +171,7 @@ } fn list_themes() { - let dirs = [dirs::config_dir(), libmacchina::extra::localbase_dir()]; + let dirs = [dirs::config_dir(), libmacchina::dirs::localbase_dir()]; for i in array::IntoIter::new(dirs) { if let Some(dir) = i { let entries = libmacchina::extra::list_dir_entries(&dir.join("macchina/themes")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/macchina-5.0.3~git0.303b6e7/themes/Helium.toml new/macchina-5.0.4~git0.72b9c2b/themes/Helium.toml --- old/macchina-5.0.3~git0.303b6e7/themes/Helium.toml 2021-11-02 19:08:38.000000000 +0100 +++ new/macchina-5.0.4~git0.72b9c2b/themes/Helium.toml 2021-11-10 20:17:33.000000000 +0100 @@ -1,3 +1,6 @@ +# for a complete reference, visit +# https://github.com/Macchina-CLI/macchina/wiki/Theme-Documentation + hide_ascii = false prefer_small_ascii = false spacing = 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/macchina-5.0.3~git0.303b6e7/themes/Hydrogen.toml new/macchina-5.0.4~git0.72b9c2b/themes/Hydrogen.toml --- old/macchina-5.0.3~git0.303b6e7/themes/Hydrogen.toml 2021-11-02 19:08:38.000000000 +0100 +++ new/macchina-5.0.4~git0.72b9c2b/themes/Hydrogen.toml 2021-11-10 20:17:33.000000000 +0100 @@ -1,3 +1,6 @@ +# for a complete reference, visit +# https://github.com/Macchina-CLI/macchina/wiki/Theme-Documentation + spacing = 2 padding = 0 hide_ascii = true ++++++ macchina.obsinfo ++++++ name: macchina version: 5.0.4~git0.72b9c2b mtime: 1636571853 commit: 72b9c2b18d89af494f3c882042fcc3b315fbec12 ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/macchina/vendor.tar.xz /work/SRC/openSUSE:Factory/.macchina.new.1890/vendor.tar.xz differ: char 26, line 1
