update to 1.12.2

This commit is contained in:
Miroslav Lichvar 2021-09-21 10:38:30 +02:00
parent 7d7d3f62e9
commit 313eb87fda
4 changed files with 31 additions and 2 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/conky-1.11.5.tar.gz
/conky-1.11.6.tar.gz
/conky-1.12.1.tar.gz
/conky-1.12.2.tar.gz

26
conky-hsvheader.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/src/conky.cc b/src/conky.cc
index de1bbbf7..33fbe299 100644
--- a/src/conky.cc
+++ b/src/conky.cc
@@ -138,6 +138,10 @@
#include <microhttpd.h>
#endif /* BUILD_HTTP */
+#ifdef BUILD_HSV_GRADIENT
+#include "hsv_gradient.h"
+#endif /* BUILD_HSV_GRADIENT */
+
#ifdef BUILD_OLD_CONFIG
#include "convertconf.h"
#endif /* BUILD_OLD_CONFIG */
@@ -145,10 +149,6 @@
#ifdef BUILD_BUILTIN_CONFIG
#include "defconfig.h"
-#ifdef BUILD_HSV_GRADIENT
-#include "hsv_gradient.h"
-#endif /* BUILD_HSV_GRADIENT */
-
namespace {
const char builtin_config_magic[] = "==builtin==";
} // namespace

View File

@ -17,13 +17,14 @@
%bcond_without xinerama
Name: conky
Version: 1.12.1
Version: 1.12.2
Release: 2%{?dist}
Summary: A system monitor for X
License: GPLv3+
URL: https://github.com/brndnmtthws/conky
Source0: https://github.com/brndnmtthws/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
Patch1: conky-hsvheader.patch
BuildRequires: gcc
BuildRequires: gcc-c++
@ -55,6 +56,7 @@ It just keeps on given'er. Yeah.
%prep
%setup -q
%patch1 -p1 -b .hsvheader
# remove some options from CFLAGS
sed -i 's/\(-Werror\|-Wno-format\|-pedantic\)//g' cmake/ConkyBuildOptions.cmake

View File

@ -1 +1 @@
SHA512 (conky-1.12.1.tar.gz) = 897c6b83528809aa2e33e15b9ad6644d8cf36f4cff93f014811754f982c13180001b972b2b145b607de8d865c2af9a425ab50246065f537e14be75da5631593a
SHA512 (conky-1.12.2.tar.gz) = 55280953da437efe36320e4c12f74d95b8406bd7d8b7d93c6582f9b346c1c80a94b71d1c27860f6274de9171865fca91e330dfc39feb80bb2f453a538bc5ce1a