pkgs/development/libraries/malcontent/better-separation.patch

   1 commit 363c5be465dd6dde35c3d31abd7b5cca9b1f3a9f
   2 Author: Jan Tojnar <jtojnar@gmail.com>
   3 Date:   Thu Jul 23 18:49:03 2020 +0200
   4
   5     Improve separation between malcontent and malcontent-ui packages
   6
   7     These artefacts go into both packages by default:
   8
   9     * malcontent-control – a CLI tool
  10     * PAM module
  11     * gettext locale data
  12     * help pages ✨
  13     * AccountService/D-Bus interfaces
  14     * Polkit com.endlessm.ParentalControls rules and policy
  15
  16     Items marked with ✨ will go to ui package, while the rest is installed with the base library.
  17
  18     See also the packaging done by upstream in Endless:
  19     https://github.com/endlessm/malcontent/tree/5482b7eb99aee9b8c344629bc078e193d3c26ffc/debian
  20
  21     Cannot upstream this since they are worried about maintainability:
  22     https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/38#note_437946
  23
  24 diff --git a/meson.build b/meson.build
  25 index 6e1dfa5..196350b 100644
  26 --- a/meson.build
  27 +++ b/meson.build
  28 @@ -123,9 +123,8 @@ test_env = [
  29    'LC_ALL=C.UTF-8',
  30  ]
  31
  32 -subdir('accounts-service')
  33 -subdir('help')
  34  if not get_option('use_system_libmalcontent')
  35 +  subdir('accounts-service')
  36    subdir('libmalcontent')
  37  else
  38    libmalcontent_api_version = '0'
  39 @@ -136,11 +135,16 @@ endif
  40  if get_option('ui').enabled()
  41    subdir('libmalcontent-ui')
  42  endif
  43 -subdir('malcontent-client')
  44 +if not get_option('use_system_libmalcontent')
  45 +  subdir('malcontent-client')
  46 +endif
  47  if get_option('ui').enabled()
  48    subdir('malcontent-control')
  49 +  subdir('help')
  50 +endif
  51 +if not get_option('use_system_libmalcontent')
  52 +  subdir('pam')
  53 +  subdir('po')
  54  endif
  55 -subdir('pam')
  56 -subdir('po')
  57
  58  meson.add_install_script('build-aux/meson_post_install.py')