| 1 | diff --git a/data/io.github.kolunmi.Bazaar.desktop.in b/data/io.github.kolunmi.Bazaar.desktop.in
|
| 2 | index 2ce60419..734cb075 100644
|
| 3 | |
| 4 | |
| 5 | @@ -3,7 +3,7 @@
|
| 6 | Name=Bazaar
|
| 7 | GenericName=App Store
|
| 8 | Comment=Add, remove or update flatpak software on this computer
|
| 9 | -Exec=bazaar-daemon %U
|
| 10 | +Exec=bazaar %U
|
| 11 | Icon=io.github.kolunmi.Bazaar
|
| 12 | Terminal=false
|
| 13 | Type=Application
|
| 14 | @@ -16,4 +16,4 @@ X-Purism-FormFactor=Workstation;Mobile;
|
| 15 |
|
| 16 | [Desktop Action new-window]
|
| 17 | Name=New Window
|
| 18 | -Exec=bazaar-daemon %U
|
| 19 | +Exec=bazaar %U
|
| 20 | diff --git a/data/meson.build b/data/meson.build
|
| 21 | index 315bef7f..f9e233de 100644
|
| 22 | |
| 23 | |
| 24 | @@ -34,22 +34,4 @@ test('Validate schema file',
|
| 25 | args: ['--strict', '--dry-run', meson.current_source_dir()])
|
| 26 |
|
| 27 |
|
| 28 | -service_conf = configuration_data()
|
| 29 | -service_conf.set('bindir', get_option('prefix') / get_option('bindir'))
|
| 30 | -configure_file(
|
| 31 | - input: 'io.github.kolunmi.Bazaar.service.in',
|
| 32 | - output: 'io.github.kolunmi.Bazaar.service',
|
| 33 | - configuration: service_conf,
|
| 34 | - install_dir: get_option('prefix') / 'lib' / 'systemd' / 'user'
|
| 35 | -)
|
| 36 | -
|
| 37 | -service_conf = configuration_data()
|
| 38 | -configure_file(
|
| 39 | - input: 'io.github.kolunmi.Bazaar.search-provider.ini.in',
|
| 40 | - output: 'io.github.kolunmi.Bazaar.search-provider.ini',
|
| 41 | - configuration: service_conf,
|
| 42 | - install_dir: get_option('datadir') / 'gnome-shell' / 'search-providers'
|
| 43 | -)
|
| 44 | -
|
| 45 | subdir('icons')
|
| 46 | -subdir('dbus')
|
| 47 | diff --git a/src/meson.build b/src/meson.build
|
| 48 | index d55fa081..518a7e0f 100644
|
| 49 | |
| 50 | |
| 51 | @@ -18,8 +18,6 @@ libsecret_dep = dependency('libsecret-1', version: '>= 0.20')
|
| 52 | libproxy_dep = dependency('libproxy-1.0', version: '>= 0.5')
|
| 53 | malcontent_dep = dependency('malcontent-0', version: '>= 0.12.0')
|
| 54 | gtksourceview_dep = dependency('gtksourceview-5', version: '>= 5.17')
|
| 55 | -libsystemd_dep = dependency('libsystemd', version: '>= 245')
|
| 56 | -dbus_dep = dependency('dbus-1', version: '>= 1.12')
|
| 57 |
|
| 58 | dl_worker_sources = [
|
| 59 | 'env.c',
|
| 60 | @@ -40,16 +38,6 @@ dl_worker_exe = executable(dl_worker_bin_name, dl_worker_sources,
|
| 61 | install: true,
|
| 62 | )
|
| 63 |
|
| 64 | -
|
| 65 | -daemon_sources = [
|
| 66 | - 'bazaar-daemon.c',
|
| 67 | - 'search-index.c',
|
| 68 | -]
|
| 69 | -daemon_exe = executable(daemon_bin_name, daemon_sources,
|
| 70 | - dependencies: [libsystemd_dep, dbus_dep],
|
| 71 | - install: true,
|
| 72 | -)
|
| 73 | -
|
| 74 | marshalers = gnome.genmarshal('bz-marshalers',
|
| 75 | sources: 'bz-marshalers.list',
|
| 76 | prefix: 'bz_marshal',
|