update to 1.13.1
This commit is contained in:
parent
062f7e8a7b
commit
51ca281422
|
@ -5,3 +5,4 @@
|
||||||
/conky-1.11.6.tar.gz
|
/conky-1.11.6.tar.gz
|
||||||
/conky-1.12.1.tar.gz
|
/conky-1.12.1.tar.gz
|
||||||
/conky-1.12.2.tar.gz
|
/conky-1.12.2.tar.gz
|
||||||
|
/conky-1.13.1.tar.gz
|
||||||
|
|
|
@ -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
|
|
16
conky.spec
16
conky.spec
|
@ -21,14 +21,13 @@
|
||||||
%bcond_without xinerama
|
%bcond_without xinerama
|
||||||
|
|
||||||
Name: conky
|
Name: conky
|
||||||
Version: 1.12.2
|
Version: 1.13.1
|
||||||
Release: 5%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: A system monitor for X
|
Summary: A system monitor for X
|
||||||
|
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: https://github.com/brndnmtthws/conky
|
URL: https://github.com/brndnmtthws/conky
|
||||||
Source0: https://github.com/brndnmtthws/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/brndnmtthws/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||||
Patch1: conky-hsvheader.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
|
@ -60,19 +59,6 @@ It just keeps on given'er. Yeah.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%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}
|
# remove executable bits from files included in %{_docdir}
|
||||||
chmod a-x extras/convert.lua
|
chmod a-x extras/convert.lua
|
||||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
||||||
SHA512 (conky-1.12.2.tar.gz) = 55280953da437efe36320e4c12f74d95b8406bd7d8b7d93c6582f9b346c1c80a94b71d1c27860f6274de9171865fca91e330dfc39feb80bb2f453a538bc5ce1a
|
SHA512 (conky-1.13.1.tar.gz) = 3ee0e14f6ff2bac39404c272790055ac1106f47a00e8298da909a0febf6de0661486e8ce23f34e8c5050e364168b2efcefd0b28736cbd0bc135e1362f0dc5516
|
||||||
|
|
Loading…
Reference in New Issue