use sphinx-build-3 to build documentation; breakage reported by naddy@ and sthen@

This commit is contained in:
jasper 2019-11-04 19:14:00 +00:00
parent d87240b107
commit 67967db6da
3 changed files with 32 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2019/11/03 11:43:17 jasper Exp $
# $OpenBSD: Makefile,v 1.6 2019/11/04 19:14:00 jasper Exp $
COMMENT = fast and easy-to-use status bar
V = 3.4.1
@ -49,7 +49,9 @@ NO_TEST = Yes
WRKDIST = ${WRKDIR}/polybar
pre-configure:
${SUBST_CMD} ${WRKSRC}/lib/i3ipcpp/CMakeLists.txt
${SUBST_CMD} ${WRKSRC}/cmake/02-opts.cmake \
${WRKSRC}/doc/CMakeLists.txt \
${WRKSRC}/lib/i3ipcpp/CMakeLists.txt
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/polybar

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-cmake_02-opts_cmake,v 1.1 2019/11/04 19:14:00 jasper Exp $
Index: cmake/02-opts.cmake
--- cmake/02-opts.cmake.orig
+++ cmake/02-opts.cmake
@@ -1,7 +1,7 @@
#
# Build options
#
-checklib(BUILD_DOC "binary" sphinx-build)
+checklib(BUILD_DOC "binary" sphinx-build${MODPY_BIN_SUFFIX})
checklib(ENABLE_ALSA "pkg-config" alsa)
checklib(ENABLE_CURL "pkg-config" libcurl)

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-doc_CMakeLists_txt,v 1.1 2019/11/04 19:14:00 jasper Exp $
Index: doc/CMakeLists.txt
--- doc/CMakeLists.txt.orig
+++ doc/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
project(polybar-doc NONE)
find_program(SPHINX_EXECUTABLE
- NAMES sphinx-build
+ NAMES sphinx-build${MODPY_BIN_SUFFIX}
DOC "Sphinx Documentation Builder")
if(NOT SPHINX_EXECUTABLE)