Compare commits

..

No commits in common. "2ed1c005c9f95c7b33e99cab38a53fc562c920bb" and "d13b4a793d577be2364bcabb05bca1f19321b65a" have entirely different histories.

4 changed files with 1 additions and 18 deletions

3
.gitmodules vendored
View File

@ -1,6 +1,3 @@
[submodule "termo"] [submodule "termo"]
path = termo path = termo
url = https://git.janouch.name/p/termo.git url = https://git.janouch.name/p/termo.git
[submodule "liberty"]
path = liberty
url = https://git.janouch.name/p/liberty.git

View File

@ -132,8 +132,7 @@ GETTEXT_CREATE_TRANSLATIONS (
find_program (ASCIIDOCTOR_EXECUTABLE asciidoctor) find_program (ASCIIDOCTOR_EXECUTABLE asciidoctor)
find_program (A2X_EXECUTABLE a2x) find_program (A2X_EXECUTABLE a2x)
if (NOT ASCIIDOCTOR_EXECUTABLE AND NOT A2X_EXECUTABLE) if (NOT ASCIIDOCTOR_EXECUTABLE AND NOT A2X_EXECUTABLE)
message (WARNING "Neither asciidoctor nor a2x were found, " message (FATAL_ERROR "Neither asciidoctor nor a2x were found")
"falling back to a substandard manual page generator")
endif () endif ()
foreach (page "${PROJECT_NAME}.1") foreach (page "${PROJECT_NAME}.1")
@ -155,14 +154,6 @@ foreach (page "${PROJECT_NAME}.1")
"${PROJECT_SOURCE_DIR}/docs/${page}.adoc" "${PROJECT_SOURCE_DIR}/docs/${page}.adoc"
DEPENDS "docs/${page}.adoc" DEPENDS "docs/${page}.adoc"
COMMENT "Generating man page for ${page}" VERBATIM) COMMENT "Generating man page for ${page}" VERBATIM)
else ()
set (ASCIIMAN ${PROJECT_SOURCE_DIR}/liberty/tools/asciiman.awk)
add_custom_command (OUTPUT ${page_output}
COMMAND env LC_ALL=C asciidoc-release-version=${PROJECT_VERSION}
awk -f ${ASCIIMAN} "${PROJECT_SOURCE_DIR}/docs/${page}.adoc"
> ${page_output}
DEPENDS "docs/${page}.adoc" ${ASCIIMAN}
COMMENT "Generating man page for ${page}" VERBATIM)
endif () endif ()
endforeach () endforeach ()

@ -1 +0,0 @@
Subproject commit 29bf109a51951e9c6d94bd2fedffb405bead849c

View File

@ -207,10 +207,6 @@ app_char_width (Application *app, gunichar c)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#if !GLIB_CHECK_VERSION(2, 68, 0)
#define g_memdup2 g_memdup
#endif
/// Splits the entry and adds it to a pointer array. /// Splits the entry and adds it to a pointer array.
static void static void
view_entry_split_add (ViewEntry *ve, const gchar *text, const chtype *attrs) view_entry_split_add (ViewEntry *ve, const gchar *text, const chtype *attrs)