Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package polybar for openSUSE:Factory checked in at 2021-03-06 21:19:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/polybar (Old) and /work/SRC/openSUSE:Factory/.polybar.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "polybar" Sat Mar 6 21:19:27 2021 rev:3 rq:877385 version:3.5.5 Changes: -------- --- /work/SRC/openSUSE:Factory/polybar/polybar.changes 2020-12-28 10:31:50.613568736 +0100 +++ /work/SRC/openSUSE:Factory/.polybar.new.2378/polybar.changes 2021-03-06 21:19:28.797284141 +0100 @@ -1,0 +2,13 @@ +Tue Mar 2 09:08:51 UTC 2021 - Michael Vetter <mvet...@suse.com> + +- Update to 3.5.5: + * Support older python sphinx versions again (gh#2356) +- Changes from 3.5.4: + * Wrong text displayed if module text ends with } (gh#2331) +- Changes from 3.5.3: + * Don't use git when building documentation (gh#2309) + * Empty color values are no longer treated as invalid and no + longer produce an error. +- Remove sphinx.patch (See gh#2356) + +------------------------------------------------------------------- Old: ---- polybar-3.5.2.tar.gz sphinx.patch New: ---- polybar-3.5.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ polybar.spec ++++++ --- /var/tmp/diff_new_pack.saAvP0/_old 2021-03-06 21:19:29.485284712 +0100 +++ /var/tmp/diff_new_pack.saAvP0/_new 2021-03-06 21:19:29.485284712 +0100 @@ -1,7 +1,7 @@ # # spec file for package polybar # -# 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,14 +17,13 @@ Name: polybar -Version: 3.5.2 +Version: 3.5.5 Release: 0 Summary: A fast and easy-to-use status bar License: MIT Group: System/GUI/Other URL: https://github.com/polybar/polybar Source: https://github.com/polybar/polybar/releases/download/%{version}/%{name}-%{version}.tar.gz -Patch0: sphinx.patch BuildRequires: c++_compiler BuildRequires: cmake >= 3.1 BuildRequires: i3 @@ -52,7 +51,6 @@ %prep %setup -q -%patch0 %build %cmake ++++++ polybar-3.5.2.tar.gz -> polybar-3.5.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polybar-3.5.2/CHANGELOG.md new/polybar-3.5.5/CHANGELOG.md --- old/polybar-3.5.2/CHANGELOG.md 1970-01-01 01:00:00.000000000 +0100 +++ new/polybar-3.5.5/CHANGELOG.md 2021-03-01 21:40:18.000000000 +0100 @@ -0,0 +1,29 @@ +# Changelog + +All notable changes to this project will be documented in this file. +Each release should have the following subsections, if entries exist, in the +given order: `Breaking`, `Build`, `Deprecated`, `Removed`, `Added`, `Changed`, +`Fixed`, `Security`. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] +## [3.5.5] - 2021-03-01 +### Build +- Support older python sphinx versions again ([`#2356`](https://github.com/polybar/polybar/issues/2356)) + +## [3.5.4] - 2021-01-07 +### Fixed +- Wrong text displayed if module text ends with `}` ([`#2331`](https://github.com/polybar/polybar/issues/2331)) + +## [3.5.3] - 2020-12-23 +### Build +- Don't use `git` when building documentation ([`#2309`](https://github.com/polybar/polybar/issues/2309)) +### Fixed +- Empty color values are no longer treated as invalid and no longer produce an error. + +[Unreleased]: https://github.com/polybar/polybar/compare/3.5.5...HEAD +[3.5.5]: https://github.com/polybar/polybar/releases/tag/3.5.5 +[3.5.4]: https://github.com/polybar/polybar/releases/tag/3.5.4 +[3.5.3]: https://github.com/polybar/polybar/releases/tag/3.5.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polybar-3.5.2/doc/conf.py new/polybar-3.5.5/doc/conf.py --- old/polybar-3.5.2/doc/conf.py 2020-12-14 10:54:44.000000000 +0100 +++ new/polybar-3.5.5/doc/conf.py 2021-03-01 21:40:18.000000000 +0100 @@ -13,12 +13,22 @@ # documentation root, use os.path.abspath to make it absolute, like shown here. # import os +from pathlib import Path import datetime -import subprocess -from docutils.nodes import Node -from typing import List -from sphinx.domains.changeset import VersionChange +import sphinx +import packaging.version +def get_version(root_path): + """ + Reads the polybar version from the version.txt at the root of the repo. + """ + path = Path(root_path) / "version.txt" + with open(path, "r") as f: + for line in f.readlines(): + if not line.startswith("#"): + return packaging.version.parse(line) + + raise RuntimeError("No version found in {}".format(path)) # -- Project information ----------------------------------------------------- @@ -50,6 +60,11 @@ # build folder. doc_path = '@doc_path@' +# The version from the version.txt file. Since we are not always first +# configured by cmake, we don't necessarily have access to the current version +# number +version_txt = get_version(Path(doc_path).absolute().parent) + # -- General configuration --------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. @@ -202,23 +217,32 @@ # The 'versionadded' and 'versionchanged' directives are overridden. suppress_warnings = ['app.add_directive'] -def setup(app): - app.add_directive('deprecated', VersionDirective) - app.add_directive('versionadded', VersionDirective) - app.add_directive('versionchanged', VersionDirective) - -class VersionDirective(VersionChange): - """ - Overwrites the Sphinx directive for versionchanged, versionadded, and - deprecated and adds an unreleased tag to versions that are not yet released - """ - def run(self) -> List[Node]: - # If the tag exists 'git rev-parse' will succeed and otherwise fail - completed = subprocess.run(["git", "rev-parse", self.arguments[0]], - stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, cwd=doc_path, - check=False) +# It is not exactly clear in which version the VersionChange class was +# introduced, but we know it is available in at least 1.8.5. +# This feature is mainly needed for the online docs on readthedocs for the docs +# built from master, documentation built for proper releases should not even +# mention unreleased changes. Because of that it's not that important that this +# is added to local builds. +if packaging.version.parse(sphinx.__version__) >= packaging.version.parse("1.8.5"): + + from typing import List + from docutils.nodes import Node + from sphinx.domains.changeset import VersionChange + + def setup(app): + app.add_directive('deprecated', VersionDirective) + app.add_directive('versionadded', VersionDirective) + app.add_directive('versionchanged', VersionDirective) + + class VersionDirective(VersionChange): + """ + Overwrites the Sphinx directive for versionchanged, versionadded, and + deprecated and adds an unreleased tag to versions that are not yet released + """ + def run(self) -> List[Node]: + directive_version = packaging.version.parse(self.arguments[0]) - if completed.returncode != 0: - self.arguments[0] += " (unreleased)" + if directive_version > version_txt: + self.arguments[0] += " (unreleased)" - return super().run() + return super().run() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polybar-3.5.2/src/components/config.cpp new/polybar-3.5.5/src/components/config.cpp --- old/polybar-3.5.2/src/components/config.cpp 2020-12-14 10:54:44.000000000 +0100 +++ new/polybar-3.5.5/src/components/config.cpp 2021-03-01 21:40:18.000000000 +0100 @@ -225,6 +225,10 @@ template <> rgba config::convert(string&& value) const { + if (value.empty()) { + return rgba{}; + } + rgba ret{value}; if (!ret.has_color()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polybar-3.5.2/src/components/controller.cpp new/polybar-3.5.5/src/components/controller.cpp --- old/polybar-3.5.2/src/components/controller.cpp 2020-12-14 10:54:44.000000000 +0100 +++ new/polybar-3.5.5/src/components/controller.cpp 2021-03-01 21:40:18.000000000 +0100 @@ -646,16 +646,7 @@ block_contents += padding_right; } - // Strip unnecessary reset tags - block_contents = string_util::replace_all(block_contents, "T-}%{T", "T"); - block_contents = string_util::replace_all(block_contents, "B-}%{B#", "B#"); - block_contents = string_util::replace_all(block_contents, "F-}%{F#", "F#"); - block_contents = string_util::replace_all(block_contents, "U-}%{U#", "U#"); - block_contents = string_util::replace_all(block_contents, "u-}%{u#", "u#"); - block_contents = string_util::replace_all(block_contents, "o-}%{o#", "o#"); - - // Join consecutive tags - contents += string_util::replace_all(block_contents, "}%{", " "); + contents += block_contents; } try { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polybar-3.5.2/version.txt new/polybar-3.5.5/version.txt --- old/polybar-3.5.2/version.txt 2020-12-14 10:54:44.000000000 +0100 +++ new/polybar-3.5.5/version.txt 2021-03-01 21:40:18.000000000 +0100 @@ -1,4 +1,4 @@ # Polybar version information # Update this on every release # This is used to create the version string if a git repo is not available -3.5.2 +3.5.5
