From 51ca281422eca6a548a565104174ee6e56a4f287 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Tue, 20 Sep 2022 09:41:22 +0200
Subject: [PATCH] update to 1.13.1

---
 .gitignore            |  1 +
 conky-hsvheader.patch | 26 --------------------------
 conky.spec            | 16 +---------------
 sources               |  2 +-
 4 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 conky-hsvheader.patch

diff --git a/.gitignore b/.gitignore
index 4af11f2..2e99bb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /conky-1.11.6.tar.gz
 /conky-1.12.1.tar.gz
 /conky-1.12.2.tar.gz
+/conky-1.13.1.tar.gz
diff --git a/conky-hsvheader.patch b/conky-hsvheader.patch
deleted file mode 100644
index c326233..0000000
--- a/conky-hsvheader.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
diff --git a/conky.spec b/conky.spec
index 5cefc67..0821a28 100644
--- a/conky.spec
+++ b/conky.spec
@@ -21,14 +21,13 @@
 %bcond_without xinerama
 
 Name:           conky
-Version:        1.12.2
+Version:        1.13.1
 Release:        5%{?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++
@@ -60,19 +59,6 @@ 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
-
-# and use our CFLAGS
-sed -i '/set(CMAKE_C_FLAGS/,+5d' cmake/ConkyBuildOptions.cmake
-
-# our tolua++ is linked with lua 5.3
-sed -i \
-       -e 's|\(LUA REQUIRED\) lua5.1 lua-5.1 lua51 lua|\1 lua>=5.3|' \
-       -e 's|\(NOT LUA_VERSION VERSION_LESS\) 5.2.0|\1 5.4.0|' \
-    cmake/ConkyPlatformChecks.cmake
 
 # remove executable bits from files included in %{_docdir}
 chmod a-x extras/convert.lua
diff --git a/sources b/sources
index 351484c..e5acb95 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (conky-1.12.2.tar.gz) = 55280953da437efe36320e4c12f74d95b8406bd7d8b7d93c6582f9b346c1c80a94b71d1c27860f6274de9171865fca91e330dfc39feb80bb2f453a538bc5ce1a
+SHA512 (conky-1.13.1.tar.gz) = 3ee0e14f6ff2bac39404c272790055ac1106f47a00e8298da909a0febf6de0661486e8ce23f34e8c5050e364168b2efcefd0b28736cbd0bc135e1362f0dc5516