0001-Revert-build-Always-build-gupnp-binding-tool-manpage.patch 1.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960
  1. From 9225b076d107538209fbd5b8bbc21a68d1b2c016 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Wed, 15 Jul 2020 22:42:44 +0200
  4. Subject: [PATCH] Revert "build: Always build gupnp-binding-tool manpage"
  5. This reverts commit 23f54c2a1e8718e836224d68dafded091604a677 until
  6. upstream decides what to do between adding a new option or renaming
  7. gtk_doc into documentation:
  8. https://gitlab.gnome.org/GNOME/gupnp/-/issues/17
  9. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  10. ---
  11. doc/meson.build | 2 --
  12. meson.build | 5 ++++-
  13. 2 files changed, 4 insertions(+), 3 deletions(-)
  14. diff --git a/doc/meson.build b/doc/meson.build
  15. index b71b657..478650b 100644
  16. --- a/doc/meson.build
  17. +++ b/doc/meson.build
  18. @@ -4,7 +4,6 @@ version_xml = configure_file(input: 'version.xml.in',
  19. output: 'version.xml', configuration:
  20. entities)
  21. -if get_option('gtk_doc')
  22. gnome.gtkdoc('gupnp',
  23. main_xml : 'gupnp-docs.xml',
  24. src_dir : [join_paths(meson.source_root(), 'libgupnp'),
  25. @@ -27,7 +26,6 @@ gnome.gtkdoc('gupnp',
  26. 'gupnp-types-private.h'
  27. ],
  28. install : true)
  29. -endif
  30. xsltproc = find_program('xsltproc', required: false)
  31. if xsltproc.found()
  32. diff --git a/meson.build b/meson.build
  33. index 28c40b2..dea0a49 100644
  34. --- a/meson.build
  35. +++ b/meson.build
  36. @@ -31,12 +31,15 @@ dependencies = [
  37. subdir('libgupnp')
  38. subdir('tests')
  39. subdir('tools')
  40. -subdir('doc')
  41. if get_option('vapi') and get_option('introspection')
  42. subdir('vala')
  43. endif
  44. +if get_option('gtk_doc')
  45. + subdir('doc')
  46. +endif
  47. +
  48. if get_option('examples')
  49. subdir('examples')
  50. endif
  51. --
  52. 2.27.0