update to 1.10.7
This commit is contained in:
parent
9c5d19fdbf
commit
e4274f505b
|
@ -1 +1 @@
|
||||||
/conky-1.10.6.tar.gz
|
/conky-1.10.7.tar.gz
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
diff -up conky-1.10.6/src/luamm.hh.gcc7 conky-1.10.6/src/luamm.hh
|
|
||||||
--- conky-1.10.6/src/luamm.hh.gcc7 2017-02-20 15:31:45.145623438 +0100
|
|
||||||
+++ conky-1.10.6/src/luamm.hh 2017-02-20 15:42:02.467168585 +0100
|
|
||||||
@@ -26,6 +26,7 @@
|
|
||||||
#include <memory>
|
|
||||||
#include <mutex>
|
|
||||||
#include <exception>
|
|
||||||
+#include <functional>
|
|
||||||
#include <stdexcept>
|
|
||||||
#include <string>
|
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
%bcond_without xinerama
|
%bcond_without xinerama
|
||||||
|
|
||||||
Name: conky
|
Name: conky
|
||||||
Version: 1.10.6
|
Version: 1.10.7
|
||||||
Release: 3%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: A system monitor for X
|
Summary: A system monitor for X
|
||||||
|
|
||||||
|
@ -25,7 +25,6 @@ Group: User Interface/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-gcc7.patch
|
|
||||||
|
|
||||||
BuildRequires: libXft-devel
|
BuildRequires: libXft-devel
|
||||||
BuildRequires: libXt-devel
|
BuildRequires: libXt-devel
|
||||||
|
@ -54,10 +53,9 @@ It just keeps on given'er. Yeah.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1 -b .gcc7
|
|
||||||
|
|
||||||
# remove -Werror from CFLAGS
|
# remove some options from CFLAGS
|
||||||
sed -i 's|-Werror||' cmake/ConkyBuildOptions.cmake
|
sed -i 's/\(-Werror\|-Wno-format\|-pedantic\)//g' cmake/ConkyBuildOptions.cmake
|
||||||
|
|
||||||
# our tolua++ is linked with lua 5.3
|
# our tolua++ is linked with lua 5.3
|
||||||
sed -i \
|
sed -i \
|
||||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
||||||
SHA512 (conky-1.10.6.tar.gz) = ddd0b087e89654f8dace7d9682935a802b3bb22b7e65acd25dcc0f06e90b46bee695502d78b6e40a409f8eaffcd65a78d5f861ee6dbcbff6e48f88c2f20319c9
|
SHA512 (conky-1.10.7.tar.gz) = 4da501c7c7613e8b9b26a691a1c0118c05cec818e944d4a30e250ecba26956d6f3103ec5731f082a095173dbfe0713137ded92043cc4c1eb3821c0943f1744f4
|
||||||
|
|
Loading…
Reference in New Issue