diff --git a/data/io.github.kolunmi.Bazaar.desktop.in b/data/io.github.kolunmi.Bazaar.desktop.in index 2ce60419..734cb075 100644 --- a/data/io.github.kolunmi.Bazaar.desktop.in +++ b/data/io.github.kolunmi.Bazaar.desktop.in @@ -3,7 +3,7 @@ Name=Bazaar GenericName=App Store Comment=Add, remove or update flatpak software on this computer -Exec=bazaar-daemon %U +Exec=bazaar %U Icon=io.github.kolunmi.Bazaar Terminal=false Type=Application @@ -16,4 +16,4 @@ X-Purism-FormFactor=Workstation;Mobile; [Desktop Action new-window] Name=New Window -Exec=bazaar-daemon %U +Exec=bazaar %U diff --git a/data/meson.build b/data/meson.build index 315bef7f..f9e233de 100644 --- a/data/meson.build +++ b/data/meson.build @@ -34,22 +34,4 @@ test('Validate schema file', args: ['--strict', '--dry-run', meson.current_source_dir()]) -service_conf = configuration_data() -service_conf.set('bindir', get_option('prefix') / get_option('bindir')) -configure_file( - input: 'io.github.kolunmi.Bazaar.service.in', - output: 'io.github.kolunmi.Bazaar.service', - configuration: service_conf, - install_dir: get_option('prefix') / 'lib' / 'systemd' / 'user' -) - -service_conf = configuration_data() -configure_file( - input: 'io.github.kolunmi.Bazaar.search-provider.ini.in', - output: 'io.github.kolunmi.Bazaar.search-provider.ini', - configuration: service_conf, - install_dir: get_option('datadir') / 'gnome-shell' / 'search-providers' -) - subdir('icons') -subdir('dbus') diff --git a/src/meson.build b/src/meson.build index d55fa081..518a7e0f 100644 --- a/src/meson.build +++ b/src/meson.build @@ -18,8 +18,6 @@ libsecret_dep = dependency('libsecret-1', version: '>= 0.20') libproxy_dep = dependency('libproxy-1.0', version: '>= 0.5') malcontent_dep = dependency('malcontent-0', version: '>= 0.12.0') gtksourceview_dep = dependency('gtksourceview-5', version: '>= 5.17') -libsystemd_dep = dependency('libsystemd', version: '>= 245') -dbus_dep = dependency('dbus-1', version: '>= 1.12') dl_worker_sources = [ 'env.c', @@ -40,16 +38,6 @@ dl_worker_exe = executable(dl_worker_bin_name, dl_worker_sources, install: true, ) - -daemon_sources = [ - 'bazaar-daemon.c', - 'search-index.c', -] -daemon_exe = executable(daemon_bin_name, daemon_sources, - dependencies: [libsystemd_dep, dbus_dep], - install: true, -) - marshalers = gnome.genmarshal('bz-marshalers', sources: 'bz-marshalers.list', prefix: 'bz_marshal',