Browse Source

Refresh patch queue

Christoph Biedl 2 years ago
parent
commit
00ede1f024

+ 1 - 1
debian/patches/debian/2021-04-19.non-usrmerged.patch

@@ -12,5 +12,5 @@ Forwarded: not-needed
 -systemunitdir = join_paths(get_option('prefix'), 'lib/systemd/system')
 +systemunitdir = join_paths('/lib/systemd/system')
  licensedir = join_paths(get_option('prefix'), 'share', 'licenses', meson.project_name())
- if build_machine.system() == 'freebsd'
+ if host_machine.system() == 'freebsd'
    licensedir += '-'+meson.project_version()

+ 1 - 1
debian/patches/debian/2021-09-30.use-var-lib.patch

@@ -6,7 +6,7 @@ Forwarded: not-needed
 --- a/meson.build
 +++ b/meson.build
 @@ -19,7 +19,7 @@
- if build_machine.system() == 'freebsd'
+ if host_machine.system() == 'freebsd'
    licensedir += '-'+meson.project_version()
  endif
 -jwkdir = join_paths(get_option('localstatedir'), 'db', meson.project_name())

+ 4 - 4
debian/patches/for-upstream/2018-08-11.use-asciidoctor-to-build-manpages.patch

@@ -5,7 +5,7 @@ Bug: https://github.com/latchset/tang/issues/32
 
 --- a/meson.build
 +++ b/meson.build
-@@ -49,7 +49,7 @@
+@@ -51,7 +51,7 @@
  )
  
  jose = dependency('jose', version: '>=8')
@@ -14,7 +14,7 @@ Bug: https://github.com/latchset/tang/issues/32
  compiler = meson.get_compiler('c')
  if not compiler.has_header('http_parser.h',args : '-I/usr/local/include')
    error('http-parser devel files not found.')
-@@ -72,16 +72,16 @@
+@@ -78,16 +78,16 @@
  install_data(units, install_dir: systemunitdir)
  install_data(licenses, install_dir: licensedir)
  
@@ -22,7 +22,7 @@ Bug: https://github.com/latchset/tang/issues/32
 +if asciidoctor.found()
    foreach m : mans
      custom_target(m.split('/')[-1], input: m + '.adoc', output: m.split('/')[-1],
--      command: [a2x, '-f', 'manpage', '-D', meson.current_build_dir(), '@INPUT@'],
+-      command: [a2x, '--attribute=' + build_machine.system(), '-f', 'manpage', '-D', meson.current_build_dir(), '@INPUT@'],
 +      command: [asciidoctor, '--attribute', 'reproducible', '--backend=manpage', '-D', meson.current_build_dir(), '@INPUT@'],
        install_dir: join_paths(get_option('mandir'), 'man' + m.split('.')[-1]),
        install: true
@@ -30,7 +30,7 @@ Bug: https://github.com/latchset/tang/issues/32
    endforeach
  else
 -  warning('Will not build man pages due to missing a2x (asciidoc) dependency!')
-+  warning('Will not build man pages due to missing asciidoctor (asciidoc) dependency!')
++  warning('Will not build man pages due to missing asciidoctor dependency!')
  endif
  
  # vim:set ts=2 sw=2 et: