August 2024 - openSUSE Commits - openSUSE Mailing Lists

commit python-wsgi_intercept for openSUSE:Factory
by Source-Sync 16 Aug '24

16 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-wsgi_intercept for openSUSE:Factory checked in at 2024-08-16 12:24:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-wsgi_intercept (Old) and /work/SRC/openSUSE:Factory/.python-wsgi_intercept.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-wsgi_intercept" Fri Aug 16 12:24:11 2024 rev:30 rq:1194237 version:1.13.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-wsgi_intercept/python-wsgi_intercept.changes 2024-01-06 17:30:42.962992612 +0100 +++ /work/SRC/openSUSE:Factory/.python-wsgi_intercept.new.2698/python-wsgi_intercept.changes 2024-08-16 12:24:47.821892338 +0200 @@ -1,0 +2,6 @@ +Fri Aug 16 06:52:12 UTC 2024 - Steve Kowalik <steven.kowalik(a)suse.com> + +- Update to 1.13.1: + * Update argument processing for modern requests + +------------------------------------------------------------------- Old: ---- wsgi_intercept-1.13.0.tar.gz New: ---- wsgi_intercept-1.13.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-wsgi_intercept.spec ++++++ --- /var/tmp/diff_new_pack.eE5K1j/_old 2024-08-16 12:24:48.285911621 +0200 +++ /var/tmp/diff_new_pack.eE5K1j/_new 2024-08-16 12:24:48.289911788 +0200 @@ -17,7 +17,7 @@ Name: python-wsgi_intercept -Version: 1.13.0 +Version: 1.13.1 Release: 0 Summary: Library for installing a WSGI application in place of a real URI for testing License: MIT @@ -35,7 +35,6 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-six -Requires: python-urllib3 < 2 Recommends: python-requests >= 2.0.1 BuildArch: noarch %python_subpackages ++++++ wsgi_intercept-1.13.0.tar.gz -> wsgi_intercept-1.13.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wsgi_intercept-1.13.0/PKG-INFO new/wsgi_intercept-1.13.1/PKG-INFO --- old/wsgi_intercept-1.13.0/PKG-INFO 2024-01-03 13:53:32.922933300 +0100 +++ new/wsgi_intercept-1.13.1/PKG-INFO 2024-08-08 10:16:30.974643700 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: wsgi_intercept -Version: 1.13.0 +Version: 1.13.1 Summary: wsgi_intercept installs a WSGI application in place of a real URI for testing. Home-page: http://pypi.python.org/pypi/wsgi_intercept Author: Titus Brown, Kumar McMillan, Chris Dent, Sasha Hart diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wsgi_intercept-1.13.0/setup.py new/wsgi_intercept-1.13.1/setup.py --- old/wsgi_intercept-1.13.0/setup.py 2024-01-03 13:48:51.000000000 +0100 +++ new/wsgi_intercept-1.13.1/setup.py 2024-08-08 10:14:35.000000000 +0200 @@ -1,7 +1,7 @@ from setuptools import setup, find_packages -VERSION = '1.13.0' +VERSION = '1.13.1' CLASSIFIERS = """ Environment :: Web Environment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wsgi_intercept-1.13.0/wsgi_intercept/_urllib3.py new/wsgi_intercept-1.13.1/wsgi_intercept/_urllib3.py --- old/wsgi_intercept-1.13.0/wsgi_intercept/_urllib3.py 2024-01-03 13:43:53.000000000 +0100 +++ new/wsgi_intercept-1.13.1/wsgi_intercept/_urllib3.py 2024-08-08 10:13:20.000000000 +0200 @@ -30,6 +30,7 @@ kwargs.pop('socket_options', None) kwargs.pop('key_password', None) kwargs.pop('server_hostname', None) + kwargs.pop('ssl_context', None) if sys.version_info > (3, 12): kwargs.pop('key_file', None) kwargs.pop('cert_file', None) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wsgi_intercept-1.13.0/wsgi_intercept.egg-info/PKG-INFO new/wsgi_intercept-1.13.1/wsgi_intercept.egg-info/PKG-INFO --- old/wsgi_intercept-1.13.0/wsgi_intercept.egg-info/PKG-INFO 2024-01-03 13:53:32.000000000 +0100 +++ new/wsgi_intercept-1.13.1/wsgi_intercept.egg-info/PKG-INFO 2024-08-08 10:16:30.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 -Name: wsgi-intercept -Version: 1.13.0 +Name: wsgi_intercept +Version: 1.13.1 Summary: wsgi_intercept installs a WSGI application in place of a real URI for testing. Home-page: http://pypi.python.org/pypi/wsgi_intercept Author: Titus Brown, Kumar McMillan, Chris Dent, Sasha Hart

1 0

commit festival for openSUSE:Factory
by Source-Sync 16 Aug '24

16 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package festival for openSUSE:Factory checked in at 2024-08-16 12:24:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/festival (Old) and /work/SRC/openSUSE:Factory/.festival.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "festival" Fri Aug 16 12:24:10 2024 rev:43 rq:1194240 version:2.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/festival/festival.changes 2024-02-27 22:46:50.851273549 +0100 +++ /work/SRC/openSUSE:Factory/.festival.new.2698/festival.changes 2024-08-16 12:24:46.889853603 +0200 @@ -1,0 +2,6 @@ +Fri Aug 16 06:48:21 UTC 2024 - Yasuhiko Kamata <belphegor(a)belbel.or.jp> + +- Replace Requires(pre): "%{_sbindir}/{groupadd,useradd}" with + "shadow" to make it possible to pick up in Leap 16.0. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ festival.spec ++++++ --- /var/tmp/diff_new_pack.9O5LZh/_old 2024-08-16 12:24:47.593882861 +0200 +++ /var/tmp/diff_new_pack.9O5LZh/_new 2024-08-16 12:24:47.597883028 +0200 @@ -62,7 +62,7 @@ BuildRequires: gcc-c++ BuildRequires: ncurses-devel BuildRequires: pkgconfig -%if 0%{?suse_version} > 1600 +%if 0%{?suse_version} >= 1600 Requires(pre): shadow %else Requires(pre): %{_sbindir}/groupadd

1 0

commit chirp for openSUSE:Factory
by Source-Sync 16 Aug '24

16 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package chirp for openSUSE:Factory checked in at 2024-08-16 12:24:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chirp (Old) and /work/SRC/openSUSE:Factory/.chirp.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chirp" Fri Aug 16 12:24:01 2024 rev:3 rq:1194168 version:20240813 Changes: -------- --- /work/SRC/openSUSE:Factory/chirp/chirp.changes 2024-08-12 12:32:59.283081588 +0200 +++ /work/SRC/openSUSE:Factory/.chirp.new.2698/chirp.changes 2024-08-16 12:24:35.849394774 +0200 @@ -1,0 +2,12 @@ +Thu Aug 15 17:25:12 UTC 2024 - Andreas Stieger <andreas.stieger(a)gmx.de> + +- Update to version 20240813: + * ga510v2: Fix power level handling + * tdh3: Fix VFO power level settings + * uv17Pro: Note the A/B selection byte + * Add Radioddity DB50 model alias + * btech: Handle out-of-range reset time setting + * thd8: Fix ham model RX-bands + * Add padding support to icf.warp_byte_size + +------------------------------------------------------------------- Old: ---- chirp-20240806.obscpio New: ---- chirp-20240813.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chirp.spec ++++++ --- /var/tmp/diff_new_pack.tF5xMq/_old 2024-08-16 12:24:37.725472741 +0200 +++ /var/tmp/diff_new_pack.tF5xMq/_new 2024-08-16 12:24:37.737473240 +0200 @@ -19,7 +19,7 @@ %define pythons python3 Name: chirp -Version: 20240806 +Version: 20240813 Release: 0 Summary: Tool for programming amateur radio sets License: GPL-3.0-only ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.tF5xMq/_old 2024-08-16 12:24:38.217493189 +0200 +++ /var/tmp/diff_new_pack.tF5xMq/_new 2024-08-16 12:24:38.253494685 +0200 @@ -1,7 +1,8 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/kk7ds/chirp.git</param> - <param name="changesrevision">a8242df7d2bfc888604e26b9dc3e8ad111e02ee2</param> + <param name="changesrevision">a8cdf67eee681bfe6965c568bc26bfbc199c1d2c</param> </service> </servicedata> +(No newline at EOF) ++++++ chirp-20240806.obscpio -> chirp-20240813.obscpio ++++++ /work/SRC/openSUSE:Factory/chirp/chirp-20240806.obscpio /work/SRC/openSUSE:Factory/.chirp.new.2698/chirp-20240813.obscpio differ: char 50, line 1 ++++++ chirp.obsinfo ++++++ --- /var/tmp/diff_new_pack.tF5xMq/_old 2024-08-16 12:24:38.609509481 +0200 +++ /var/tmp/diff_new_pack.tF5xMq/_new 2024-08-16 12:24:38.637510644 +0200 @@ -1,5 +1,5 @@ name: chirp -version: 20240806 -mtime: 1722997198 -commit: a8242df7d2bfc888604e26b9dc3e8ad111e02ee2 +version: 20240813 +mtime: 1723586896 +commit: a8cdf67eee681bfe6965c568bc26bfbc199c1d2c

1 0

commit qtile for openSUSE:Factory
by Source-Sync 16 Aug '24

16 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qtile for openSUSE:Factory checked in at 2024-08-16 12:23:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qtile (Old) and /work/SRC/openSUSE:Factory/.qtile.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qtile" Fri Aug 16 12:23:59 2024 rev:30 rq:1194150 version:0.28.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qtile/qtile.changes 2024-07-22 17:18:23.914223266 +0200 +++ /work/SRC/openSUSE:Factory/.qtile.new.2698/qtile.changes 2024-08-16 12:24:33.777308660 +0200 @@ -1,0 +2,9 @@ +Thu Aug 15 13:45:50 UTC 2024 - Soc Virnyl Estela <obs(a)uncomfyhalomacro.pl> + +- Update to version 0.28.1: + * bugfixes + - fix a crash in the StatusNotifier widget #4959 #4960 + - various bug fixes to widgets from previous releases + - fix xrandr commands racing with qtile startup + +------------------------------------------------------------------- Old: ---- qtile-0.27.0.tar.gz New: ---- qtile-0.28.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtile.spec ++++++ --- /var/tmp/diff_new_pack.N7MGlp/_old 2024-08-16 12:24:34.225327279 +0200 +++ /var/tmp/diff_new_pack.N7MGlp/_new 2024-08-16 12:24:34.229327445 +0200 @@ -20,7 +20,7 @@ %global _conflict_wlroots_ver 0.18.0 Name: qtile -Version: 0.27.0 +Version: 0.28.1 Release: 0 Summary: A pure-Python tiling window manager # All MIT except for: libqtile/widget/pacman.py:GPL (v3 or later) ++++++ qtile-0.27.0.tar.gz -> qtile-0.28.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/CHANGELOG new/qtile-0.28.1/CHANGELOG --- old/qtile-0.27.0/CHANGELOG 2024-07-13 00:08:56.000000000 +0200 +++ new/qtile-0.28.1/CHANGELOG 2024-08-13 01:39:10.000000000 +0200 @@ -2,6 +2,15 @@ * features * bugfixes +Qtile 0.28.1, released 2024-08-12: + * bugfixes + - fix a crash in the StatusNotifier widget #4959 #4960 + +Qtile 0.28.0, released 2024-08-11: + * bugfixes + - various bug fixes to widgets from previous releases + - fix xrandr commands racing with qtile startup + Qtile 0.27.0, released 2024-07-12: * features - Make default `Plasma` add mode dynamic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/PKG-INFO new/qtile-0.28.1/PKG-INFO --- old/qtile-0.27.0/PKG-INFO 2024-07-13 00:09:04.178852000 +0200 +++ new/qtile-0.28.1/PKG-INFO 2024-08-13 01:39:19.010635100 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: qtile -Version: 0.27.0 +Version: 0.28.1 Summary: A pure-Python tiling window manager. License: MIT Project-URL: Homepage, https://qtile.org diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/libqtile/backend/x11/core.py new/qtile-0.28.1/libqtile/backend/x11/core.py --- old/qtile-0.27.0/libqtile/backend/x11/core.py 2024-07-13 00:08:56.000000000 +0200 +++ new/qtile-0.28.1/libqtile/backend/x11/core.py 2024-08-13 01:39:10.000000000 +0200 @@ -185,7 +185,10 @@ self.conn.finalize() def get_screen_info(self) -> list[ScreenRect]: - return self.conn.pseudoscreens + ps = self.conn.pseudoscreens + if self.qtile: + self._xpoll() + return ps @property def wmname(self): @@ -271,7 +274,6 @@ self.update_client_lists() win.change_layer() - self.conn.enable_screen_change_notifications() def warp_pointer(self, x, y): self._root.warp_pointer(x, y) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/libqtile/backend/x11/xcbq.py new/qtile-0.28.1/libqtile/backend/x11/xcbq.py --- old/qtile-0.27.0/libqtile/backend/x11/xcbq.py 2024-07-13 00:08:56.000000000 +0200 +++ new/qtile-0.28.1/libqtile/backend/x11/xcbq.py 2024-08-13 01:39:10.000000000 +0200 @@ -402,6 +402,7 @@ class RandR: def __init__(self, conn): self.ext = conn.conn(xcffib.randr.key) + self.ext.SelectInput(conn.default_screen.root.wid, xcffib.randr.NotifyMask.ScreenChange) def query_crtcs(self, root): infos = [] @@ -411,9 +412,6 @@ infos.append(ScreenRect(crtc_info.x, crtc_info.y, crtc_info.width, crtc_info.height)) return infos - def enable_screen_change_notifications(self, conn): - self.ext.SelectInput(conn.default_screen.root.wid, xcffib.randr.NotifyMask.ScreenChange) - class XFixes: selection_mask = ( @@ -497,9 +495,6 @@ elif hasattr(self, "randr"): return self.randr.query_crtcs(self.screens[0].root.wid) - def enable_screen_change_notifications(self): - self.randr.enable_screen_change_notifications(self) - def finalize(self): self.cursors.finalize() self.disconnect() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/libqtile/dgroups.py new/qtile-0.28.1/libqtile/dgroups.py --- old/qtile-0.27.0/libqtile/dgroups.py 2024-07-13 00:08:56.000000000 +0200 +++ new/qtile-0.28.1/libqtile/dgroups.py 2024-08-13 01:39:10.000000000 +0200 @@ -253,7 +253,7 @@ self.sort_groups() del self.timeout[client] - if group.persist: + if group is not None and group.persist: return logger.debug("Deleting %s in %ss", group, self.delay) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/libqtile/hook.py new/qtile-0.28.1/libqtile/hook.py --- old/qtile-0.27.0/libqtile/hook.py 2024-07-13 00:08:56.000000000 +0200 +++ new/qtile-0.28.1/libqtile/hook.py 2024-08-13 01:39:10.000000000 +0200 @@ -35,7 +35,7 @@ import contextlib from typing import TYPE_CHECKING -from libqtile import utils +from libqtile import backend, utils from libqtile.log_utils import logger from libqtile.resources.sleep import inhibitor @@ -175,6 +175,9 @@ def fire(self, event, *args, **kwargs): if event not in self.subscribe.hooks: raise utils.QtileError("Unknown event: %s" % event) + # Do not fire for Internal windows + if any(isinstance(arg, backend.base.window.Internal) for arg in args): + return # We should check if the registry name is in the subscriptions dict # A name can disappear if the config is reloaded (which clears subscriptions) # but there are no hook subscriptions. This is not an issue for qtile core but @@ -569,7 +572,8 @@ Hook( "client_killed", """ - Called after a client has been unmanaged + Called after a client has been unmanaged. This hook is not called for + internal windows. **Arguments** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/libqtile/scratchpad.py new/qtile-0.28.1/libqtile/scratchpad.py --- old/qtile-0.27.0/libqtile/scratchpad.py 2024-07-13 00:08:56.000000000 +0200 +++ new/qtile-0.28.1/libqtile/scratchpad.py 2024-08-13 01:39:10.000000000 +0200 @@ -179,7 +179,7 @@ net_wm_state = list(window.window.get_property("_NET_WM_STATE", "ATOM", unpack=int)) skip_taskbar = window.qtile.core.conn.atoms["_NET_WM_STATE_SKIP_TASKBAR"] if net_wm_state: - if "_NET_WM_STATE_SKIP_TASKBAR" not in net_wm_state: + if skip_taskbar not in net_wm_state: net_wm_state.append(skip_taskbar) else: net_wm_state = [skip_taskbar] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/libqtile/scripts/check.py new/qtile-0.28.1/libqtile/scripts/check.py --- old/qtile-0.27.0/libqtile/scripts/check.py 2024-07-13 00:08:56.000000000 +0200 +++ new/qtile-0.28.1/libqtile/scripts/check.py 2024-08-13 01:39:10.000000000 +0200 @@ -151,12 +151,12 @@ except CheckError: valid = False - if valid: - print("Your config can be loaded by Qtile.") - else: - print( - "Your config is valid python but has type checking errors. This may result in unexpected behaviour." - ) + if valid: + print("Your config can be loaded by Qtile.") + else: + print( + "Your config is valid python but has type checking errors. This may result in unexpected behaviour." + ) def add_subcommand(subparsers, parents): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/libqtile/widget/cmus.py new/qtile-0.28.1/libqtile/widget/cmus.py --- old/qtile-0.27.0/libqtile/widget/cmus.py 2024-07-13 00:08:56.000000000 +0200 +++ new/qtile-0.28.1/libqtile/widget/cmus.py 2024-08-13 01:39:10.000000000 +0200 @@ -14,6 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +import datetime +import math import subprocess from functools import partial @@ -21,6 +23,11 @@ from libqtile.widget import base +def format_time(time_seconds_string): + """Format time in seconds as [h:]mm:ss.""" + return str(datetime.timedelta(seconds=float(time_seconds_string))).lstrip("0").lstrip(":") + + class Cmus(base.ThreadPoolText): """A simple Cmus widget. @@ -31,15 +38,55 @@ - skip forward in playlist on scroll up; - skip backward in playlist on scroll down. + The following fields (extracted from ``cmus-remote -C status``) are available in the `format` + string: + + - ``status``: cmus playback status, one of "playing", "paused" or "stopped". + - ``file`` + - ``position``: Current position in [h:]mm:ss. + - ``position_percent``: Current position in percent. + - ``remaining``: Remaining time in [h:]mm:ss. + - ``remaining_percent``: Remaining time in percent. + - ``duration``: Total length in [h:]mm:ss. + - ``artist`` + - ``album`` + - ``albumartist`` + - ``composer`` + - ``comment`` + - ``date`` + - ``discnumber`` + - ``genre`` + - ``title``: Title or filename if no title is available. + - ``tracknumber`` + - ``stream`` + - ``status_text``: Text indicating the playback status, corresponds to one of `playing_text`, + `paused_text` or `stopped_text`. + Cmus (https://cmus.github.io) should be installed. """ defaults = [ - ("format", "{play_icon}{artist} - {title}", "Format of playback info."), - ("play_icon", "♫ ", "Icon to display, if chosen."), - ("play_color", "00ff00", "Text colour when playing."), - ("noplay_color", "cecece", "Text colour when not playing."), + ("format", "{status_text}{artist} - {title}", "Format of playback info."), + ("stream_format", "{status_text}{stream}", "Format of playback info for streams."), + ( + "no_artist_format", + "{status_text}{title}", + "Format of playback info if no artist available.", + ), + ("playing_text", "♫ ", "Text to display when playing, if chosen."), + ("playing_color", "00ff00", "Text colour when playing."), + ("paused_text", "♫ ", "Text to display when paused, if chosen."), + ("paused_color", "cecece", "Text color when paused."), + ("stopped_text", "♫ ", "Text to display when stopped, if chosen."), + ("stopped_color", "cecece", "Text color when stopped."), ("update_interval", 0.5, "Update Time in seconds."), + ( + "play_icon", + "♫ ", + "DEPRECATED Text to display when playing, paused, and stopped, if chosen.", + ), + ("play_color", "", "DEPRECATED Text colour when playing."), + ("noplay_color", "", "DEPRECATED Text colour when paused or stopped."), ] def __init__(self, **config): @@ -56,6 +103,15 @@ } ) + def _configure(self, qtile, parent_bar): + base.ThreadPoolText._configure(self, qtile, parent_bar) + # Backwards compatibility + if self.play_color: + self.playing_color = self.play_color + self.paused_color = self.play_color + if self.noplay_color: + self.stopped_color = self.noplay_color + def get_info(self): """Return a dictionary with info about the current cmus status.""" try: @@ -67,6 +123,11 @@ info = { "status": "", "file": "", + "position": "", + "position_percent": "", + "remaining": "", + "remaining_percent": "", + "duration": "", "artist": "", "album": "", "albumartist": "", @@ -78,10 +139,13 @@ "title": "", "tracknumber": "", "stream": "", + "status_text": "", "play_icon": self.play_icon, } for line in output: + if line.startswith("set"): + break for data in info: match = data + " " if match in line: @@ -89,8 +153,33 @@ if index < 5: info[data] = line[len(data) + index :].strip() break - elif line.startswith("set"): - return info + + # Set status text + status = info["status"] + info["status_text"] = getattr(self, f"{status}_text", self.stopped_text) + + # Format and process duration and position + if info["position"] != "" and info["duration"] != "" and int(info["duration"]) > 0: + info["position_percent"] = ( + str(math.floor(int(info["position"]) / int(info["duration"]) * 100)) + "%" + ) + info["remaining_percent"] = ( + str( + math.ceil( + (int(info["duration"]) - int(info["position"])) + / int(info["duration"]) + * 100 + ) + ) + + "%" + ) + info["remaining"] = format_time(int(info["duration"]) - int(info["position"])) + info["position"] = format_time(info["position"]) + info["duration"] = format_time(info["duration"]) + else: + info["duration"] = "" + info["position"] = "" + return info def now_playing(self): @@ -98,29 +187,31 @@ info = self.get_info() now_playing = "" if info: + display_format = self.format status = info["status"] if self.status != status: self.status = status if self.status == "playing": - self.layout.colour = self.play_color + self.layout.colour = self.playing_color + elif self.status == "paused": + self.layout.colour = self.paused_color else: - self.layout.colour = self.noplay_color + self.layout.colour = self.stopped_color self.local = info["file"].startswith("/") - title = "{play_icon}" + info["title"] if self.local: - now_playing = self.format.format(**info) - if not info["artist"] and not info["title"]: - file_path = info["file"] - file_path = "{play_icon}" + file_path.split("/")[-1] - now_playing = file_path.format(**info) - else: - if info["stream"]: - stream_title = "{play_icon}" + info["stream"] - now_playing = stream_title.format(**info) - else: - now_playing = title.format(**info) - if now_playing == self.play_icon: - now_playing = "" + if not info["title"]: + info["title"] = info["file"].split("/")[-1] + if not info["artist"]: + display_format = self.no_artist_format + elif info["stream"]: + display_format = self.stream_format + # Handle case if cmus was started and no file is selected yet + elif not info["file"]: + display_format = "" + now_playing = display_format.format(**info) + if now_playing.strip() == info["status_text"].strip(): + now_playing = "" + return pangocffi.markup_escape_text(now_playing) def play(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/libqtile/widget/helpers/status_notifier/statusnotifier.py new/qtile-0.28.1/libqtile/widget/helpers/status_notifier/statusnotifier.py --- old/qtile-0.27.0/libqtile/widget/helpers/status_notifier/statusnotifier.py 2024-07-13 00:08:56.000000000 +0200 +++ new/qtile-0.28.1/libqtile/widget/helpers/status_notifier/statusnotifier.py 2024-08-13 01:39:10.000000000 +0200 @@ -17,7 +17,7 @@ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -import os +from contextlib import suppress from functools import partial from pathlib import Path @@ -244,9 +244,11 @@ try: icon_path = await self.item.get_icon_theme_path() - self.icon = self._get_custom_icon(icon_name, icon_path) except (AttributeError, DBusError): - pass + icon_path = None + + if icon_path: + self.icon = self._get_custom_icon(icon_name, Path(icon_path)) if not self.icon: self.icon = self._get_xdg_icon(icon_name) @@ -275,10 +277,31 @@ self._create_task_and_draw(self._get_icon("Overlay")) def _get_custom_icon(self, icon_name, icon_path): + icon = None for ext in [".png", ".svg"]: - path = os.path.join(icon_path, icon_name + ext) - if os.path.isfile(path): - return Img.from_path(path) + path = icon_path / f"{icon_name}{ext}" + if path.is_file(): + icon = path + break + + else: + # No icon found at the image path, let's search recursively + glob = icon_path.rglob(f"{icon_name}.*") + found = [icon for icon in glob if icon.is_file()] + + # Found a matching icon in subfolder + if found: + # We'd prefer an svg file + svg = [icon for icon in found if icon.suffix.lower() == ".svg"] + if svg: + icon = svg[0] + else: + # If not, we'll take what there is + # NOTE: not clear how we can handle multiple matches with different icon sizes 16x16, 32x32 etc + icon = found[0] + + if icon is not None: + return Img.from_path(icon.resolve().as_posix()) return None @@ -667,13 +690,16 @@ self, on_item_added=None, on_item_removed=None, on_icon_changed=None ): if on_item_added is not None: - self._on_item_added.remove(on_item_added) + with suppress(ValueError): + self._on_item_added.remove(on_item_added) if on_item_removed is not None: - self._on_item_removed.remove(on_item_removed) + with suppress(ValueError): + self._on_item_removed.remove(on_item_removed) if on_icon_changed is not None: - self._on_icon_changed.remove(on_icon_changed) + with suppress(ValueError): + self._on_icon_changed.remove(on_icon_changed) host = StatusNotifierHost() # noqa: E303 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/libqtile/widget/net.py new/qtile-0.28.1/libqtile/widget/net.py --- old/qtile-0.27.0/libqtile/widget/net.py 2024-07-13 00:08:56.000000000 +0200 +++ new/qtile-0.28.1/libqtile/widget/net.py 2024-08-13 01:39:10.000000000 +0200 @@ -32,6 +32,21 @@ """ Displays interface down and up speed + The following fields are available in the `format` string: + + - ``interface``: name of the interface + - ``down``: download speed + - ``down_suffix``: suffix for the download speed + - ``down_cumulative``: cumulative download traffic + - ``down_cumulative_suffix``: suffix for the cumulative download traffic + - ``up``: upload speed + - ``up_suffix``: suffix for the upload speed + - ``up_cumulative``: cumulative upload traffic + - ``up_cumulative_suffix``: suffix for the cumulative upload traffic + - ``total``: total speed + - ``total_suffix``: suffix for the total speed + - ``total_cumulative``: cumulative total traffic + - ``total_cumulative_suffix``: suffix for the cumulative total traffic Widget requirements: psutil_. @@ -53,6 +68,11 @@ ("update_interval", 1, "The update interval."), ("use_bits", False, "Use bits instead of bytes per second?"), ("prefix", None, "Use a specific prefix for the unit of the speed."), + ( + "cumulative_prefix", + None, + "Use a specific prefix for the unit of the cumulative traffic.", + ), ] def __init__(self, **config): @@ -82,19 +102,19 @@ ) self.stats = self.get_stats() - def convert_b(self, num_bytes: float) -> tuple[float, str]: + def convert_b(self, num_bytes: float, prefix: str | None = None) -> tuple[float, str]: """Converts the number of bytes to the correct unit""" num_bytes *= self.byte_multiplier - if self.prefix is None: + if prefix is None: if num_bytes > 0: power = int(log(num_bytes) / log(self.factor)) power = min(power, len(self.units) - 1) else: power = 0 else: - power = self.allowed_prefixes.index(self.prefix) + power = self.allowed_prefixes.index(prefix) converted_bytes = num_bytes / self.factor**power unit = self.units[power] @@ -135,19 +155,34 @@ down = down / self.update_interval up = up / self.update_interval total = total / self.update_interval - down, down_suffix = self.convert_b(down) - up, up_suffix = self.convert_b(up) - total, total_suffix = self.convert_b(total) + down, down_suffix = self.convert_b(down, self.prefix) + down_cumulative, down_cumulative_suffix = self.convert_b( + new_stats[intf]["down"], self.cumulative_prefix + ) + up, up_suffix = self.convert_b(up, self.prefix) + up_cumulative, up_cumulative_suffix = self.convert_b( + new_stats[intf]["up"], self.cumulative_prefix + ) + total, total_suffix = self.convert_b(total, self.prefix) + total_cumulative, total_cumulative_suffix = self.convert_b( + new_stats[intf]["total"], self.cumulative_prefix + ) self.stats[intf] = new_stats[intf] ret_stat.append( self.format.format( interface=intf, down=down, down_suffix=down_suffix, + down_cumulative=down_cumulative, + down_cumulative_suffix=down_cumulative_suffix, up=up, up_suffix=up_suffix, + up_cumulative=up_cumulative, + up_cumulative_suffix=up_cumulative_suffix, total=total, total_suffix=total_suffix, + total_cumulative=total_cumulative, + total_cumulative_suffix=total_cumulative_suffix, ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/libqtile/widget/tasklist.py new/qtile-0.28.1/libqtile/widget/tasklist.py --- old/qtile-0.27.0/libqtile/widget/tasklist.py 2024-07-13 00:08:56.000000000 +0200 +++ new/qtile-0.28.1/libqtile/widget/tasklist.py 2024-08-13 01:39:10.000000000 +0200 @@ -279,11 +279,13 @@ @property def windows(self): if self.qtile.core.name == "x11": - return [ - w - for w in self.bar.screen.group.windows - if w.window.get_wm_type() in ("normal", None) - ] + windows = [] + for w in self.bar.screen.group.windows: + wm_states = list(w.window.get_property("_NET_WM_STATE", "ATOM", unpack=int)) + skip_taskbar = w.qtile.core.conn.atoms["_NET_WM_STATE_SKIP_TASKBAR"] + if w.window.get_wm_type() in ("normal", None) and skip_taskbar not in wm_states: + windows.append(w) + return windows return self.bar.screen.group.windows @property diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/libqtile/widget/wlan.py new/qtile-0.28.1/libqtile/widget/wlan.py --- old/qtile-0.27.0/libqtile/widget/wlan.py 2024-07-13 00:08:56.000000000 +0200 +++ new/qtile-0.28.1/libqtile/widget/wlan.py 2024-08-13 01:39:10.000000000 +0200 @@ -29,6 +29,7 @@ import iwlib from libqtile.log_utils import logger +from libqtile.pangocffi import markup_escape_text from libqtile.widget import base @@ -99,7 +100,9 @@ return self.disconnected_message else: return self.disconnected_message - return self.format.format(essid=essid, quality=quality, percent=(quality / 70)) + return self.format.format( + essid=markup_escape_text(essid), quality=quality, percent=(quality / 70) + ) except EnvironmentError: logger.error( "Probably your wlan device is switched off or " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/qtile.egg-info/PKG-INFO new/qtile-0.28.1/qtile.egg-info/PKG-INFO --- old/qtile-0.27.0/qtile.egg-info/PKG-INFO 2024-07-13 00:09:04.000000000 +0200 +++ new/qtile-0.28.1/qtile.egg-info/PKG-INFO 2024-08-13 01:39:18.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: qtile -Version: 0.27.0 +Version: 0.28.1 Summary: A pure-Python tiling window manager. License: MIT Project-URL: Homepage, https://qtile.org diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/test/widgets/test_cmus.py new/qtile-0.28.1/test/widgets/test_cmus.py --- old/qtile-0.27.0/test/widgets/test_cmus.py 2024-07-13 00:08:56.000000000 +0200 +++ new/qtile-0.28.1/test/widgets/test_cmus.py 2024-08-13 01:39:10.000000000 +0200 @@ -26,7 +26,6 @@ import libqtile.config from libqtile.widget import cmus -from test.widgets.conftest import FakeBar class MockCmusRemoteProcess: @@ -66,8 +65,8 @@ [ "status playing", "file http://playing/file/sweetcaroline.mp3", - "duration 222", - "position 14", + "duration -1", + "position -9", "tag artist Neil Diamond", "tag album Greatest Hits", "tag title Sweet Caroline", @@ -131,12 +130,10 @@ cls.call_process(cmd) -def no_op(*args, **kwargs): - pass - - @pytest.fixture -def patched_cmus(monkeypatch): +def cmus_manager(manager_nospawn, monkeypatch, minimal_conf_noscreen, request): + widget_config = getattr(request, "param", dict()) + MockCmusRemoteProcess.reset() monkeypatch.setattr("libqtile.widget.cmus.subprocess", MockCmusRemoteProcess) monkeypatch.setattr( @@ -146,104 +143,125 @@ "libqtile.widget.cmus.base.ThreadPoolText.call_process", MockCmusRemoteProcess.call_process, ) - return cmus + + config = minimal_conf_noscreen + config.screens = [ + libqtile.config.Screen( + top=libqtile.bar.Bar( + [cmus.Cmus(**widget_config)], + 10, + ), + ) + ] + + manager_nospawn.start(config) + yield manager_nospawn -def test_cmus(fake_qtile, patched_cmus, fake_window): - widget = patched_cmus.Cmus() - fakebar = FakeBar([widget], window=fake_window) - widget._configure(fake_qtile, fakebar) - text = widget.poll() - assert text == "♫ Rick Astley - Never Gonna Give You Up" - assert widget.layout.colour == widget.play_color +def test_cmus(cmus_manager): + widget = cmus_manager.c.widget["cmus"] - widget.play() - text = widget.poll() - assert text == "♫ Rick Astley - Never Gonna Give You Up" - assert widget.layout.colour == widget.noplay_color + widget.eval("self.update(self.poll())") + assert widget.info()["text"] == "♫ Rick Astley - Never Gonna Give You Up" + assert widget.eval("self.layout.colour") == widget.eval("self.playing_color") + widget.eval("self.play()") + widget.eval("self.update(self.poll())") + assert widget.info()["text"] == "♫ Rick Astley - Never Gonna Give You Up" + assert widget.eval("self.layout.colour") == widget.eval("self.paused_color") -def test_cmus_play_stopped(fake_qtile, patched_cmus, fake_window): - widget = patched_cmus.Cmus() + +def test_cmus_play_stopped(cmus_manager): + widget = cmus_manager.c.widget["cmus"] # Set track to a stopped item - MockCmusRemoteProcess.index = 2 - fakebar = FakeBar([widget], window=fake_window) - widget._configure(fake_qtile, fakebar) - text = widget.poll() + widget.eval("subprocess.index = 2") + widget.eval("self.update(self.poll())") # It's stopped so colour should reflect this - assert text == "♫ tomjones" - assert widget.layout.colour == widget.noplay_color + assert widget.info()["text"] == "♫ tomjones" + assert widget.eval("self.layout.colour") == widget.eval("self.stopped_color") - widget.play() - text = widget.poll() - assert text == "♫ tomjones" - assert widget.layout.colour == widget.play_color + widget.eval("self.play()") + widget.eval("self.update(self.poll())") + assert widget.info()["text"] == "♫ tomjones" + assert widget.eval("self.layout.colour") == widget.eval("self.playing_color") -def test_cmus_buttons(minimal_conf_noscreen, manager_nospawn, patched_cmus): - widget = patched_cmus.Cmus(update_interval=30) - config = minimal_conf_noscreen - config.screens = [libqtile.config.Screen(top=libqtile.bar.Bar([widget], 10))] - manager_nospawn.start(config) - topbar = manager_nospawn.c.bar["top"] +(a)pytest.mark.parametrize( + "cmus_manager", + [{"format": "{position} {duration} {position_percent} {remaining} {remaining_percent}"}], + indirect=True, +) +def test_cmus_times(cmus_manager): + widget = cmus_manager.c.widget["cmus"] + + # Check item with valid position and duration + widget.eval("self.update(self.poll())") + + # Check that times are correct + assert widget.info()["text"] == "00:14 03:42 6% 03:28 94%" + + # Set track to an item with invalid position and duration + widget.eval("subprocess.index = 1") + widget.eval("self.update(self.poll())") - cmuswidget = manager_nospawn.c.widget["cmus"] - assert cmuswidget.info()["text"] == "♫ Rick Astley - Never Gonna Give You Up" + # Check that times are empty + assert widget.info()["text"].strip() == "" + + +def test_cmus_buttons(cmus_manager): + topbar = cmus_manager.c.bar["top"] + + widget = cmus_manager.c.widget["cmus"] + assert widget.info()["text"] == "♫ Rick Astley - Never Gonna Give You Up" # Play next track - # Non-local file source so widget just displays title + # Non-local file source topbar.fake_button_press(0, "top", 0, 0, button=4) - cmuswidget.eval("self.update(self.poll())") - assert cmuswidget.info()["text"] == "♫ Sweet Caroline" + widget.eval("self.update(self.poll())") + assert widget.info()["text"] == "♫ Neil Diamond - Sweet Caroline" # Play next track # Stream source so widget just displays stream info topbar.fake_button_press(0, "top", 0, 0, button=4) - cmuswidget.eval("self.update(self.poll())") - assert cmuswidget.info()["text"] == "♫ tomjones" + widget.eval("self.update(self.poll())") + assert widget.info()["text"] == "♫ tomjones" # Play previous track - # Non-local file source so widget just displays title + # Non-local file source topbar.fake_button_press(0, "top", 0, 0, button=5) - cmuswidget.eval("self.update(self.poll())") - assert cmuswidget.info()["text"] == "♫ Sweet Caroline" + widget.eval("self.update(self.poll())") + assert widget.info()["text"] == "♫ Neil Diamond - Sweet Caroline" -def test_cmus_error_handling(fake_qtile, patched_cmus, fake_window): - widget = patched_cmus.Cmus() - MockCmusRemoteProcess.is_error = True - fakebar = FakeBar([widget], window=fake_window) - widget._configure(fake_qtile, fakebar) - text = widget.poll() +def test_cmus_error_handling(cmus_manager): + widget = cmus_manager.c.widget["cmus"] + widget.eval("subprocess.is_error = True") + widget.eval("self.update(self.poll())") # Widget does nothing with error message so text is blank # TODO: update widget to show error? - assert text == "" + assert widget.info()["text"] == "" -def test_escape_text(fake_qtile, patched_cmus, fake_window): - widget = patched_cmus.Cmus() +def test_escape_text(cmus_manager): + widget = cmus_manager.c.widget["cmus"] - # Set track to a stopped item - MockCmusRemoteProcess.index = 3 - fakebar = FakeBar([widget], window=fake_window) - widget._configure(fake_qtile, fakebar) - text = widget.poll() + # Set track to an item with a title which needs escaping + widget.eval("subprocess.index = 3") + widget.eval("self.update(self.poll())") - # It's stopped so colour should reflect this - assert text == "♫ Above & Beyond - Always - Tinlicker Extended Mix" + # & should be escaped to & + assert widget.info()["text"] == "♫ Above & Beyond - Always - Tinlicker Extended Mix" -def test_missing_metadata(fake_qtile, patched_cmus, fake_window): - widget = patched_cmus.Cmus() +def test_missing_metadata(cmus_manager): + widget = cmus_manager.c.widget["cmus"] # Set track to one that's missing Title and Artist metadata - MockCmusRemoteProcess.index = 4 - fakebar = FakeBar([widget], window=fake_window) - widget._configure(fake_qtile, fakebar) - text = widget.poll() + widget.eval("subprocess.index = 4") + widget.eval("self.update(self.poll())") # Displayed text should default to the name of the file - assert text == "♫ always.mp3" + assert widget.info()["text"] == "♫ always.mp3" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/test/widgets/test_net.py new/qtile-0.28.1/test/widgets/test_net.py --- old/qtile-0.27.0/test/widgets/test_net.py 2024-07-13 00:08:56.000000000 +0200 +++ new/qtile-0.28.1/test/widgets/test_net.py 2024-08-13 01:39:10.000000000 +0200 @@ -62,7 +62,9 @@ # Reload fixes cases where psutil may have been imported previously reload(net) widget = net.Net( - format="{interface}: U {up}{up_suffix} D {down}{down_suffix} T {total}{total_suffix}", + format="{interface}: U {up}{up_suffix} {up_cumulative}{up_cumulative_suffix} D " + "{down}{down_suffix} {down_cumulative}{down_cumulative_suffix} T {total}" + "{total_suffix} {total_cumulative}{total_cumulative_suffix}", **kwargs ) fakebar = FakeBar([widget], window=fake_window) @@ -76,19 +78,22 @@ def test_net_defaults(patch_net): """Default: widget shows `all` interfaces""" net1 = patch_net() - assert net1.poll() == "all: U 40.0kB D 1.2MB T 1.24MB" + assert net1.poll() == "all: U 40.0kB 80.0kB D 1.2MB 2.4MB T 1.24MB 2.48MB" def test_net_single_interface(patch_net): """Display single named interface""" net2 = patch_net(interface="wlp58s0") - assert net2.poll() == "wlp58s0: U 40.0kB D 1.2MB T 1.24MB" + assert net2.poll() == "wlp58s0: U 40.0kB 160.0kB D 1.2MB 4.8MB T 1.24MB 4.96MB" def test_net_list_interface(patch_net): """Display multiple named interfaces""" net2 = patch_net(interface=["wlp58s0", "lo"]) - assert net2.poll() == "wlp58s0: U 40.0kB D 1.2MB T 1.24MB lo: U 40.0kB D 1.2MB T 1.24MB" + assert net2.poll() == ( + "wlp58s0: U 40.0kB 240.0kB D 1.2MB 7.2MB T 1.24MB 7.44MB lo: U 40.0kB " + "240.0kB D 1.2MB 7.2MB T 1.24MB 7.44MB" + ) def test_net_invalid_interface(patch_net): @@ -100,7 +105,7 @@ def test_net_use_bits(patch_net): """Display all interfaces in bits rather than bytes""" net4 = patch_net(use_bits=True) - assert net4.poll() == "all: U 320.0kb D 9.6Mb T 9.92Mb" + assert net4.poll() == "all: U 320.0kb 2.56Mb D 9.6Mb 76.8Mb T 9.92Mb 79.36Mb" def test_net_convert_zero_b(patch_net): @@ -112,7 +117,7 @@ def test_net_use_prefix(patch_net): """Tests `prefix` configurable option""" net6 = patch_net(prefix="M") - assert net6.poll() == "all: U 0.04MB D 1.2MB T 1.24MB" + assert net6.poll() == "all: U 0.04MB 440.0kB D 1.2MB 13.2MB T 1.24MB 13.64MB" # Untested: 128-129 - generic exception catching diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/test/widgets/test_tasklist.py new/qtile-0.28.1/test/widgets/test_tasklist.py --- old/qtile-0.27.0/test/widgets/test_tasklist.py 2024-07-13 00:08:56.000000000 +0200 +++ new/qtile-0.28.1/test/widgets/test_tasklist.py 2024-08-13 01:39:10.000000000 +0200 @@ -17,6 +17,7 @@ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. + import pytest import libqtile.config @@ -24,6 +25,8 @@ from libqtile.config import Screen from libqtile.confreader import Config from libqtile.widget.tasklist import TaskList +from test.layouts.layout_utils import assert_focused +from test.test_scratchpad import is_spawned, spawn_cmd class TaskListTestWidget(TaskList): @@ -59,7 +62,16 @@ class TasklistConfig(Config): auto_fullscreen = True - groups = [libqtile.config.Group("a"), libqtile.config.Group("b")] + groups = [ + libqtile.config.ScratchPad( + "SCRATCHPAD", + dropdowns=[ + libqtile.config.DropDown("dd-a", spawn_cmd("dd-a"), on_focus_lost_hide=False), + ], + ), + libqtile.config.Group("a"), + libqtile.config.Group("b"), + ] layouts = [layout.Stack()] floating_layout = libqtile.resources.default_config.floating_layout keys = [] @@ -104,6 +116,37 @@ assert widget.info()["text"] == "One|Two" +def test_tasklist_skip_taskbar_defaults(tasklist_manager): + widget = tasklist_manager.c.widget["tasklist"] + tasklist_manager.c.group["SCRATCHPAD"].dropdown_reconfigure("dd-a") + + tasklist_manager.test_window("one") + assert_focused(tasklist_manager, "one") + + # dd-a has no window associated yet + assert "window" not in tasklist_manager.c.group["SCRATCHPAD"].dropdown_info("dd-a") + + # First toggling: wait for window + tasklist_manager.c.group["SCRATCHPAD"].dropdown_toggle("dd-a") + is_spawned(tasklist_manager, "dd-a") + assert_focused(tasklist_manager, "dd-a") + assert ( + tasklist_manager.c.group["SCRATCHPAD"].dropdown_info("dd-a")["window"]["name"] == "dd-a" + ) + + if tasklist_manager.c.core.info()["backend"] == "x11": + # check that window's _NET_WM_STATE contains _NET_WM_STATE_SKIP_TASKBAR + net_wm_state = tasklist_manager.c.window.eval( + 'self.window.get_property("_NET_WM_STATE", "ATOM", unpack=int)' + )[1] + skip_taskbar = tasklist_manager.c.window.eval( + 'self.qtile.core.conn.atoms["_NET_WM_STATE_SKIP_TASKBAR"]' + )[1] + assert skip_taskbar in net_wm_state + assert tasklist_manager.c.window.eval("self.window.get_wm_type()")[1] == "normal" + assert widget.info()["text"] == "one" + + @configure_tasklist(txt_minimized="(min) ", txt_maximized="(max) ", txt_floating="(float) ") def test_tasklist_custom_text(tasklist_manager): widget = tasklist_manager.c.widget["tasklist"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtile-0.27.0/test/widgets/test_wlan.py new/qtile-0.28.1/test/widgets/test_wlan.py --- old/qtile-0.27.0/test/widgets/test_wlan.py 2024-07-13 00:08:56.000000000 +0200 +++ new/qtile-0.28.1/test/widgets/test_wlan.py 2024-08-13 01:39:10.000000000 +0200 @@ -103,6 +103,15 @@ assert text == expected +def test_wlan_display_escape_essid( + minimal_conf_noscreen, manager_nospawn, patched_wlan, monkeypatch +): + """Test escaping of pango markup in ESSID""" + monkeypatch.setitem(MockIwlib.DATA["wlan0"], "ESSID", b"A&B") + widget = patched_wlan.Wlan(format="{essid}") + assert widget.poll() == "A&B" + + @pytest.mark.parametrize( "kwargs,state,expected", [

1 0

commit aide for openSUSE:Factory
by Source-Sync 16 Aug '24

16 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package aide for openSUSE:Factory checked in at 2024-08-16 12:23:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aide (Old) and /work/SRC/openSUSE:Factory/.aide.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aide" Fri Aug 16 12:23:58 2024 rev:43 rq:1194143 version:0.18.8 Changes: -------- --- /work/SRC/openSUSE:Factory/aide/aide.changes 2024-02-21 17:55:37.581588430 +0100 +++ /work/SRC/openSUSE:Factory/.aide.new.2698/aide.changes 2024-08-16 12:24:32.617260449 +0200 @@ -1,0 +2,16 @@ +Sun Aug 11 12:55:40 UTC 2024 - Aeneas Jaißle <aj(a)ajaissle.de> + +- Update to 0.18.8: + * Fix concurrent reading of extended attributes (xattrs) + * Raise warning if both input databases are the same + +- Update to 0.18.7: + * Add missing library CFLAGS + * Fix typo in aide.conf manual page + * Fix 64-bit time_t on 32-bit architectures + * Fix debug logging for returned attributes + * Fix condition for error message of failing to open gzipped files + +- rebased aide-0.18-as-needed.patch + +------------------------------------------------------------------- Old: ---- aide-0.18.6.tar.gz aide-0.18.6.tar.gz.asc New: ---- aide-0.18.8.tar.gz aide-0.18.8.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aide.spec ++++++ --- /var/tmp/diff_new_pack.VNLqiS/_old 2024-08-16 12:24:33.409293366 +0200 +++ /var/tmp/diff_new_pack.VNLqiS/_new 2024-08-16 12:24:33.409293366 +0200 @@ -17,7 +17,7 @@ Name: aide -Version: 0.18.6 +Version: 0.18.8 Release: 0 Summary: Advanced Intrusion Detection Environment License: GPL-2.0-or-later ++++++ aide-0.18-as-needed.patch ++++++ --- /var/tmp/diff_new_pack.VNLqiS/_old 2024-08-16 12:24:33.441294695 +0200 +++ /var/tmp/diff_new_pack.VNLqiS/_new 2024-08-16 12:24:33.445294862 +0200 @@ -1,14 +1,12 @@ -Index: aide-0.18.3/Makefile.am -=================================================================== ---- aide-0.18.3.orig/Makefile.am -+++ aide-0.18.3/Makefile.am -@@ -65,7 +65,7 @@ aide_SOURCES += include/fopen.h src/fope - endif - - aide_CFLAGS = @AIDE_DEFS@ -W -Wall -g ${PTHREAD_CFLAGS} --aide_LDADD = -lm ${PCRE2_LIBS} ${ZLIB_LIBS} ${MHASH_LIBS} ${GCRYPT_LIBS} ${POSIX_ACL_LIBS} ${SELINUX_LIBS} ${AUDIT_LIBS} ${XATTR_LIBS} ${ELF_LIBS} ${E2FSATTRS_LIBS} ${CAPABILITIES_LIBS} ${CURL_LIBS} ${PTHREAD_LIBS} -+aide_LDADD = -lm ${LDFLAGS} ${PCRE2_LIBS} ${ZLIB_LIBS} ${MHASH_LIBS} ${GCRYPT_LIBS} ${POSIX_ACL_LIBS} ${SELINUX_LIBS} ${AUDIT_LIBS} ${XATTR_LIBS} ${ELF_LIBS} ${E2FSATTRS_LIBS} ${CAPABILITIES_LIBS} ${CURL_LIBS} ${PTHREAD_LIBS} - - if HAVE_CHECK - TESTS = check_aide +diff -Ppru aide-0.18.8.orig/Makefile.am aide-0.18.8/Makefile.am +--- aide-0.18.8.orig/Makefile.am 2024-05-04 11:51:05.000000000 +0200 ++++ aide-0.18.8/Makefile.am 2024-08-11 16:07:45.957348909 +0200 +@@ -79,6 +79,7 @@ aide_CFLAGS = @AIDE_DEFS@ -W -Wall -g \ + ${XATTR_CFLAGS} \ + ${ZLIB_CFLAGS} + aide_LDADD = -lm \ ++ ${LDFLAGS} \ + ${AUDIT_LIBS} \ + ${CAPABILITIES_LIBS} \ + ${CURL_LIBS} \ ++++++ aide-0.18.6.tar.gz -> aide-0.18.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.6/ChangeLog new/aide-0.18.8/ChangeLog --- old/aide-0.18.6/ChangeLog 2023-08-01 10:47:46.000000000 +0200 +++ new/aide-0.18.8/ChangeLog 2024-05-09 12:44:31.000000000 +0200 @@ -1,3 +1,28 @@ +2024-05-09 Hannes von Haugwitz <hannes(a)vonhaugwitz.com> + * Release aide 0.18.8 + +2024-05-08 Hannes von Haugwitz <hannes(a)vonhaugwitz.com> + * Fix concurrent reading of extended attributes (xattrs) + +2024-05-05 Hannes von Haugwitz <hannes(a)vonhaugwitz.com> + * Raise warning if both input databases are the same + +2024-05-04 Hannes von Haugwitz <hannes(a)vonhaugwitz.com> + * Release aide 0.18.7 + +2024-04-27 Hannes von Haugwitz <hannes(a)vonhaugwitz.com> + * Add missing library CFLAGS + +2024-04-20 Hannes von Haugwitz <hannes(a)vonhaugwitz.com> + * Fix 64-bit time_t on 32-bit architectures + * Fix typo in aide.conf manual page (closes: #165) + +2024-01-17 Hannes von Haugwitz <hannes(a)vonhaugwitz.com> + * Fix debug logging for returned attributes + +2023-11-17 Mingjie Shen <shen497(a)purdue.edu> + * Fix condition for error message of failing to open gzipped files + 2023-08-01 Hannes von Haugwitz <hannes(a)vonhaugwitz.com> * Release aide 0.18.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.6/Makefile.am new/aide-0.18.8/Makefile.am --- old/aide-0.18.6/Makefile.am 2023-04-01 18:25:38.000000000 +0200 +++ new/aide-0.18.8/Makefile.am 2024-05-04 11:51:05.000000000 +0200 @@ -64,8 +64,34 @@ aide_SOURCES += include/fopen.h src/fopen.c endif -aide_CFLAGS = @AIDE_DEFS@ -W -Wall -g ${PTHREAD_CFLAGS} -aide_LDADD = -lm ${PCRE2_LIBS} ${ZLIB_LIBS} ${MHASH_LIBS} ${GCRYPT_LIBS} ${POSIX_ACL_LIBS} ${SELINUX_LIBS} ${AUDIT_LIBS} ${XATTR_LIBS} ${ELF_LIBS} ${E2FSATTRS_LIBS} ${CAPABILITIES_LIBS} ${CURL_LIBS} ${PTHREAD_LIBS} +aide_CFLAGS = @AIDE_DEFS@ -W -Wall -g \ + ${AUDIT_CFLAGS} \ + ${CAPABILITIES_CFLAGS} \ + ${CURL_CFLAGS} \ + ${E2FSATTRS_CFLAGS} \ + ${ELF_CFLAGS} \ + ${GCRYPT_CFLAGS} \ + ${MHASH_CFLAGS} \ + ${PCRE2_CFLAGS} \ + ${POSIX_ACL_CFLAGS} \ + ${PTHREAD_CFLAGS} \ + ${SELINUX_CFLAGS} \ + ${XATTR_CFLAGS} \ + ${ZLIB_CFLAGS} +aide_LDADD = -lm \ + ${AUDIT_LIBS} \ + ${CAPABILITIES_LIBS} \ + ${CURL_LIBS} \ + ${E2FSATTRS_LIBS} \ + ${ELF_LIBS} \ + ${GCRYPT_LIBS} \ + ${MHASH_LIBS} \ + ${PCRE2_LIBS} \ + ${POSIX_ACL_LIBS} \ + ${PTHREAD_LIBS} \ + ${SELINUX_LIBS} \ + ${XATTR_LIBS} \ + ${ZLIB_LIBS} if HAVE_CHECK TESTS = check_aide @@ -73,8 +99,16 @@ check_aide_SOURCES = tests/check_aide.c tests/check_aide.h \ tests/check_attributes.c src/attributes.c \ src/log.c src/util.c -check_aide_CFLAGS = -I$(top_srcdir)/include $(CHECK_CFLAGS) -check_aide_LDADD = -lm ${PCRE2_LIBS} ${MHASH_LIBS} ${GCRYPT_LIBS} $(CHECK_LIBS) +check_aide_CFLAGS = -I$(top_srcdir)/include \ + $(CHECK_CFLAGS) \ + ${GCRYPT_CFLAGS} \ + ${MHASH_CFLAGS} \ + ${PCRE2_CFLAGS} +check_aide_LDADD = -lm \ + $(CHECK_LIBS) \ + ${GCRYPT_LIBS} \ + ${MHASH_LIBS} \ + ${PCRE2_LIBS} endif # HAVE_CHECK AM_CFLAGS = @AIDE_DEFS@ -W -Wall -g diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.6/Makefile.in new/aide-0.18.8/Makefile.in --- old/aide-0.18.6/Makefile.in 2023-08-01 10:48:11.000000000 +0200 +++ new/aide-0.18.8/Makefile.in 2024-05-09 12:44:47.000000000 +0200 @@ -529,14 +529,52 @@ include/symboltable.h src/symboltable.c include/url.h \ src/url.c include/util.h src/util.c $(am__append_1) \ $(am__append_2) -aide_CFLAGS = @AIDE_DEFS@ -W -Wall -g ${PTHREAD_CFLAGS} -aide_LDADD = -lm ${PCRE2_LIBS} ${ZLIB_LIBS} ${MHASH_LIBS} ${GCRYPT_LIBS} ${POSIX_ACL_LIBS} ${SELINUX_LIBS} ${AUDIT_LIBS} ${XATTR_LIBS} ${ELF_LIBS} ${E2FSATTRS_LIBS} ${CAPABILITIES_LIBS} ${CURL_LIBS} ${PTHREAD_LIBS} +aide_CFLAGS = @AIDE_DEFS@ -W -Wall -g \ + ${AUDIT_CFLAGS} \ + ${CAPABILITIES_CFLAGS} \ + ${CURL_CFLAGS} \ + ${E2FSATTRS_CFLAGS} \ + ${ELF_CFLAGS} \ + ${GCRYPT_CFLAGS} \ + ${MHASH_CFLAGS} \ + ${PCRE2_CFLAGS} \ + ${POSIX_ACL_CFLAGS} \ + ${PTHREAD_CFLAGS} \ + ${SELINUX_CFLAGS} \ + ${XATTR_CFLAGS} \ + ${ZLIB_CFLAGS} + +aide_LDADD = -lm \ + ${AUDIT_LIBS} \ + ${CAPABILITIES_LIBS} \ + ${CURL_LIBS} \ + ${E2FSATTRS_LIBS} \ + ${ELF_LIBS} \ + ${GCRYPT_LIBS} \ + ${MHASH_LIBS} \ + ${PCRE2_LIBS} \ + ${POSIX_ACL_LIBS} \ + ${PTHREAD_LIBS} \ + ${SELINUX_LIBS} \ + ${XATTR_LIBS} \ + ${ZLIB_LIBS} + @HAVE_CHECK_TRUE@check_aide_SOURCES = tests/check_aide.c tests/check_aide.h \ @HAVE_CHECK_TRUE@ tests/check_attributes.c src/attributes.c \ @HAVE_CHECK_TRUE@ src/log.c src/util.c -@HAVE_CHECK_TRUE@check_aide_CFLAGS = -I$(top_srcdir)/include $(CHECK_CFLAGS) -@HAVE_CHECK_TRUE@check_aide_LDADD = -lm ${PCRE2_LIBS} ${MHASH_LIBS} ${GCRYPT_LIBS} $(CHECK_LIBS) +@HAVE_CHECK_TRUE@check_aide_CFLAGS = -I$(top_srcdir)/include \ +@HAVE_CHECK_TRUE@ $(CHECK_CFLAGS) \ +@HAVE_CHECK_TRUE@ ${GCRYPT_CFLAGS} \ +@HAVE_CHECK_TRUE@ ${MHASH_CFLAGS} \ +@HAVE_CHECK_TRUE@ ${PCRE2_CFLAGS} + +@HAVE_CHECK_TRUE@check_aide_LDADD = -lm \ +@HAVE_CHECK_TRUE@ $(CHECK_LIBS) \ +@HAVE_CHECK_TRUE@ ${GCRYPT_LIBS} \ +@HAVE_CHECK_TRUE@ ${MHASH_LIBS} \ +@HAVE_CHECK_TRUE@ ${PCRE2_LIBS} + AM_CFLAGS = @AIDE_DEFS@ -W -Wall -g AM_CPPFLAGS = -I$(top_srcdir) \ -I$(top_srcdir)/include \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.6/NEWS new/aide-0.18.8/NEWS --- old/aide-0.18.6/NEWS 2023-08-01 10:47:59.000000000 +0200 +++ new/aide-0.18.8/NEWS 2024-05-09 12:44:34.000000000 +0200 @@ -1,3 +1,14 @@ +Version 0.18.8 (2024-05-09) + * Fix concurrent reading of extended attributes (xattrs) + * Raise warning if both input databases are the same + +Version 0.18.7 (2024-05-04) + * Add missing library CFLAGS + * Fix typo in aide.conf manual page + * Fix 64-bit time_t on 32-bit architectures + * Fix debug logging for returned attributes + * Fix condition for error message of failing to open gzipped files + Version 0.18.6 (2023-08-01) * Update GPG key in SECURITY.md * Fix double free() during report generation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.6/README new/aide-0.18.8/README --- old/aide-0.18.6/README 2023-08-01 10:47:59.000000000 +0200 +++ new/aide-0.18.8/README 2024-05-09 12:44:34.000000000 +0200 @@ -1,7 +1,7 @@ AIDE - Advanced Intrusion Detection Environment ------------------------------------------------- - Version 0.18.6 + Version 0.18.8 This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.6/configure new/aide-0.18.8/configure --- old/aide-0.18.6/configure 2023-08-01 10:48:10.000000000 +0200 +++ new/aide-0.18.8/configure 2024-05-09 12:44:46.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for aide 0.18.6. +# Generated by GNU Autoconf 2.71 for aide 0.18.8. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -608,8 +608,8 @@ # Identity of this package. PACKAGE_NAME='aide' PACKAGE_TARNAME='aide' -PACKAGE_VERSION='0.18.6' -PACKAGE_STRING='aide 0.18.6' +PACKAGE_VERSION='0.18.8' +PACKAGE_STRING='aide 0.18.8' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1430,7 +1430,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures aide 0.18.6 to adapt to many kinds of systems. +\`configure' configures aide 0.18.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1502,7 +1502,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of aide 0.18.6:";; + short | recursive ) echo "Configuration of aide 0.18.8:";; esac cat <<\_ACEOF @@ -1674,7 +1674,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -aide configure 0.18.6 +aide configure 0.18.8 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2219,7 +2219,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by aide $as_me 0.18.6, which was +It was created by aide $as_me 0.18.8, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3603,7 +3603,7 @@ # Define the identity of the package. PACKAGE='aide' - VERSION='0.18.6' + VERSION='0.18.8' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -3707,7 +3707,7 @@ fi -printf "%s\n" "#define AIDEVERSION \"0.18.6\"" >>confdefs.h +printf "%s\n" "#define AIDEVERSION \"0.18.8\"" >>confdefs.h @@ -11300,7 +11300,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by aide $as_me 0.18.6, which was +This file was extended by aide $as_me 0.18.8, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11368,7 +11368,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -aide config.status 0.18.6 +aide config.status 0.18.8 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.6/doc/aide.1 new/aide-0.18.8/doc/aide.1 --- old/aide-0.18.6/doc/aide.1 2023-08-01 10:47:59.000000000 +0200 +++ new/aide-0.18.8/doc/aide.1 2024-05-09 12:44:34.000000000 +0200 @@ -1,4 +1,4 @@ -.TH AIDE 1 "2023-08-01" "aide v0.18.6" "User Commands" +.TH AIDE 1 "2024-05-09" "aide v0.18.8" "User Commands" .SH NAME \fBaide\fP \- Advanced Intrusion Detection Environment .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.6/doc/aide.conf.5 new/aide-0.18.8/doc/aide.conf.5 --- old/aide-0.18.6/doc/aide.conf.5 2023-08-01 10:47:59.000000000 +0200 +++ new/aide-0.18.8/doc/aide.conf.5 2024-05-09 12:44:34.000000000 +0200 @@ -1,4 +1,4 @@ -.TH AIDE.CONF 5 "2023-08-01" "aide v0.18.6" "AIDE" +.TH AIDE.CONF 5 "2024-05-09" "aide v0.18.8" "AIDE" .SH NAME aide.conf - The configuration file for Advanced Intrusion Detection Environment @@ -1011,7 +1011,7 @@ .TP .B "\fBRotLog\fR=Full" .TQ -.B "/var/log/foo\e\e.log\e\e.1$ f RogLog" +.B "/var/log/foo\e\e.log\e\e.1$ f RotLog" foo.log.0 or foo.log.1 is called the Rotated Log, the previously active log renamed to the first name of the Log Series that is formed by the rotation mechanism. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.6/src/aide.c new/aide-0.18.8/src/aide.c --- old/aide-0.18.6/src/aide.c 2023-06-13 20:52:39.000000000 +0200 +++ new/aide-0.18.8/src/aide.c 2024-05-09 09:01:56.000000000 +0200 @@ -674,16 +674,15 @@ "when doing database update")); exit(INVALID_ARGUMENT_ERROR); } - if(conf->action&DO_DIFF){ - log_msg(LOG_LEVEL_ERROR,_("both input databases cannot be the same " - "when doing database compare")); - exit(INVALID_ARGUMENT_ERROR); - } }; - if((conf->action&DO_DIFF)&&(!(conf->database_new.url)||!(conf->database_in.url))){ - log_msg(LOG_LEVEL_ERROR,_("must have both input databases defined for " - "database compare")); - exit(INVALID_ARGUMENT_ERROR); + if(conf->action&DO_DIFF) { + if(!(conf->database_new.url)||!(conf->database_in.url)) { + log_msg(LOG_LEVEL_ERROR,_("must have both input databases defined for database compare")); + exit(INVALID_ARGUMENT_ERROR); + } + if(conf->database_in.url && conf->database_new.url && cmpurl(conf->database_in.url,conf->database_new.url)==RETOK){ + log_msg(LOG_LEVEL_WARNING,_("both input databases for database compare are the same")); + } } /* ensure size attribute is added to db_out_attrs if sizeg or growing attribute is set */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.6/src/be.c new/aide-0.18.8/src/be.c --- old/aide-0.18.6/src/be.c 2023-04-01 18:25:38.000000000 +0200 +++ new/aide-0.18.8/src/be.c 2024-05-04 08:24:55.000000000 +0200 @@ -160,7 +160,7 @@ #ifdef WITH_ZLIB if(iszipped && !readonly){ gzFile gzfh = gzdopen(a,"w"); - if(fh==NULL){ + if(gzfh==NULL){ log_msg(LOG_LEVEL_ERROR,"couldn't reopen file descriptor %li",a); } return gzfh; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.6/src/db_file.c new/aide-0.18.8/src/db_file.c --- old/aide-0.18.6/src/db_file.c 2023-04-01 18:25:38.000000000 +0200 +++ new/aide-0.18.8/src/db_file.c 2024-05-04 08:34:31.000000000 +0200 @@ -444,7 +444,7 @@ memset((void*)ptr,0,len); - snprintf(ptr, len, "%li",i); + snprintf(ptr, len, "%llu", (unsigned long long) i); tmpstr=encode_base64((byte *)ptr,strlen(ptr)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.6/src/do_md.c new/aide-0.18.8/src/do_md.c --- old/aide-0.18.6/src/do_md.c 2023-07-30 20:32:13.000000000 +0200 +++ new/aide-0.18.8/src/do_md.c 2024-05-09 09:05:13.000000000 +0200 @@ -482,14 +482,13 @@ void xattrs2line(db_line *line) { /* get all generic user xattrs. */ xattrs_type *xattrs = NULL; - static ssize_t xsz = 1024; - static char *xatrs = NULL; ssize_t xret = -1; if (!(ATTR(attr_xattrs)&line->attr)) return; - if (!xatrs) xatrs = checked_malloc(xsz); + ssize_t xsz = 1024; + char *xatrs = xatrs = checked_malloc(xsz); while (((xret = llistxattr(line->fullpath, xatrs, xsz)) == -1) && (errno == ERANGE)) { xsz <<= 1; @@ -502,10 +501,8 @@ log_msg(LOG_LEVEL_WARNING, "listxattrs failed for %s:%s", line->fullpath, strerror(errno)); } else if (xret) { const char *attr = xatrs; - static ssize_t asz = 1024; - static char *val = NULL; - - if (!val) val = checked_malloc(asz); + ssize_t asz = 1024; + char *val = checked_malloc(asz); xattrs = xattr_new(); @@ -533,7 +530,9 @@ attr += len + 1; xret -= len + 1; } + free(val); } + free(xatrs); line->xattrs = xattrs; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.6/src/gen_list.c new/aide-0.18.8/src/gen_list.c --- old/aide-0.18.6/src/gen_list.c 2023-05-16 20:28:44.000000000 +0200 +++ new/aide-0.18.8/src/gen_list.c 2024-05-04 08:29:23.000000000 +0200 @@ -796,13 +796,14 @@ */ no_hash(line); } - - log_msg(LOG_LEVEL_DEBUG, "%s> returned attributes: %llu (%s)", filename, line->attr, str = diff_attributes(0, line->attr)); + /* attr_filename is always needed/returned but never requested */ + DB_ATTR_TYPE returned_attr = (~ATTR(attr_filename)&line->attr); + log_msg(LOG_LEVEL_DEBUG, "%s> returned attributes: %llu (%s)", filename, returned_attr, str = diff_attributes(0, returned_attr)); free(str); - if (~attr|line->attr) { - log_msg(LOG_LEVEL_DEBUG, "%s> requested and returned attributes are not equal: %s", filename, str = diff_attributes(attr, line->attr)); - free(str); - } + if (returned_attr^attr) { + log_msg(LOG_LEVEL_DEBUG, "%s> requested (%llu) and returned (%llu) attributes are not equal: %s", filename, attr, returned_attr, str = diff_attributes(attr, returned_attr)); + free(str); + } return line; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aide-0.18.6/version.m4 new/aide-0.18.8/version.m4 --- old/aide-0.18.6/version.m4 2023-08-01 10:48:07.000000000 +0200 +++ new/aide-0.18.8/version.m4 2024-05-09 12:44:43.000000000 +0200 @@ -1 +1 @@ -m4_define([AIDE_VERSION], [0.18.6]) +m4_define([AIDE_VERSION], [0.18.8])

1 0

commit postfix-image for openSUSE:Factory
by Source-Sync 16 Aug '24

16 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package postfix-image for openSUSE:Factory checked in at 2024-08-16 12:23:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postfix-image (Old) and /work/SRC/openSUSE:Factory/.postfix-image.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postfix-image" Fri Aug 16 12:23:58 2024 rev:8 rq:1194148 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/postfix-image/postfix-image.changes 2024-08-15 09:58:23.599141000 +0200 +++ /work/SRC/openSUSE:Factory/.postfix-image.new.2698/postfix-image.changes 2024-08-16 12:24:31.581217393 +0200 @@ -1,0 +2,5 @@ +Thu Aug 15 14:39:01 UTC 2024 - Priyanka Saggu <priyanka.saggu(a)suse.com> + +- resync entrypoint scripts from upstream + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Dockerfile ++++++ --- /var/tmp/diff_new_pack.PFJf7F/_old 2024-08-16 12:24:32.341248979 +0200 +++ /var/tmp/diff_new_pack.PFJf7F/_new 2024-08-16 12:24:32.345249145 +0200 @@ -40,7 +40,7 @@ # endlabelprefix LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/…" ENTRYPOINT ["/entrypoint/entrypoint.sh"] -CMD ["postfix", "start"] +CMD ["postfix", "start-fg"] EXPOSE 25 465 587 RUN set -euo pipefail; mkdir -p /entrypoint/ldap COPY entrypoint.sh /entrypoint/entrypoint.sh ++++++ entrypoint.sh ++++++ --- /var/tmp/diff_new_pack.PFJf7F/_old 2024-08-16 12:24:32.397251306 +0200 +++ /var/tmp/diff_new_pack.PFJf7F/_new 2024-08-16 12:24:32.401251473 +0200 @@ -166,7 +166,6 @@ echo "Enable submission port" echo "submission inet n - n - - smtpd" >> /etc/postfix/master.cf - echo " -o syslog_name=postfix/submission" >> /etc/postfix/master.cf if [ "${SMTPD_USE_TLS}" -eq "1" ]; then echo " -o smtpd_tls_security_level=encrypt" >> /etc/postfix/master.cf @@ -180,7 +179,6 @@ echo "Enable submissions port" echo "smtps inet n - n - - smtpd" >> /etc/postfix/master.cf - echo " -o syslog_name=postfix/smtps" >> /etc/postfix/master.cf echo " -o smtpd_tls_wrappermode=yes" >> /etc/postfix/master.cf echo " -o smtpd_sasl_auth_enable=no" >> /etc/postfix/master.cf else @@ -194,7 +192,9 @@ SMTPD_TLS_CRT=${SMTPD_TLS_CRT:-"/etc/postfix/ssl/certs/tls.crt"} SMTPD_TLS_KEY=${SMTPD_TLS_KEY:-"/etc/postfix/ssl/certs/tls.key"} + # smtpd_use_tls is deprecated and only for compatibility set_config_value "smtpd_use_tls" "yes" + set_config_value "smtpd_tls_security_level" "may" set_config_value "smtpd_tls_CApath" "/etc/ssl/certs" set_config_value "smtpd_tls_cert_file" "${SMTPD_TLS_CRT}" set_config_value "smtpd_tls_key_file" "${SMTPD_TLS_KEY}" @@ -350,6 +350,10 @@ update_db "${i}" done set_config_value "smtpd_sender_restrictions" "lmdb:/etc/postfix/access" + + # Log to stdout + set_config_value "maillog_file" "/dev/stdout" + # Generate and update maps update_db access relay relay_recipients @@ -397,7 +401,6 @@ ) > /dev/null 2>&1 & postfix stop - terminate /usr/sbin/syslogd } stop_daemons() { @@ -405,26 +408,13 @@ stop_spamassassin } -start_daemons() { - # Don't start syslogd in background while starting it in the background... - # Logging to stdout does not work else. - /usr/sbin/syslogd -n -S -O - & - if [ -n "${SPAMASSASSIN_HOST}" ]; then - mkdir /run/spamass-milter - chown sa-milter:postfix /run/spamass-milter - chmod 751 /run/spamass-milter - su sa-milter -s /bin/sh -c "/usr/sbin/spamass-milter -p /run/spamass-milter/socket -g postfix -f -- -d ${SPAMASSASSIN_HOST}" - fi - "$@" -} - # # Main # # if command starts with an option, prepend postfix if [ "${1:0:1}" = '-' ]; then - set -- postfix start "$@" + set -- postfix start-fg "$@" fi init_trap @@ -441,10 +431,12 @@ rm -f /var/spool/postfix/pid/master.pid if [ "$1" = 'postfix' ]; then - start_daemons "$@" - echo "postfix running and ready" - sleep infinity & wait $! -else - exec "$@" + if [ -n "${SPAMASSASSIN_HOST}" ]; then + mkdir /run/spamass-milter + chown sa-milter:postfix /run/spamass-milter + chmod 751 /run/spamass-milter + su sa-milter -s /bin/sh -c "/usr/sbin/spamass-milter -p /run/spamass-milter/socket -g postfix -f -- -d ${SPAMASSASSIN_HOST}" + fi fi +exec "$@" ++++++ entrypoint.sles.sh ++++++ --- /var/tmp/diff_new_pack.PFJf7F/_old 2024-08-16 12:24:32.421252304 +0200 +++ /var/tmp/diff_new_pack.PFJf7F/_new 2024-08-16 12:24:32.425252470 +0200 @@ -166,7 +166,6 @@ echo "Enable submission port" echo "submission inet n - n - - smtpd" >> /etc/postfix/master.cf - echo " -o syslog_name=postfix/submission" >> /etc/postfix/master.cf if [ "${SMTPD_USE_TLS}" -eq "1" ]; then echo " -o smtpd_tls_security_level=encrypt" >> /etc/postfix/master.cf @@ -180,7 +179,6 @@ echo "Enable submissions port" echo "smtps inet n - n - - smtpd" >> /etc/postfix/master.cf - echo " -o syslog_name=postfix/smtps" >> /etc/postfix/master.cf echo " -o smtpd_tls_wrappermode=yes" >> /etc/postfix/master.cf echo " -o smtpd_sasl_auth_enable=no" >> /etc/postfix/master.cf else @@ -194,7 +192,9 @@ SMTPD_TLS_CRT=${SMTPD_TLS_CRT:-"/etc/postfix/ssl/certs/tls.crt"} SMTPD_TLS_KEY=${SMTPD_TLS_KEY:-"/etc/postfix/ssl/certs/tls.key"} + # smtpd_use_tls is deprecated and only for compatibility set_config_value "smtpd_use_tls" "yes" + set_config_value "smtpd_tls_security_level" "may" set_config_value "smtpd_tls_CApath" "/etc/ssl/certs" set_config_value "smtpd_tls_cert_file" "${SMTPD_TLS_CRT}" set_config_value "smtpd_tls_key_file" "${SMTPD_TLS_KEY}" @@ -350,6 +350,10 @@ update_db "${i}" done set_config_value "smtpd_sender_restrictions" "lmdb:/etc/postfix/access" + + # Log to stdout + set_config_value "maillog_file" "/dev/stdout" + # Generate and update maps update_db access relay relay_recipients @@ -382,37 +386,24 @@ ( while ! (ps -aux | grep qmgr | grep -v grep | awk '{print $2}' | tr '\n' ' ') > /dev/null 2>&1; do ((ms-- <= 0)) && break usleep 10000 - done - exec postfix flush - ) > /dev/null 2>&1 & + done + exec postfix flush + ) > /dev/null 2>&1 & postfix stop - terminate /usr/sbin/rsyslogd } stop_daemons() { stop_postfix "$@" } -start_daemons() { - # Don't start syslogd in background while starting it in the background... - # Logging to stdout does not work else. - echo '# rsyslog configuration file to log to stdout - module(load="imuxsock") # provides support for local system logging (e.g. via logger command) - - *.* action(type="omfile" file="/var/log/rsyslog.log")' > /entrypoint/rsyslog-stdout.conf - /usr/sbin/rsyslogd -f /entrypoint/rsyslog-stdout.conf -i /var/run/rsyslogd-stdout.pid - - "$@" -} - # # Main # # if command starts with an option, prepend postfix if [ "${1:0:1}" = '-' ]; then - set -- postfix start "$@" + set -- postfix start-fg "$@" fi init_trap @@ -427,12 +418,6 @@ # before starting services rm -f /var/spool/postfix/pid/master.pid -if [ "$1" = 'postfix' ]; then - start_daemons "$@" - echo "postfix running and ready" - echo "[info] refer to postfix manual pages at https://www.postfix.org/postfix-manuals.html" - sleep infinity & wait $! -else - exec "$@" -fi +echo "[info] refer to postfix manual pages at https://www.postfix.org/postfix-manuals.html" +exec "$@"

1 0

commit phraze for openSUSE:Factory
by Source-Sync 16 Aug '24

16 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package phraze for openSUSE:Factory checked in at 2024-08-16 12:23:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phraze (Old) and /work/SRC/openSUSE:Factory/.phraze.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phraze" Fri Aug 16 12:23:56 2024 rev:4 rq:1194137 version:0.3.14 Changes: -------- --- /work/SRC/openSUSE:Factory/phraze/phraze.changes 2024-07-31 14:41:49.174940150 +0200 +++ /work/SRC/openSUSE:Factory/.phraze.new.2698/phraze.changes 2024-08-16 12:24:30.361166689 +0200 @@ -1,0 +2,9 @@ +Thu Aug 15 08:56:25 UTC 2024 - felix.niederwanger(a)suse.de + +- Update to version 0.3.14: + * update CHANGELOG + * bumps phraze version + * upgrades calp dependency + * updates CHANGLEOG + +------------------------------------------------------------------- Old: ---- phraze-0.3.13.obscpio New: ---- phraze-0.3.14.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phraze.spec ++++++ --- /var/tmp/diff_new_pack.OS3vv7/_old 2024-08-16 12:24:31.261204093 +0200 +++ /var/tmp/diff_new_pack.OS3vv7/_new 2024-08-16 12:24:31.265204259 +0200 @@ -17,7 +17,7 @@ Name: phraze -Version: 0.3.13 +Version: 0.3.14 Release: 0 Summary: Generate random passphrases License: MPL-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.OS3vv7/_old 2024-08-16 12:24:31.301205756 +0200 +++ /var/tmp/diff_new_pack.OS3vv7/_new 2024-08-16 12:24:31.301205756 +0200 @@ -2,7 +2,7 @@ <service mode="disabled" name="obs_scm"> <param name="url">https://github.com/sts10/phraze.git</param> <param name="scm">git</param> - <param name="revision">v0.3.13</param> + <param name="revision">v0.3.14</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">.*v(\d+\.\d+\.\d+)</param> <param name="versionrewrite-replacement">\1</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.OS3vv7/_old 2024-08-16 12:24:31.325206754 +0200 +++ /var/tmp/diff_new_pack.OS3vv7/_new 2024-08-16 12:24:31.329206919 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/sts10/phraze.git</param> - <param name="changesrevision">f24031b6e4e2268a6f842fca1a2e99bdc2ea70bd</param></service></servicedata> + <param name="changesrevision">1528e20dea28e2e393cc12370b2b4d97bb4983c5</param></service></servicedata> (No newline at EOF) ++++++ phraze-0.3.13.obscpio -> phraze-0.3.14.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phraze-0.3.13/CHANGELOG.markdown new/phraze-0.3.14/CHANGELOG.markdown --- old/phraze-0.3.13/CHANGELOG.markdown 2024-07-30 17:57:24.000000000 +0200 +++ new/phraze-0.3.14/CHANGELOG.markdown 2024-08-03 05:31:03.000000000 +0200 @@ -1,3 +1,12 @@ +# v0.3.14 + +* Upgrade clap dependency to version 4.5.13. + +# v0.3.13 + +* Add man pages and shell completions (#27), thanks to @donovanglover. +* Updates version of cargo-dist + # v0.3.12 * Adds installation instructions for NixOS/nix (#25). Thanks for @x123! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phraze-0.3.13/Cargo.lock new/phraze-0.3.14/Cargo.lock --- old/phraze-0.3.13/Cargo.lock 2024-07-30 17:57:24.000000000 +0200 +++ new/phraze-0.3.14/Cargo.lock 2024-08-03 05:31:03.000000000 +0200 @@ -125,9 +125,9 @@ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" dependencies = [ "clap_builder", "clap_derive", @@ -135,9 +135,9 @@ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" dependencies = [ "anstream", "anstyle", @@ -156,9 +156,9 @@ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck", "proc-macro2", @@ -418,7 +418,7 @@ [[package]] name = "phraze" -version = "0.3.13" +version = "0.3.14" dependencies = [ "clap", "clap_complete", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phraze-0.3.13/Cargo.toml new/phraze-0.3.14/Cargo.toml --- old/phraze-0.3.13/Cargo.toml 2024-07-30 17:57:24.000000000 +0200 +++ new/phraze-0.3.14/Cargo.toml 2024-08-03 05:31:03.000000000 +0200 @@ -1,7 +1,7 @@ [package] name = "phraze" description = "Random passphrase generator" -version = "0.3.13" +version = "0.3.14" edition = "2021" authors = ["sts10 <sschlinkert(a)gmail.com>"] license = "MPL-2.0" @@ -12,7 +12,7 @@ [dependencies] rand = "0.8.5" -clap = { version = "4.5.4", features = ["derive"] } +clap = { version = "4.5.13", features = ["derive"] } unicode-normalization = "0.1.23" include-lines = "1.1.2" ++++++ phraze.obsinfo ++++++ --- /var/tmp/diff_new_pack.OS3vv7/_old 2024-08-16 12:24:31.457212240 +0200 +++ /var/tmp/diff_new_pack.OS3vv7/_new 2024-08-16 12:24:31.461212405 +0200 @@ -1,5 +1,5 @@ name: phraze -version: 0.3.13 -mtime: 1722355044 -commit: f24031b6e4e2268a6f842fca1a2e99bdc2ea70bd +version: 0.3.14 +mtime: 1722655863 +commit: 1528e20dea28e2e393cc12370b2b4d97bb4983c5 ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/phraze/vendor.tar.xz /work/SRC/openSUSE:Factory/.phraze.new.2698/vendor.tar.xz differ: char 15, line 1

1 0

commit deepin-system-monitor for openSUSE:Factory
by Source-Sync 16 Aug '24

16 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-system-monitor for openSUSE:Factory checked in at 2024-08-16 12:23:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old) and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deepin-system-monitor" Fri Aug 16 12:23:54 2024 rev:20 rq:1194141 version:5.8.27 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes 2024-05-31 22:21:13.097640287 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.2698/deepin-system-monitor.changes 2024-08-16 12:24:29.601135103 +0200 @@ -1,0 +2,5 @@ +Thu Aug 15 13:16:03 UTC 2024 - Hillwood Yang <hillwood(a)opensuse.org> + +- Add fix-procps-link.patch, backport support for procps 4.0 + +------------------------------------------------------------------- New: ---- fix-procps-link.patch BETA DEBUG BEGIN: New: - Add fix-procps-link.patch, backport support for procps 4.0 BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-system-monitor.spec ++++++ --- /var/tmp/diff_new_pack.gyUJNX/_old 2024-08-16 12:24:30.185159374 +0200 +++ /var/tmp/diff_new_pack.gyUJNX/_new 2024-08-16 12:24:30.185159374 +0200 @@ -38,6 +38,10 @@ Patch0: fix-return-type-errors.patch # PATCH-FIX-UPSTREAN fix-c++17.patch hillwood(a)opensuse.org - ICU 75 needs c++17 Patch1: fix-c++17.patch +%if 0%{?suse_version} > 1500 +# PATCH-FOR-OPENSUSE fix-procps-link.patch hillwood(a)opensuse.org - Backport support for procps 4.0 +Patch2: fix-procps-link.patch +%endif %ifarch ppc ppc64 ppc64le s390 s390x BuildRequires: deepin-desktop-base %else ++++++ fix-procps-link.patch ++++++ diff -Nur deepin-system-monitor-5.8.27/src/CMakeLists.txt deepin-system-monitor-5.8.27-new/src/CMakeLists.txt --- deepin-system-monitor-5.8.27/src/CMakeLists.txt 2022-05-31 14:13:04.000000000 +0800 +++ deepin-system-monitor-5.8.27-new/src/CMakeLists.txt 2024-08-15 21:12:32.547955768 +0800 @@ -26,13 +26,16 @@ find_package(DtkCore REQUIRED) find_package(DtkGui REQUIRED) find_package(DtkWidget REQUIRED) +find_package(PkgConfig REQUIRED) find_library(LIB_PCAP NAMES pcap REQUIRED) -find_library(LIB_PROCPS NAMES procps REQUIRED) +#find_library(LIB_PROCPS NAMES procps REQUIRED) find_library(LIB_XCB NAMES xcb REQUIRED) find_library(LIB_XEXT NAMES Xext REQUIRED) find_library(LIB_ICCCM NAMES xcb-icccm REQUIRED) find_package(ICU COMPONENTS i18n uc REQUIRED) +pkg_check_modules(PROCPS REQUIRED IMPORTED_TARGET libproc2) + pkg_search_module(LIB_NL3 REQUIRED libnl-3.0) pkg_search_module(LIB_NL3_ROUTE REQUIRED libnl-route-3.0) pkg_search_module(LIB_UDEV REQUIRED libudev) @@ -537,7 +540,7 @@ dtkwidget dtkgui ${LIB_PCAP} - ${LIB_PROCPS} + PkgConfig::PROCPS ICU::i18n ICU::uc ${LIB_XCB}

1 0

commit deepin-movie for openSUSE:Factory
by Source-Sync 16 Aug '24

16 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-movie for openSUSE:Factory checked in at 2024-08-16 12:23:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-movie (Old) and /work/SRC/openSUSE:Factory/.deepin-movie.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deepin-movie" Fri Aug 16 12:23:53 2024 rev:13 rq:1194134 version:6.0.10 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-movie/deepin-movie.changes 2024-07-19 15:28:17.977484844 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-movie.new.2698/deepin-movie.changes 2024-08-16 12:24:28.737099194 +0200 @@ -1,0 +2,7 @@ +Thu Aug 15 12:23:55 UTC 2024 - Hillwood Yang <hillwood(a)opensuse.org> + +- Update version to 6.0.10 + * Fix bugs +- Fix build on Tumbleweed: don't use ffmpeg 7 and later + +------------------------------------------------------------------- Old: ---- deepin-movie-reborn-6.0.8.tar.gz New: ---- deepin-movie-reborn-6.0.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-movie.spec ++++++ --- /var/tmp/diff_new_pack.QWNUyT/_old 2024-08-16 12:24:29.473129783 +0200 +++ /var/tmp/diff_new_pack.QWNUyT/_new 2024-08-16 12:24:29.473129783 +0200 @@ -24,7 +24,7 @@ %define sover 0_1 Name: deepin-movie -Version: 6.0.8 +Version: 6.0.10 Release: 0 Summary: Deepin Video Players License: GPL-3.0-or-later @@ -63,7 +63,7 @@ BuildRequires: pkgconfig(dvdnav) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(gsettings-qt) -BuildRequires: pkgconfig(libavcodec) +BuildRequires: (pkgconfig(libavcodec) with pkgconfig(libavcodec) < 61) BuildRequires: pkgconfig(libffmpegthumbnailer) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse-simple) @@ -84,6 +84,8 @@ %if 0%{?suse_version} <= 1500 BuildRequires: qtdbusextended-devel < 3.1.2 BuildRequires: qtmpris-devel < 3.1.2 +%else +BuildRequires: ffmpeg-6-libavcodec-devel %endif Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ deepin-movie-reborn-6.0.8.tar.gz -> deepin-movie-reborn-6.0.10.tar.gz ++++++ /work/SRC/openSUSE:Factory/deepin-movie/deepin-movie-reborn-6.0.8.tar.gz /work/SRC/openSUSE:Factory/.deepin-movie.new.2698/deepin-movie-reborn-6.0.10.tar.gz differ: char 13, line 1

1 0

commit deepin-music-player for openSUSE:Factory
by Source-Sync 16 Aug '24

16 Aug '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-music-player for openSUSE:Factory checked in at 2024-08-16 12:23:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-music-player (Old) and /work/SRC/openSUSE:Factory/.deepin-music-player.new.2698 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deepin-music-player" Fri Aug 16 12:23:52 2024 rev:35 rq:1194128 version:6.2.18 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-music-player/deepin-music-player.changes 2024-06-03 17:41:48.771373993 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-music-player.new.2698/deepin-music-player.changes 2024-08-16 12:24:27.301039514 +0200 @@ -2 +2 @@ -Fri May 31 13:36:02 UTC 2024 - Hillwood Yang <hillwood(a)opensuse.org> +Thu Aug 15 11:08:51 UTC 2024 - Hillwood Yang <hillwood(a)opensuse.org> @@ -4 +4 @@ -- Add fix-c++17.patch, icu 75 needs c++17 +- Fix build on Tumbleweed: don't use ffmpeg 7 and later ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-music-player.spec ++++++ --- /var/tmp/diff_new_pack.zLQXg6/_old 2024-08-16 12:24:28.333082404 +0200 +++ /var/tmp/diff_new_pack.zLQXg6/_new 2024-08-16 12:24:28.333082404 +0200 @@ -52,6 +52,9 @@ BuildRequires: libqt5-qtsvg-devel BuildRequires: libqt5-qtx11extras-devel BuildRequires: update-desktop-files +BuildRequires: (pkgconfig(libavcodec) with pkgconfig(libavcodec) < 61) +BuildRequires: (pkgconfig(libavformat) with pkgconfig(libavformat) < 61) +BuildRequires: (pkgconfig(libavutil) with pkgconfig(libavutil) < 59) BuildRequires: cmake(KF5Codecs) BuildRequires: cmake(Qt5LinguistTools) BuildRequires: pkgconfig(dbusextended-qt5) @@ -62,9 +65,6 @@ BuildRequires: pkgconfig(gsettings-qt) BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(icu-uc) -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libcue) BuildRequires: pkgconfig(libvlc) BuildRequires: pkgconfig(mpris-qt5) @@ -74,6 +74,8 @@ %if 0%{?suse_version} <= 1500 BuildRequires: qtdbusextended-devel < 3.1.2 BuildRequires: qtmpris-devel < 3.1.2 +%else +BuildRequires: ffmpeg-6-mini-devel %endif Requires: qt5integration Provides: deepin-music

1 0