From 079b21a2e27e2f9ce747dc527c6776c1d9cf0875 Mon Sep 17 00:00:00 2001 From: Lorem Date: Sat, 2 May 2020 05:56:19 +0530 Subject: [PATCH 1/2] conky: enable docs --- srcpkgs/conky/patches/noreadme.patch | 23 ----------------------- srcpkgs/conky/template | 20 +++++++++----------- 2 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/conky/patches/noreadme.patch diff --git a/srcpkgs/conky/patches/noreadme.patch b/srcpkgs/conky/patches/noreadme.patch deleted file mode 100644 index 14852b9758c..00000000000 --- a/srcpkgs/conky/patches/noreadme.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- cmake/Docbook.cmake -+++ cmake/Docbook.cmake -@@ -66,7 +66,6 @@ - add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.html - ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.1 -- ${CMAKE_SOURCE_DIR}/README - COMMAND ${APP_XSLTPROC} - ${CMAKE_SOURCE_DIR}/doc/docbook-xml/html/docbook.xsl - ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml > -@@ -82,12 +81,7 @@ - ${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'' -e 's/[[:cntrl:]]\\[[0-9]*m//g' -- ${CMAKE_SOURCE_DIR}/README -- COMMAND ${APP_SED} -i'' -e 's/\\xE2//g' ${CMAKE_SOURCE_DIR}/README -- COMMAND ${APP_SED} -i'' -e 's/\\x80//g' ${CMAKE_SOURCE_DIR}/README -- COMMAND ${APP_SED} -i'' -e 's/\\x90/-/g' ${CMAKE_SOURCE_DIR}/README - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml - COMMENT "Proccessing man page for ${FIL}") - add_custom_target(${FIL} ALL diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template index 67d2397c19e..c5d251df6e2 100644 --- a/srcpkgs/conky/template +++ b/srcpkgs/conky/template @@ -1,15 +1,15 @@ # Template file for 'conky' pkgname=conky version=1.11.5 -revision=1 +revision=2 build_style=cmake conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf" -configure_args="-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON - -DDOC_PATH=share/${pkgname} -DBUILD_X11=ON -DBUILD_CURL=ON -DBUILD_XDBE=ON +configure_args="-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DRELEASE=ON + -DDOC_PATH=share/doc/${pkgname} -DBUILD_X11=ON -DBUILD_CURL=ON -DBUILD_XDBE=ON -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=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" + -DBUILD_XSHAPE=ON -DBUILD_DOCS=ON" +hostmakedepends="libtool pkg-config docbook2x man-db toluapp" makedepends="alsa-lib-devel imlib2-devel libXdamage-devel libXft-devel libXinerama-devel libcurl-devel librsvg-devel lua-devel toluapp-devel wireless_tools-devel" @@ -20,12 +20,10 @@ homepage="https://github.com/brndnmtthws/conky" distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz" checksum=4cefdd92219a90934c28297e4ac7448a3f69d6aeec5d48c5763b23f6b214ef13 -do_install() { - make -C build DESTDIR=${DESTDIR} install - +post_install() { vmkdir etc/conky - mv ${DESTDIR}/usr/share/conky/conky.conf ${DESTDIR}/etc/conky/ - mv ${DESTDIR}/usr/share/conky/conky_no_x11.conf ${DESTDIR}/etc/conky/ - + mv ${DESTDIR}/usr/share/doc/conky/conky.conf ${DESTDIR}/etc/conky/ + mv ${DESTDIR}/usr/share/doc/conky/conky_no_x11.conf ${DESTDIR}/etc/conky/ + rm ${DESTDIR}/usr/share/doc/conky/convert.lua vlicense COPYING } From 7d58290902f72e04776a2f6c5ddcc7c09162e12b Mon Sep 17 00:00:00 2001 From: Lorem Date: Sat, 2 May 2020 05:56:53 +0530 Subject: [PATCH 2/2] conky-cli: enable docs --- srcpkgs/conky-cli/template | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template index cbb7cb7c4e7..421d76008bc 100644 --- a/srcpkgs/conky-cli/template +++ b/srcpkgs/conky-cli/template @@ -1,14 +1,15 @@ # Template file for 'conky-cli' pkgname=conky-cli version=1.11.5 -revision=1 +revision=2 wrksrc="${pkgname/-cli/}-${version}" build_style=cmake conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf" -configure_args="-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON - -DDOC_PATH=share/${pkgname} -DBUILD_X11=OFF -DBUILD_CURL=ON -DBUILD_XDBE=OFF - -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=OFF -DBUILD_IMLIB2=OFF -DBUILD_WLAN=ON" -hostmakedepends="libtool pkg-config docbook2x man-db git" +configure_args="-DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DRELEASE=ON + -DDOC_PATH=share/doc/${pkgname} -DBUILD_X11=OFF -DBUILD_CURL=ON -DBUILD_XDBE=OFF + -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=OFF -DBUILD_IMLIB2=OFF -DBUILD_WLAN=ON + -DBUILD_DOCS=ON" +hostmakedepends="libtool pkg-config docbook2x man-db" makedepends="libcurl-devel libglib-devel libxml2-devel lua-devel wireless_tools-devel" short_desc="Conky command line without X11" @@ -29,7 +30,8 @@ post_extract() { post_install() { vmkdir etc/conky - mv ${DESTDIR}/usr/share/conky-cli/conky.conf ${DESTDIR}/etc/conky/ - mv ${DESTDIR}/usr/share/conky-cli/conky_no_x11.conf ${DESTDIR}/etc/conky/ + mv ${DESTDIR}/usr/share/doc/conky-cli/conky.conf ${DESTDIR}/etc/conky/ + mv ${DESTDIR}/usr/share/doc/conky-cli/conky_no_x11.conf ${DESTDIR}/etc/conky/ + rm ${DESTDIR}/usr/share/doc/conky-cli/convert.lua vlicense COPYING }