From 031cd08006afd9415bd8f094ddb32f38bd9ad0b5 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Sat, 23 Jul 2016 18:20:52 +0200 Subject: [PATCH] conky: don't build README, fixes build on musl. --- srcpkgs/conky/patches/noreadme.patch | 14 ++++++++++++++ srcpkgs/conky/template | 6 +----- 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/conky/patches/noreadme.patch diff --git a/srcpkgs/conky/patches/noreadme.patch b/srcpkgs/conky/patches/noreadme.patch new file mode 100644 index 00000000000..f9952ca4f07 --- /dev/null +++ b/srcpkgs/conky/patches/noreadme.patch @@ -0,0 +1,14 @@ +--- cmake/Docbook.cmake.orig ++++ cmake/Docbook.cmake +@@ -74,11 +74,6 @@ + COMMAND ${APP_DB2X_XSLTPROC} -s man ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml -o ${FIL}.mxml + COMMAND ${APP_DB2X_MANXML} --encoding=utf-8 ${FIL}.mxml --output-dir ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND ${APP_XSLTPROC} http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml > ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.html +- COMMAND ${APP_MAN} -P '${APP_LESS} -is' ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.1 > ${CMAKE_SOURCE_DIR}/README +- COMMAND ${APP_SED} -i "s/[[:cntrl:]]\\[[0-9]*m//g" ${CMAKE_SOURCE_DIR}/README +- COMMAND ${APP_SED} -i "s/\\xE2//g" ${CMAKE_SOURCE_DIR}/README +- COMMAND ${APP_SED} -i "s/\\x80//g" ${CMAKE_SOURCE_DIR}/README +- COMMAND ${APP_SED} -i "s/\\x90/-/g" ${CMAKE_SOURCE_DIR}/README + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml + COMMENT "Proccessing man page for ${FIL}" + ) diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template index 7ee14b43b57..fcea680ff9b 100644 --- a/srcpkgs/conky/template +++ b/srcpkgs/conky/template @@ -1,7 +1,7 @@ # Template file for 'conky' pkgname=conky version=1.10.4 -revision=1 +revision=2 build_style=cmake configure_args=" -DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DDOC_PATH=share/${pkgname} @@ -20,10 +20,6 @@ homepage="http://conky.sourceforge.net/" distfiles="https://github.com/brndnmtthws/${pkgname}/archive/v${version}.tar.gz" checksum=ed61ffb3be9fd24965d40401c7d54553e732038f3da2e03454915779384f59b4 -case "$XBPS_TARGET_MACHINE" in - *-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/12864/steps/shell_3/logs/stdio";; -esac - post_extract() { sed -i \ -e '1iinclude(CheckIncludeFile)' \