From 3c70f492d299871200037c3e612462d1c2419e02 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 23 Jul 2018 21:06:27 +0200 Subject: [PATCH] conky: fix soundcard detection. --- srcpkgs/conky/patches/issue464.patch | 40 ++++++++++++++++++++++++++++ srcpkgs/conky/template | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/conky/patches/issue464.patch diff --git a/srcpkgs/conky/patches/issue464.patch b/srcpkgs/conky/patches/issue464.patch new file mode 100644 index 0000000000..68cd4baed3 --- /dev/null +++ b/srcpkgs/conky/patches/issue464.patch @@ -0,0 +1,40 @@ +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 1dace43d13..244576e070 100644 --- a/srcpkgs/conky/template +++ b/srcpkgs/conky/template @@ -1,7 +1,7 @@ # Template file for 'conky' pkgname=conky version=1.10.8 -revision=1 +revision=2 build_style=cmake configure_args=" -DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DDOC_PATH=share/${pkgname}