diff -Nru hud-14.10+17.10.20170619/cmake/FindGtkDoc.cmake hud-14.10+17.10.20170619/cmake/FindGtkDoc.cmake --- hud-14.10+17.10.20170619/cmake/FindGtkDoc.cmake 2019-01-15 09:27:16.000000000 +0000 +++ hud-14.10+17.10.20170619/cmake/FindGtkDoc.cmake 2019-01-16 05:54:42.000000000 +0000 @@ -8,6 +8,7 @@ # # GTKDOC_SCAN_EXE ... the location of the gtkdoc-scan executable # GTKDOC_SCANGOBJ_EXE ... the location of the gtkdoc-scangobj executable +# GTKDOC_MKTMPL_EXE ... the location of the gtkdoc-mktmpl executable # GTKDOC_MKDB_EXE ... the location of the gtkdoc-mkdb executable # GTKDOC_MKHTML_EXE ... the location of the gtkdoc-mkhtml executable # GTKDOC_FIXXREF_EXE ... the location of the gtkdoc-fixxref executable @@ -33,6 +34,12 @@ set(GTKDOC_FOUND 0) endif(NOT GTKDOC_SCANGOBJ_WRAPPER) +find_program(GTKDOC_MKTMPL_EXE gtkdoc-mktmpl PATH "${GLIB_PREFIX}/bin") +if(NOT GTKDOC_MKTMPL_EXE) + message(STATUS "gtkdoc-mktmpl not found") + set(GTKDOC_FOUND 0) +endif(NOT GTKDOC_MKTMPL_EXE) + find_program(GTKDOC_MKDB_EXE gtkdoc-mkdb PATH "${GLIB_PREFIX}/bin") if(NOT GTKDOC_MKDB_EXE) message(STATUS "gtkdoc-mkdb not found") diff -Nru hud-14.10+17.10.20170619/cmake/UseGtkDoc.cmake hud-14.10+17.10.20170619/cmake/UseGtkDoc.cmake --- hud-14.10+17.10.20170619/cmake/UseGtkDoc.cmake 2019-01-15 09:27:16.000000000 +0000 +++ hud-14.10+17.10.20170619/cmake/UseGtkDoc.cmake 2019-01-16 05:54:42.000000000 +0000 @@ -2,265 +2,233 @@ find_package(GtkDoc) - -get_filename_component(_this_dir ${CMAKE_CURRENT_LIST_FILE} PATH) -find_file(GTKDOC_SCANGOBJ_WRAPPER GtkDocScanGObjWrapper.cmake PATH ${_this_dir}) - -# :: -# -# gtk_doc_add_module(doc_prefix -# SOURCE [...] -# XML xmlfile -# [LIBRARIES depend1...] +# gtk_doc_add_module(doc_prefix sourcedir +# [XML xmlfile] # [FIXXREFOPTS fixxrefoption1...] -# [IGNOREHEADERS header1...]) -# -# Add a module with documentation to be processed with GTK-Doc. -# -# must be the *full* path to the source directory. -# -# If omitted, xmlfile defaults to the auto generated ${doc_prefix}/${doc_prefix}-docs.xml. +# [IGNOREHEADERS header1...] +# [DEPENDS depend1...] ) # -# The `gtkdoc-scangobj` program is used to get introspection information for -# the module. You should pass the target(s) to be scanned as LIRARIES. This -# will try to set the correct compiler and link flags for the introspection -# build to use, and the correct LD_LIBRARY_PATH for it to run, and the correct -# dependencies for the doc target. +# sourcedir must be the *full* path to the source directory. # -# You *can* also set the compile and link flags manually, using the 'CFLAGS' -# and 'LDFLAGS' options. The 'LDPATH' option controls the LD_LIBRARY_PATH. You -# can also manually add additional targets as dependencies of the -# documentation build with the DEPENDS option. -# -# This function a target named "doc-${doc_prefix}". You will need to manually -# add it to the ALL target if you want it to be built by default, you can do -# something like this: -# -# gtk_doc_add_module(doc-mymodule -# SOURCE ${CMAKE_SOURCE_DIR}/module ${CMAKE_BINARY_DIR}/module -# LIBRARIES mylibrary -# LIBRARY_DIRS ${GLIB_LIBRARY_DIRS} ${FOO_LIBRARY_DIRS} -# add_custom_target(all-documentation ALL) -# add_dependencies(all-documentation doc-mymodule) -# -function(gtk_doc_add_module _doc_prefix) - set(_one_value_args "XML") - set(_multi_value_args "FIXXREFOPTS" "IGNOREHEADERS" "LIBRARIES" "LIBRARY_DIRS" "SOURCE" "SUFFIXES" - "CFLAGS" "DEPENDS" "LDFLAGS" "LDPATH") - cmake_parse_arguments("GTK_DOC" "" "${_one_value_args}" "${_multi_value_args}" ${ARGN}) - - if(NOT GTK_DOC_SOURCE) - message(FATAL_ERROR "No SOURCE specified for gtk_doc_add_module ${_doc_prefix}") - endif() - - set(_xml_file ${GTK_DOC_XML}) - - set(_fixxrefopts ${GTK_DOC_FIXXREFOPTS}) - set(_ignore_headers ${GTK_DOC_IGNOREHEADERS}) - set(_libraries ${GTK_DOC_LIBRARIES}) - set(_library_dirs ${GTK_DOC_LIBRARY_DIRS}) - set(_suffixes ${GTK_DOC_SUFFIXES}) - - set(_extra_cflags ${GTK_DOC_CFLAGS}) - set(_depends ${GTK_DOC_DEPENDS}) - set(_extra_ldflags ${GTK_DOC_LDFLAGS}) - set(_extra_ldpath ${GTK_DOC_LDPATH}) +# If omitted, sgmlfile defaults to the auto generated ${doc_prefix}/${doc_prefix}-docs.xml. +function(gtk_doc_add_module _doc_prefix _doc_sourcedir) + set (_multi_value DEPENDS XML FIXXREFOPTS IGNOREHEADERS CFLAGS LDFLAGS LDPATH SUFFIXES) + cmake_parse_arguments (ARG "" "" "${_multi_value}" ${ARGN}) - if(_suffixes) + list(LENGTH ARG_XML _xml_file_length) + + if(ARG_SUFFIXES) set(_doc_source_suffixes "") - foreach(_suffix ${_suffixes}) + foreach(_suffix ${ARG_SUFFIXES}) if(_doc_source_suffixes) set(_doc_source_suffixes "${_doc_source_suffixes},${_suffix}") else(_doc_source_suffixes) set(_doc_source_suffixes "${_suffix}") endif(_doc_source_suffixes) endforeach(_suffix) - else(_suffixes) + else(ARG_SUFFIXES) set(_doc_source_suffixes "h") - endif(_suffixes) + endif(ARG_SUFFIXES) + + set(_do_all ALL) - # Parse the LIBRARIES option and collect compile and link flags for those - # targets. - foreach(target ${_libraries}) - _gtk_doc_get_cflags_for_target(_target_cflags ${target}) - _gtk_doc_get_ldflags_for_target(_target_ldflags ${target} "${_libraries}") - list(APPEND _extra_cflags ${_target_cflags}) - list(APPEND _extra_ldflags ${_target_ldflags}) - list(APPEND _extra_ldpath $) - - list(APPEND _depends ${target}) - endforeach() - - # Link directories can't be specified per target, only for every target - # under a given directory. - get_property(all_library_directories DIRECTORY PROPERTY LINK_DIRECTORIES) - foreach(library_dir ${all_library_directories}) - list(APPEND _extra_ldflags ${CMAKE_LIBRARY_PATH_FLAG}${library_dir}) - list(APPEND _extra_ldpath ${library_dir}) - endforeach() - - # a directory to store output. - set(_output_dir "${CMAKE_CURRENT_BINARY_DIR}/${_doc_prefix}") - set(_output_dir_stamp "${_output_dir}/dir.stamp") - - # set default sgml file if not specified - set(_default_xml_file "${_output_dir}/${_doc_prefix}-docs.xml") - get_filename_component(_default_xml_file ${_default_xml_file} ABSOLUTE) - - # a directory to store html output. - set(_output_html_dir "${_output_dir}/html") - set(_output_html_dir_stamp "${_output_dir}/html_dir.stamp") - - # The output files - set(_output_decl_list "${_output_dir}/${_doc_prefix}-decl-list.txt") - set(_output_decl "${_output_dir}/${_doc_prefix}-decl.txt") - set(_output_overrides "${_output_dir}/${_doc_prefix}-overrides.txt") - set(_output_sections "${_output_dir}/${_doc_prefix}-sections.txt") - set(_output_types "${_output_dir}/${_doc_prefix}.types") - - set(_output_signals "${_output_dir}/${_doc_prefix}.signals") - - set(_output_unused "${_output_dir}/${_doc_prefix}-unused.txt") - set(_output_undeclared "${_output_dir}/${_doc_prefix}-undeclared.txt") - set(_output_undocumented "${_output_dir}/${_doc_prefix}-undocumented.txt") - - set(_output_xml_dir "${_output_dir}/xml") - set(_output_sgml_stamp "${_output_dir}/sgml.stamp") - - set(_output_html_stamp "${_output_dir}/html.stamp") - - # add a command to create output directory - add_custom_command( - OUTPUT "${_output_dir_stamp}" "${_output_dir}" - COMMAND ${CMAKE_COMMAND} -E make_directory "${_output_dir}" - COMMAND ${CMAKE_COMMAND} -E touch ${_output_dir_stamp} - VERBATIM) - - set(_ignore_headers_opt "") - if(_ignore_headers) - set(_ignore_headers_opt "--ignore-headers=") - foreach(_header ${_ignore_headers}) - set(_ignore_headers_opt "${_ignore_headers_opt}${_header} ") - endforeach(_header ${_ignore_headers}) - endif(_ignore_headers) - - foreach(source_dir ${GTK_DOC_SOURCE}) - set(_source_dirs_opt ${_source_dirs_opt} --source-dir=${source_dir}) - endforeach() - - # add a command to scan the input - add_custom_command( - OUTPUT - "${_output_decl_list}" - "${_output_decl}" - "${_output_overrides}" - "${_output_sections}" - "${_output_types}" - DEPENDS - "${_output_dir_stamp}" - ${_depends} - COMMAND - ${GTKDOC_SCAN_EXE} - --module=${_doc_prefix} - ${_ignore_headers_opt} - ${_source_dirs_opt} - --rebuild-sections - --rebuild-types - WORKING_DIRECTORY ${_output_dir} - VERBATIM) - - # add a command to scan the input via gtkdoc-scangobj - # This is such a disgusting hack! - add_custom_command( - OUTPUT - ${_output_signals} - DEPENDS - ${_output_types} - COMMAND ${CMAKE_COMMAND} - -D "GTKDOC_SCANGOBJ_EXE:STRING=${GTKDOC_SCANGOBJ_EXE}" - -D "doc_prefix:STRING=${_doc_prefix}" - -D "output_types:STRING=${_output_types}" - -D "output_dir:STRING=${_output_dir}" - -D "EXTRA_CFLAGS:STRING=${_extra_cflags}" - -D "EXTRA_LDFLAGS:STRING=${_extra_ldflags}" - -D "EXTRA_LDPATH:STRING=${_extra_ldpath}" - -P ${GTKDOC_SCANGOBJ_WRAPPER} - WORKING_DIRECTORY "${_output_dir}" - VERBATIM) - - set(_copy_xml_if_needed "") - if(_xml_file) - get_filename_component(_xml_file ${_xml_file} ABSOLUTE) - set(_copy_xml_if_needed - COMMAND ${CMAKE_COMMAND} -E copy "${_xml_file}" "${_default_xml_file}") - endif(_xml_file) - - set(_remove_xml_if_needed "") - if(_xml_file) - set(_remove_xml_if_needed - COMMAND ${CMAKE_COMMAND} -E remove ${_default_xml_file}) - endif(_xml_file) - - # add a command to make the database - add_custom_command( - OUTPUT - ${_output_sgml_stamp} - ${_default_xml_file} - DEPENDS - ${_output_types} - ${_output_signals} - ${_output_sections} - ${_output_overrides} - ${_depends} - ${_remove_xml_if_needed} - COMMAND ${CMAKE_COMMAND} -E remove_directory ${_output_xml_dir} - COMMAND ${GTKDOC_MKDB_EXE} - --module=${_doc_prefix} - ${_source_dirs_opt} - --source-suffixes=${_doc_source_suffixes} - --output-format=xml - --main-sgml-file=${_default_xml_file} - ${_copy_xml_if_needed} - WORKING_DIRECTORY "${_output_dir}" - VERBATIM) - - # add a command to create html directory - add_custom_command( - OUTPUT "${_output_html_dir_stamp}" "${_output_html_dir}" - COMMAND ${CMAKE_COMMAND} -E make_directory ${_output_html_dir} - COMMAND ${CMAKE_COMMAND} -E touch ${_output_html_dir_stamp} - VERBATIM) - - # add a command to output HTML - add_custom_command( - OUTPUT - ${_output_html_stamp} - DEPENDS - ${_output_html_dir_stamp} - ${_output_sgml_stamp} - ${_xml_file} - ${_depends} - ${_copy_xml_if_needed} - # The binary dir needs adding to --path in order for mkhtml to pick up - # any version.xml file there might be in there - COMMAND - cd ${_output_html_dir} && ${GTKDOC_MKHTML_EXE} - ${_doc_prefix} - ${_default_xml_file} - COMMAND - cd ${_output_dir} && ${GTKDOC_FIXXREF_EXE} - --module=${_doc_prefix} - --module-dir=${_output_html_dir} - ${_fixxref_opts} - COMMENT - "Generating HTML documentation for ${_doc_prefix} module with gtkdoc-mkhtml" - VERBATIM) - - add_custom_target(doc-${_doc_prefix} - DEPENDS "${_output_html_stamp}") - - add_test(doc-${_doc_prefix}-check ${GTKDOC_CHECK_EXE}) - set_tests_properties(doc-${_doc_prefix}-check PROPERTIES - ENVIRONMENT "DOC_MODULE=${_doc_prefix};DOC_MAIN_SGML_FILE=${_doc_prefix}-docs.xml;SRCDIR=${_source_dirs_opt};BUILDDIR=${_output_dir}" - ) + set(_opts_valid 1) + if(NOT _xml_file_length LESS 2) + message(SEND_ERROR "Must have at most one sgml file specified.") + set(_opts_valid 0) + endif(NOT _xml_file_length LESS 2) + + if(_opts_valid) + # a directory to store output. + set(_output_dir "${CMAKE_CURRENT_BINARY_DIR}/${_doc_prefix}") + set(_output_dir_stamp "${_output_dir}/dir.stamp") + + # set default sgml file if not specified + set(_default_xml_file "${_output_dir}/${_doc_prefix}-docs.xml") + get_filename_component(_default_xml_file ${_default_xml_file} ABSOLUTE) + + # a directory to store html output. + set(_output_html_dir "${_output_dir}/html") + set(_output_html_dir_stamp "${_output_dir}/html_dir.stamp") + + # The output files + set(_output_decl_list "${_output_dir}/${_doc_prefix}-decl-list.txt") + set(_output_decl "${_output_dir}/${_doc_prefix}-decl.txt") + set(_output_overrides "${_output_dir}/${_doc_prefix}-overrides.txt") + set(_output_sections "${_output_dir}/${_doc_prefix}-sections.txt") + set(_output_types "${_output_dir}/${_doc_prefix}.types") + + set(_output_signals "${_output_dir}/${_doc_prefix}.signals") + + set(_output_unused "${_output_dir}/${_doc_prefix}-unused.txt") + set(_output_undeclared "${_output_dir}/${_doc_prefix}-undeclared.txt") + set(_output_undocumented "${_output_dir}/${_doc_prefix}-undocumented.txt") + set(_output_tmpl_dir "${_output_dir}/tmpl") + set(_output_tmpl_stamp "${_output_dir}/tmpl.stamp") + + set(_output_xml_dir "${_output_dir}/xml") + set(_output_sgml_stamp "${_output_dir}/sgml.stamp") + + set(_output_html_stamp "${_output_dir}/html.stamp") + + # add a command to create output directory + add_custom_command( + OUTPUT "${_output_dir_stamp}" "${_output_dir}" + COMMAND ${CMAKE_COMMAND} -E make_directory "${_output_dir}" + COMMAND ${CMAKE_COMMAND} -E touch ${_output_dir_stamp} + VERBATIM) + + set(_ignore_headers_opt "") + if(ARG_IGNOREHEADERS) + set(_ignore_headers_opt "--ignore-headers=") + foreach(_header ${ARG_IGNOREHEADERS}) + set(_ignore_headers_opt "${_ignore_headers_opt}${_header} ") + endforeach(_header ${ARG_IGNOREHEADERS}) + endif(ARG_IGNOREHEADERS) + + # add a command to scan the input + add_custom_command( + OUTPUT + "${_output_decl_list}" + "${_output_decl}" + "${_output_decl}.bak" + "${_output_overrides}" + "${_output_sections}" + "${_output_types}" + "${_output_types}.bak" + DEPENDS + "${_output_dir}" + ${ARG_DEPENDS} + COMMAND ${GTKDOC_SCAN_EXE} + "--module=${_doc_prefix}" + "${_ignore_headers_opt}" + "--rebuild-sections" + "--rebuild-types" + "--source-dir=${_doc_sourcedir}" + WORKING_DIRECTORY "${_output_dir}" + VERBATIM) + + # add a command to scan the input via gtkdoc-scangobj + # This is such a disgusting hack! + add_custom_command( + OUTPUT + "${_output_signals}" + DEPENDS + "${_output_types}" + "${ARG_DEPENDS}" + COMMAND ${CMAKE_COMMAND} + -D "GTKDOC_SCANGOBJ_EXE:STRING=${GTKDOC_SCANGOBJ_EXE}" + -D "doc_prefix:STRING=${_doc_prefix}" + -D "output_types:STRING=${_output_types}" + -D "output_dir:STRING=${_output_dir}" + -D "EXTRA_CFLAGS:STRING=${ARG_CFLAGS}" + -D "EXTRA_LDFLAGS:STRING=${ARG_LDFLAGS}" + -D "EXTRA_LDPATH:STRING=${ARG_LDPATH}" + -P ${GTKDOC_SCANGOBJ_WRAPPER} + WORKING_DIRECTORY "${_output_dir}" + VERBATIM) + + # add a command to make the templates + add_custom_command( + OUTPUT + "${_output_unused}" + "${_output_undeclared}" + "${_output_undocumented}" + "${_output_tmpl_dir}" + "${_output_tmpl_stamp}" + DEPENDS + "${_output_types}" + "${_output_signals}" + "${_output_sections}" + "${_output_overrides}" + ${ARG_DEPENDS} + COMMAND ${CMAKE_COMMAND} -E remove_directory ${_output_tmpl_dir} + COMMAND ${GTKDOC_MKTMPL_EXE} + "--module=${_doc_prefix}" + WORKING_DIRECTORY "${_output_dir}" + VERBATIM) + + set(_copy_xml_if_needed "") + if(ARG_XML) + get_filename_component(ARG_XML ${ARG_XML} ABSOLUTE) + set(_copy_xml_if_needed + COMMAND ${CMAKE_COMMAND} -E copy "${ARG_XML}" "${_default_xml_file}") + endif(ARG_XML) + + set(_remove_xml_if_needed "") + if(ARG_XML) + set(_remove_xml_if_needed + COMMAND ${CMAKE_COMMAND} -E remove ${_default_xml_file}) + endif(ARG_XML) + + # add a command to make the database + add_custom_command( + OUTPUT + "${_output_sgml_stamp}" + "${_default_xml_file}" + DEPENDS + "${_output_tmpl_stamp}" + "${_output_unused}" + "${_output_undeclared}" + "${_output_undocumented}" + ${ARG_DEPENDS} + ${_remove_xml_if_needed} + COMMAND ${CMAKE_COMMAND} -E remove_directory ${_output_xml_dir} + COMMAND ${GTKDOC_MKDB_EXE} + "--module=${_doc_prefix}" + "--source-dir=${_doc_sourcedir}" + "--source-suffixes=${_doc_source_suffixes}" + "--output-format=xml" + "--main-sgml-file=${_default_xml_file}" + ${_copy_xml_if_needed} + WORKING_DIRECTORY "${_output_dir}" + VERBATIM) + + # add a command to create html directory + add_custom_command( + OUTPUT "${_output_html_dir_stamp}" "${_output_html_dir}" + COMMAND ${CMAKE_COMMAND} -E make_directory ${_output_html_dir} + COMMAND ${CMAKE_COMMAND} -E touch ${_output_html_dir_stamp} + VERBATIM) + + # add a command to output HTML + add_custom_command( + OUTPUT + "${_output_html_stamp}" + DEPENDS + "${_output_html_dir_stamp}" + "${_output_sgml_stamp}" + "${_output_tmpl_stamp}" + "${ARG_XML}" + ${ARG_DEPENDS} + ${_copy_xml_if_needed} + COMMAND ${GTKDOC_MKHTML_EXE} + "${_doc_prefix}" + "${_default_xml_file}" + WORKING_DIRECTORY "${_output_html_dir}" + VERBATIM) + + # fix output refs + add_custom_target("${_doc_prefix}-gtxdoc-fixxref" + DEPENDS + "${_output_html_stamp}" + ${ARG_DEPENDS} + COMMAND ${GTKDOC_FIXXREF_EXE} + "--module=${_doc_prefix}" + "--module-dir=." + ${ARG_FIXXREFOPTS} + #${_remove_xml_if_needed} + WORKING_DIRECTORY "${_output_dir}" + VERBATIM) + + add_custom_target(doc-${_doc_prefix} ${_do_all} + DEPENDS + "${_doc_prefix}-gtxdoc-fixxref" + ${ARG_DEPENDS}) + + add_test(doc-${_doc_prefix}-check ${GTKDOC_CHECK_EXE}) + set_tests_properties(doc-${_doc_prefix}-check PROPERTIES + ENVIRONMENT "DOC_MODULE=${_doc_prefix};DOC_MAIN_SGML_FILE=${_doc_prefix}-docs.xml;SRCDIR=${_doc_sourcedir};BUILDDIR=${_output_dir}" + ) + endif(_opts_valid) endfunction(gtk_doc_add_module) diff -Nru hud-14.10+17.10.20170619/debian/bzr-builder.manifest hud-14.10+17.10.20170619/debian/bzr-builder.manifest --- hud-14.10+17.10.20170619/debian/bzr-builder.manifest 2019-01-15 09:27:17.000000000 +0000 +++ hud-14.10+17.10.20170619/debian/bzr-builder.manifest 2019-01-16 05:54:43.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debversion}+201901150927 -lp:~khurshid-alam/hud/fix-build-disco revid:khurshid.alam@linuxmail.org-20190115092608-u93260gdja964idj +# bzr-builder format 0.3 deb-version {debversion}+201901160554 +lp:hud revid:mitya57@ubuntu.com-20180130195330-qohbnam1g85l43ue diff -Nru hud-14.10+17.10.20170619/debian/changelog hud-14.10+17.10.20170619/debian/changelog --- hud-14.10+17.10.20170619/debian/changelog 2019-01-15 09:27:17.000000000 +0000 +++ hud-14.10+17.10.20170619/debian/changelog 2019-01-16 05:54:43.000000000 +0000 @@ -1,8 +1,8 @@ -hud (14.10+17.10.20170619-0ubuntu2+201901150927~ubuntu19.04.1) disco; urgency=low +hud (14.10+17.10.20170619-0ubuntu2+201901160554~ubuntu19.04.1) disco; urgency=low * Auto build. - -- Khurshid Alam Tue, 15 Jan 2019 09:27:17 +0000 + -- Khurshid Alam Wed, 16 Jan 2019 05:54:43 +0000 hud (14.10+17.10.20170619-0ubuntu2) bionic; urgency=medium