diff --git a/srcpkgs/conky/patches/ascii.patch b/srcpkgs/conky/patches/ascii.patch index fb13ee1db59..25461d26fa4 100644 --- a/srcpkgs/conky/patches/ascii.patch +++ b/srcpkgs/conky/patches/ascii.patch @@ -1,5 +1,5 @@ ---- ./doc/config_settings.xml.orig 2015-09-09 22:46:13.283151562 -0400 -+++ ./doc/config_settings.xml 2015-09-09 22:46:25.629151185 -0400 +--- doc/config_settings.xml.orig 2015-09-09 22:46:13.283151562 -0400 ++++ doc/config_settings.xml 2015-09-09 22:46:25.629151185 -0400 @@ -80,7 +80,7 @@ A comma-separated list of strings to use as the bars of a graph output diff --git a/srcpkgs/conky/patches/ipv6_fatal_to_warning.patch b/srcpkgs/conky/patches/ipv6_fatal_to_warning.patch index abd818473aa..2d921aea01e 100644 --- a/srcpkgs/conky/patches/ipv6_fatal_to_warning.patch +++ b/srcpkgs/conky/patches/ipv6_fatal_to_warning.patch @@ -1,5 +1,5 @@ ---- ./cmake/ConkyPlatformChecks.cmake.orig 2015-09-09 16:43:45.145815169 -0400 -+++ ./cmake/ConkyPlatformChecks.cmake 2015-09-09 16:44:03.281814616 -0400 +--- cmake/ConkyPlatformChecks.cmake.orig 2015-09-09 16:43:45.145815169 -0400 ++++ cmake/ConkyPlatformChecks.cmake 2015-09-09 16:44:03.281814616 -0400 @@ -105,7 +105,7 @@ if(BUILD_IPV6) find_file(IF_INET6 if_inet6 PATHS /proc/net) diff --git a/srcpkgs/conky/patches/musl-fixes.patch b/srcpkgs/conky/patches/musl-fixes.patch index 4891f327857..5e425b54be3 100644 --- a/srcpkgs/conky/patches/musl-fixes.patch +++ b/srcpkgs/conky/patches/musl-fixes.patch @@ -9,8 +9,8 @@ Subject: [PATCH 2/3] Remove use of sysctl.h diff --git a/src/common.cc b/src/common.cc index 126f30a..116cd06 100644 ---- a/src/common.cc -+++ b/src/common.cc +--- src/common.cc ++++ src/common.cc @@ -42,7 +42,6 @@ #include #include @@ -34,8 +34,8 @@ Subject: [PATCH 3/3] Use portable version of strerror_r diff --git a/src/c++wrap.cc b/src/c++wrap.cc index c21b473..213f9c4 100644 ---- a/src/c++wrap.cc -+++ b/src/c++wrap.cc +--- src/c++wrap.cc ++++ src/c++wrap.cc @@ -26,8 +26,14 @@ #include "c++wrap.hh" diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template index b0b9ccefec1..1983ad5d9d8 100644 --- a/srcpkgs/conky/template +++ b/srcpkgs/conky/template @@ -1,9 +1,8 @@ # Template file for 'conky' pkgname=conky version=1.10.0 -revision=1 +revision=2 build_style=cmake -patch_args="-p1" configure_args=" -DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DDOC_PATH=share/${pkgname} -DBUILD_X11=ON -DBUILD_CURL=ON -DBUILD_XDBE=ON -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=ON @@ -12,7 +11,6 @@ hostmakedepends="cmake libtool pkg-config docbook2x man-db" makedepends="lua-devel alsa-lib-devel libglib-devel libxml2-devel libXft-devel libXdamage-devel imlib2-devel wireless_tools-devel libcurl-devel ncurses-devel" conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf" -conflicts="conky>=0" short_desc="Lightweight system monitor for X" maintainer="Juan RP " license="BSD, GPL-3"