Accepting request 1316545 from server:monitoring

OBS-URL: https://build.opensuse.org/request/show/1316545
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/conky?expand=0&rev=41

conky-1.13.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f85c96250b501e937b9b5d2ff3f06176e14777c94cec81373bbfc8a619d7a05a
-size 2443276

conky-1.22.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0eec3d4358385fb67b369f02dbd82217c912ba0edc3533f27377ba33f90084c1
+size 2028970

conky.changes

@@ -1,3 +1,84 @@
+-------------------------------------------------------------------
+Wed Oct 29 11:35:47 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Fix shebang in extras/convert.lua: set it to LUA 5.3 and thus use
+  the same lua version as the rest of the package (switched to LUA
+  5.3 in 2019).
+
+-------------------------------------------------------------------
+Tue Jul 22 14:47:58 UTC 2025 - Christoph G <foss@grueninger.de>
+
+- update to 1.22.2
+  * Syntax file installation
+  * Better Wayland build errors
+- update to 1.22.1
+  * MODULE
+  * Add #include to fix building with gcc 15 
+
+-------------------------------------------------------------------
+Mon Mar  3 03:03:03 UTC 2025 - olaf@aepfle.de
+
+- Use gcc13 in SLE15 because because C++17 is used
+
+-------------------------------------------------------------------
+Wed Jan  8 08:48:45 UTC 2025 - Michael Vetter <mvetter@suse.com>
+
+- Update to 1.22.0:
+  Features:
+  * Allow to override build date with SOURCE_DATE_EPOCH #2096
+  * Add support for power_now #2099
+  Bug fixes:
+  * NetBSD: Fix CPU usage and top info. #2101
+  * Fix out_to_wayland giving nothing #2103
+  * Revert "Use private mapping from provided shm_pool buffer" #2104
+  * Fix non-text content using own_window_argb_value #2105
+  * NetBSD: Fix meminfo. #2122
+  * wayland: fix clean_text bug #2127
+
+-------------------------------------------------------------------
+Wed Jan  8 08:47:56 UTC 2025 - Michael Vetter <mvetter@suse.com>
+
+- Update to 1.21.9:
+  Features:
+  * Implement -U for FreeBSD. #2077
+  * OpenBSD: Fill missing fields in get_top_info(). #2093
+  * Implement -U for Haiku. #2079
+  Bug fixes:
+  * lua-imlib2: fix memory leak #2083
+  * Fix OpenBSD build #2080
+  * Fix NetBSD build #2089
+  * OpenBSD: Fix CPU Usage. #2092
+
+-------------------------------------------------------------------
+Wed Jan  8 08:46:21 UTC 2025 - Michael Vetter <mvetter@suse.com>
+
+- Update to 1.21.8:
+  Features:
+  * Implement -U. #2049
+  Bug fixes:
+  * set display to null for race condition #2032
+  * src/fs.{cc,h}: Update fs_stats without error spam. #2033
+  * audacious.cc: print_audacious_filename(): fix always empty $audacious_filename #2038
+  * Fix tcp_ping for non-existent local network hosts #2043
+  * Fix if_match comparison for string operands containing operator symbols (#1988) 
+  * fix: set initial state withdrawn wm hint (fixes #2046) #2056
+
+-------------------------------------------------------------------
+Thu Oct 17 01:27:40 UTC 2024 - Simon Lees <sflees@suse.de>
+
+- Update to 1.21.7
+  * Too many changes in the 8 version bumps to list here
+- Drop
+  * conky.timestamp.patch - included upstream
+  * reproducible.patch - included upstream
+  * html docs
+
+-------------------------------------------------------------------
+Thu Sep 26 12:07:51 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Enable libXNVCtrl only on ix86, x86_64 and aarch64: these are the
+  only architectures where NVidia drivers exist.
+
 -------------------------------------------------------------------
 Thu Oct 12 06:53:54 UTC 2023 - Bernhard Wiedemann <bwiedemann@suse.com>
 

conky.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package conky
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,27 +18,33 @@
 
 %bcond_with    audacious
 %bcond_without cmus
+%ifarch %ix86 x86_64 aarch64
 %bcond_without libXNVCtrl
+%else
+%bcond_with libXNVCtrl
+%endif
 Name:           conky
-Version:        1.13.1
+Version:        1.22.2
 Release:        0
 Summary:        A System Monitor
 License:        GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT
-Group:          System/Monitoring
 URL:            https://github.com/brndnmtthws/conky
 Source:         https://github.com/brndnmtthws/conky/archive/v%{version}.tar.gz#/conky-%{version}.tar.gz
 Source1:        conkyconf.SUSE
 Source2:        conky.conf.SUSE
 Source3:        README.SUSE
 Patch1:         conky-1.10.1-avoid-git.patch
-Patch2:         conky.timestamp.patch
-# PATCH-FIX-UPSTREAM bmwiedemann https://github.com/brndnmtthws/conky/pull/1619
-Patch3:         reproducible.patch
 BuildRequires:  cmake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  docbook2x
 BuildRequires:  freetype2-devel
+%if 0%{?suse_version} < 1600
+BuildRequires:  gcc13
+BuildRequires:  gcc13-c++
+%else
 BuildRequires:  gcc-c++
+%endif
+BuildRequires:  gperf
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libiw-devel
 BuildRequires:  libmicrohttpd-devel
@@ -48,7 +54,10 @@ BuildRequires:  libxslt-tools
 BuildRequires:  lua53-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  ninja
+BuildRequires:  pandoc
 BuildRequires:  pkgconfig
+BuildRequires:  python3-Jinja2
+BuildRequires:  python3-PyYAML
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(cairo-xlib)
@@ -82,12 +91,8 @@ Provides:       conky-feature-nvidia = %{version}
 Obsoletes:      conky-feature-nvidia < %{version}
 %endif
 %if 0%{?is_opensuse}
-%if 0%{?suse_version} >= 1315
 BuildRequires:  libircclient-devel
 BuildRequires:  libtolua++-5_1-devel
-%else
-BuildRequires:  tolua++
-%endif
 %endif
 
 %description
@@ -95,7 +100,7 @@ Conky is an configurable system monitor.
 
 %package doc
 Summary:        Documentation for conky
-Group:          Documentation/HTML
+BuildArch:      noarch
 
 %description doc
 Conky is an configurable system monitor for X.
@@ -104,7 +109,7 @@ This package provides additional documentation about conky.
 
 %package -n vim-plugin-conky
 Summary:        Conky Configuration File Support for Vim
-Group:          Productivity/Text/Editors
+BuildArch:      noarch
 Requires:       vim-base
 Provides:       conky-vim = %{version}
 Obsoletes:      conky-vim < %{version}
@@ -117,7 +122,7 @@ configuration files in vim.
 
 %package -n nano-plugin-conky
 Summary:        Conky Configuration File Support for nano
-Group:          Productivity/Text/Editors
+BuildArch:      noarch
 Provides:       conky-nano = %{version}
 Obsoletes:      conky-nano < %{version}
 
@@ -132,6 +137,8 @@ configuration files in nano.
 %autopatch -p1
 
 %build
+test -x "$(type -p gcc-13)" && export CC="$_"
+test -x "$(type -p g++-13)" && export CXX="$_"
 %cmake -G Ninja \
 	-DBUILD_APCUPSD=ON \
 	-DBUILD_ARGB=ON \
@@ -147,6 +154,7 @@ configuration files in nano.
     -DBUILD_CMUS=OFF \
 %endif
 	-DBUILD_CURL=ON \
+	-DBUILD_DOCS=ON \
 	-DBUILD_EVE=ON \
 	-DBUILD_HDDTEMP=ON \
 	-DBUILD_HTTP=ON \
@@ -192,44 +200,23 @@ configuration files in nano.
 
 %ninja_build
 
-# build doc
-cd ../doc
-# html
-for i in *.xsl ; do
-	FIL=`echo $i | sed "s/\.xsl//"`
-	xsltproc $i ${FIL}.xml > ${FIL}.html
-done
-xsltproc %{_datadir}/xml/docbook/stylesheet/nwalsh/current/html/docbook.xsl docs.xml > docs.html
-
-# manpage
-db2x_xsltproc -s man docs.xml -o docs.mxml
-db2x_manxml --encoding=UTF-8 docs.mxml
-{ echo ".TH CONKY 1 \"August 2005\" \"conky compiled August 2005\" \"User Commands\""; sed 1d < conky.1; } > conky.2
-mv conky.2 conky.1
-gzip conky.1
-
 %install
 %ninja_install -C build
 
-# not doc
+mkdir -p %{buildroot}%{_datadir}/vim/site/ftdetect/conkyrc.vim
-rm -rf %{buildroot}%{_datadir}/doc/%{name}-%{version}
+install -m 644 extras/vim/ftdetect/conkyrc.vim %{buildroot}%{_datadir}/vim/site/ftdetect/conkyrc.vim
-# man
+mkdir -p %dir %{buildroot}%{_datadir}/nano
-mkdir -p %{buildroot}%{_mandir}/man1
+install -m 644 extras/nano/conky.nanorc.j2 %{buildroot}%{_datadir}/nano/conky.nanorc.j2
-install -m 0644 doc/conky.1.gz %{buildroot}%{_mandir}/man1
+
 # config
 mkdir -p %{buildroot}%{_sysconfdir}/conky
 install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/conky/conky.conf
 install -m 755 %{SOURCE1} %{buildroot}%{_bindir}/conkyconf
 cp %{SOURCE3} .
 sed -i "1d" extras/convert.lua
-sed -i "1s/^/#!\/usr\/bin\/lua5.1\\n/" extras/convert.lua
+sed -i "1s/^/#!\/usr\/bin\/lua5.3\\n/" extras/convert.lua
 install -m 0755 extras/convert.lua %{buildroot}%{_sysconfdir}/conky/
 install -m 0644 data/conky_no_x11.conf data/conky.conf %{buildroot}%{_sysconfdir}/conky/
-# vim
-install -D -m0644 extras/vim/ftdetect/conkyrc.vim "%{buildroot}%{_datadir}/vim/site/ftdetect/conkyrc.vim"
-install -D -m0644 extras/vim/syntax/conkyrc.vim   "%{buildroot}%{_datadir}/vim/site/syntax/conkyrc.vim"
-# nano
-install -D -m0644 extras/nano/conky.nanorc "%{buildroot}%{_datadir}/nano/conky.nanorc"
 # clean
 rm -rf %{buildroot}%{_libdir}/conky/*.{a,la}
 
@@ -242,29 +229,28 @@ rm -rf %{buildroot}%{_libdir}/conky/*.{a,la}
 %config(noreplace) %{_sysconfdir}/conky/conky_no_x11.conf
 %{_bindir}/conky
 %{_bindir}/conkyconf
-%{_mandir}/man1/conky.1%{?ext_man}
 %dir %{_libdir}/conky
 %{_libdir}/conky/libcairo.so
 %{_libdir}/conky/libcairo_imlib2_helper.so
+%{_libdir}/conky/libcairo_xlib.so
 %{_libdir}/conky/libimlib2.so
 %{_libdir}/conky/librsvg.so
 %{_datadir}/applications/conky.desktop
 %{_datadir}/icons/hicolor/scalable/apps/conky-logomark-violet.svg
+%{_datadir}/doc/conky-%{version}/
 %{_libdir}/libtcp-portmon.so
 
 %files doc
-%doc doc/*.html
+%doc %{_mandir}/man1/conky.1%{?ext_man}
 
 %files -n vim-plugin-conky
 %dir %{_datadir}/vim
 %dir %{_datadir}/vim/site
-%dir %{_datadir}/vim/site/syntax
 %dir %{_datadir}/vim/site/ftdetect
 %{_datadir}/vim/site/ftdetect/conkyrc.vim
-%{_datadir}/vim/site/syntax/conkyrc.vim
 
 %files -n nano-plugin-conky
 %dir %{_datadir}/nano
-%{_datadir}/nano/conky.nanorc
+%{_datadir}/nano/conky.nanorc.j2
 
 %changelog

conky.timestamp.patch

@@ -1,26 +0,0 @@
-diff -Naur a/src/llua.cc b/src/llua.cc
---- a/src/llua.cc	2021-03-02 09:39:20.000000000 -0600
-+++ b/src/llua.cc	2021-03-04 10:43:51.393815765 -0600
-@@ -157,8 +157,7 @@
-   lua_setfield(lua_L, -3, "cpath");
-   lua_pop(lua_L, 2);
- 
--  lua_pushstring(lua_L, PACKAGE_NAME " " VERSION " compiled " BUILD_DATE
--                                     " for " BUILD_ARCH);
-+  lua_pushstring(lua_L, PACKAGE_NAME " " VERSION " compiled for " BUILD_ARCH);
-   lua_setglobal(lua_L, "conky_build_info");
- 
-   lua_pushstring(lua_L, VERSION);
-diff -Naur a/src/main.cc b/src/main.cc
---- a/src/main.cc	2021-03-02 09:39:20.000000000 -0600
-+++ b/src/main.cc	2021-03-04 10:44:34.869260595 -0600
-@@ -56,8 +56,7 @@
- #endif /* BUILD_BUILTIN_CONFIG */
- 
- static void print_version() {
--  std::cout << _(PACKAGE_NAME " " VERSION " compiled " BUILD_DATE
--                              " for " BUILD_ARCH
-+  std::cout << _(PACKAGE_NAME " " VERSION " compiled for " BUILD_ARCH
-                               "\n"
-                               "\nCompiled in features:\n\n"
-                               "System config file: " SYSTEM_CONFIG_FILE

reproducible.patch

@@ -1,37 +0,0 @@
-https://github.com/brndnmtthws/conky/pull/1619 
-Author: Bernhard M. Wiedemann 
-Date: 2023-09-08
-
-Patch toluapp for reproducible output
-
-Index: conky-1.13.1/3rdparty/toluapp/src/bin/lua/package.lua
-===================================================================
---- conky-1.13.1.orig/3rdparty/toluapp/src/bin/lua/package.lua
-+++ conky-1.13.1/3rdparty/toluapp/src/bin/lua/package.lua
-@@ -108,7 +108,7 @@ end
- function classPackage:preamble ()
-  output('/*\n')
-  output('** Lua binding: '..self.name..'\n')
-- output('** Generated automatically by '..TOLUA_VERSION..' on '..date()..'.\n')
-+ output('** Generated automatically by '..TOLUA_VERSION..'.\n')
-  output('*/\n\n')
- 
- 	output('#ifndef __cplusplus\n')
-@@ -133,7 +133,7 @@ function classPackage:preamble ()
- 		output('\n')
- 		output('/* function to release collected object via destructor */')
- 		output('#ifdef __cplusplus\n')
--		for i,v in pairs(_collect) do
-+		for i,v in ipairs(_collect) do
- 		 output('\nstatic int '..v..' (lua_State* tolua_S)')
- 			output('{')
- 			output(' '..i..'* self = ('..i..'*) tolua_tousertype(tolua_S,1,0);')
-@@ -152,7 +152,7 @@ function classPackage:preamble ()
- 	if flags.t then
- 		output("#ifndef Mtolua_typeid\n#define Mtolua_typeid(L,TI,T)\n#endif\n")
- 	end
--	for n,v in pairs(_usertype) do
-+	for n,v in ipairs(_usertype) do
- 		if (not _global_classes[v]) or _global_classes[v]:check_public_access() then
- 			output(' tolua_usertype(tolua_S,"',v,'");')
- 			if flags.t then