diff --git a/srcpkgs/conky/patches/issue464.patch b/srcpkgs/conky/patches/issue464.patch deleted file mode 100644 index 68cd4baed37..00000000000 --- a/srcpkgs/conky/patches/issue464.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6b386589c0822bdaf5ed38d5f388cf902e0e749e Mon Sep 17 00:00:00 2001 -From: cmanv -Date: Tue, 27 Feb 2018 11:34:19 -0500 -Subject: [PATCH] Fix to soundcard.h issue (#464) - -* Fix to issue #463 - -Add platform check for the soundcard header - -* Update ConkyPlatformChecks.cmake - -diff --git cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake ---- cmake/ConkyPlatformChecks.cmake -+++ cmake/ConkyPlatformChecks.cmake -@@ -30,8 +30,6 @@ check_include_files(sys/statfs.h HAVE_SYS_STATFS_H) - check_include_files(sys/param.h HAVE_SYS_PARAM_H) - check_include_files(sys/inotify.h HAVE_SYS_INOTIFY_H) - check_include_files(dirent.h HAVE_DIRENT_H) --check_include_files("soundcard.h;sys/soundcard.h;linux/soundcard.h" HAVE_SOME_SOUNDCARD_H) --check_include_files("linux/soundcard.h" HAVE_LINUX_SOUNDCARD_H) - - # Check for some functions - check_function_exists(strndup HAVE_STRNDUP) -@@ -88,6 +86,16 @@ if(NOT OS_LINUX AND NOT OS_FREEBSD AND NOT OS_OPENBSD AND NOT OS_DRAGONFLY - endif(NOT OS_LINUX AND NOT OS_FREEBSD AND NOT OS_OPENBSD AND NOT OS_DRAGONFLY - AND NOT OS_SOLARIS AND NOT OS_HAIKU) - -+# Check for soundcard header -+if(OS_LINUX) -+ check_include_files("linux/soundcard.h" HAVE_SOME_SOUNDCARD_H) -+ check_include_files("linux/soundcard.h" HAVE_LINUX_SOUNDCARD_H) -+elseif(OS_OPENBSD) -+ check_include_files("soundcard.h" HAVE_SOME_SOUNDCARD_H) -+else(OS_LINUX) -+ check_include_files("sys/soundcard.h" HAVE_SOME_SOUNDCARD_H) -+endif(OS_LINUX) -+ - if(BUILD_I18N AND OS_DRAGONFLY) - set(conky_libs ${conky_libs} -lintl) - endif(BUILD_I18N AND OS_DRAGONFLY) diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template index 244576e070c..9d4fdad0ae4 100644 --- a/srcpkgs/conky/template +++ b/srcpkgs/conky/template @@ -1,13 +1,13 @@ # Template file for 'conky' pkgname=conky -version=1.10.8 -revision=2 +version=1.11.0 +revision=1 build_style=cmake 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 - -DBUILD_WEATHER_XOAP=ON -DBUILD_IMLIB2=ON -DBUILD_WLAN=ON -DBUILD_LUA_CAIRO=ON - -DBUILD_LUA_IMLIB2=ON -DBUILD_LUA_RSVG=ON -DBUILD_XSHAPE=ON" + -DBUILD_IMLIB2=ON -DBUILD_WLAN=ON -DBUILD_LUA_CAIRO=ON -DBUILD_LUA_IMLIB2=ON + -DBUILD_LUA_RSVG=ON -DBUILD_XSHAPE=ON" hostmakedepends="libtool pkg-config docbook2x man-db git toluapp" makedepends="alsa-lib-devel imlib2-devel libXdamage-devel libXft-devel libXinerama-devel libcurl-devel librsvg-devel lua51-devel toluapp-devel wireless_tools-devel" @@ -17,7 +17,7 @@ maintainer="Juan RP " license="BSD-3-Clause, GPL-3.0-or-later" homepage="https://github.com/brndnmtthws/conky" distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz" -checksum=2ebd655a27c816bd613538b71d4ec1c096252cb522feaa05f64781dcedea8857 +checksum=cc75b5f6cdeefa83082f3dedf5a12105569c2cdc0ae3e7728922d79bc4abcf51 do_install() { make -C build DESTDIR=${DESTDIR} install