public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Artur Frenszek-Iwicki <fedora@svgames.pl>
To: git-commits@fedoraproject.org
Subject: [rpms/conky] rawhide: Update to v1.24.2
Date: Thu, 02 Jul 2026 09:20:10 GMT	[thread overview]
Message-ID: <178298401093.1.4394962802996929402.rpms-conky-e7a67e426ab7@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/conky
Branch : rawhide
Commit : e7a67e426ab70823066a153e9b0558388a74e715
Author : Artur Frenszek-Iwicki <fedora@svgames.pl>
Date   : 2026-07-01T23:24:23+02:00
Stats  : +17/-12 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/conky/c/e7a67e426ab70823066a153e9b0558388a74e715?branch=rawhide

Log:
Update to v1.24.2

---
diff --git a/.gitignore b/.gitignore
index 4466061..ab65336 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /conky-1.21.7.tar.gz
 /conky-1.22.0.tar.gz
 /conky-1.22.2.tar.gz
+/conky-1.24.2.tar.gz

diff --git a/conky-1.22.2-lua-5.5.patch b/conky-1.22.2-lua-5.5.patch
index d5445e0..173b605 100644
--- a/conky-1.22.2-lua-5.5.patch
+++ b/conky-1.22.2-lua-5.5.patch
@@ -1,16 +1,16 @@
-diff -up conky-1.22.2/src/lua/luamm.hh.lua55 conky-1.22.2/src/lua/luamm.hh
---- conky-1.22.2/src/lua/luamm.hh.lua55	2026-02-27 15:26:18.937853715 -0500
-+++ conky-1.22.2/src/lua/luamm.hh	2026-02-27 15:26:27.628908820 -0500
-@@ -47,8 +47,10 @@ enum {
+diff -rU4 conky-1.24.2--orig/src/lua/luamm.hh conky-1.24.2/src/lua/luamm.hh
+--- conky-1.24.2--orig/src/lua/luamm.hh	2026-06-19 00:10:29.000000000 +0200
++++ conky-1.24.2/src/lua/luamm.hh	2026-07-01 23:13:06.467743716 +0200
+@@ -46,8 +46,12 @@
+   GCCOLLECT = LUA_GCCOLLECT,
    GCCOUNT = LUA_GCCOUNT,
    GCCOUNTB = LUA_GCCOUNTB,
    GCSTEP = LUA_GCSTEP,
--  GCSETPAUSE = LUA_GCSETPAUSE,
--  GCSETSTEPMUL = LUA_GCSETSTEPMUL
 +  GCISRUNNING = LUA_GCISRUNNING,
 +  GCGEN = LUA_GCGEN,
 +  GCINC = LUA_GCINC,
 +  GCPARAM = LUA_GCPARAM
- };
- 
- enum { MULTRET = LUA_MULTRET };
+ #if defined(LUA_GCSETPAUSE)
+   GCSETPAUSE = LUA_GCSETPAUSE,
+ #endif
+ #if defined(LUA_GCSETSTEPMUL)

diff --git a/conky.spec b/conky.spec
index d8c73e2..bc1f82e 100644
--- a/conky.spec
+++ b/conky.spec
@@ -22,8 +22,8 @@
 %bcond_without xinerama
 
 Name:           conky
-Version:        1.22.2
-Release:        5%{?dist}
+Version:        1.24.2
+Release:        1%{?dist}
 Summary:        A system monitor for X
 
 License:        GPL-3.0-or-later AND LGPL-2.1-or-later AND MIT-open-group AND BSD-3-Clause
@@ -38,6 +38,7 @@ BuildRequires:  libXft-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXdamage-devel
 BuildRequires:  libXext-devel
+BuildRequires:  libXi-devel
 BuildRequires:  lua-devel
 %{?with_audacious:BuildRequires: audacious-devel < 3.5 dbus-glib-devel}
 %{?with_curl:BuildRequires: curl-devel}
@@ -126,6 +127,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/conky.desktop
 %{_mandir}/man1/conky.1*
 
 %changelog
+* Wed Jul 01 2026 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.24.2-1
+- Update to v1.24.2
+
 * Thu Apr 16 2026 Tom Callaway <spot@fedoraproject.org> - 1.22.2-5
 - rebuild
 

diff --git a/sources b/sources
index 3177aaa..b926302 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (conky-1.22.2.tar.gz) = 7aadbaf2a41c3bb4315870c670633a903992ad71fb1eedf1ee23f9d12739129f5adb11571290e5b281690d9940b917251527b89bbd4575634815d51d3da86fa1
+SHA512 (conky-1.24.2.tar.gz) = 3146afd8facb2e358ac6b69b16c6e5ff73b75580d4bb76640448b0dc16ea85117bc77818f1fc472a590516af6c04117ff7b44c41285918dd275555ea3b9e5a35

                 reply	other threads:[~2026-07-02  9:20 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178298401093.1.4394962802996929402.rpms-conky-e7a67e426ab7@fedoraproject.org \
    --to=fedora@svgames.pl \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox