diff --git a/.gitignore b/.gitignore index 8c1663a..4af11f2 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/conky-hsvheader.patch b/conky-hsvheader.patch new file mode 100644 index 0000000..c326233 --- /dev/null +++ b/conky-hsvheader.patch @@ -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 + #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 diff --git a/conky.spec b/conky.spec index 4ed7914..f8d55e5 100644 --- a/conky.spec +++ b/conky.spec @@ -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 diff --git a/sources b/sources index 1cf89c1..351484c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (conky-1.12.1.tar.gz) = 897c6b83528809aa2e33e15b9ad6644d8cf36f4cff93f014811754f982c13180001b972b2b145b607de8d865c2af9a425ab50246065f537e14be75da5631593a +SHA512 (conky-1.12.2.tar.gz) = 55280953da437efe36320e4c12f74d95b8406bd7d8b7d93c6582f9b346c1c80a94b71d1c27860f6274de9171865fca91e330dfc39feb80bb2f453a538bc5ce1a