1 files changed, 4 insertions, 44 deletions
diff --git a/lib/tray/meson.build b/lib/tray/meson.build
index fbf2f98..139cfb1 100644
--- a/lib/tray/meson.build
+++ b/lib/tray/meson.build
@@ -39,29 +39,9 @@ deps = [
   dependency('gio-2.0'),
   dependency('json-glib-1.0'),
   dependency('gdk-pixbuf-2.0'),
-  dependency('gtk+-3.0'),
+  dependency('appmenu-glib-translator')
 ]
 
-dbusmenu_cflags = run_command(
-  find_program('pkg-config', required: true),
-  '--cflags', 'dbusmenu-gtk3-0.4',
-  'gobject-introspection-1.0',
-  'gobject-2.0',
-  'glib-2.0',
-  capture: true,
-  check: true,
-).stdout().strip()
-
-dbusmenu_libs = run_command(
-  find_program('pkg-config', required: true),
-  '--libs', 'dbusmenu-gtk3-0.4',
-  'gobject-introspection-1.0',
-  'gobject-2.0',
-  'glib-2.0',
-  capture: true,
-  check: true,
-).stdout().strip()
-
 sources = [config] + files('tray.vala', 'watcher.vala', 'trayItem.vala')
 
 if get_option('lib')
@@ -71,15 +51,13 @@ if get_option('lib')
     dependencies: deps,
     vala_header: meson.project_name() + '.h',
     vala_vapi: meson.project_name() + '-' + api_version + '.vapi',
-    vala_args: ['--vapi-comments', '--pkg', 'DbusmenuGtk3-0.4', '--pkg', 'Dbusmenu-0.4'],
+    vala_args: ['--vapi-comments'],
     version: meson.project_version(),
-    c_args: dbusmenu_cflags.split(' '),
-    link_args: dbusmenu_libs.split(' '),
     install: true,
     install_dir: [true, true, true]
   )
 
-  pkgs = ['--pkg', 'DbusmenuGtk3-0.4', '--pkg', 'Dbusmenu-0.4']
+  pkgs = []
   foreach dep : deps
     pkgs += ['--pkg=' + dep.name()]
   endforeach
@@ -120,31 +98,13 @@ if get_option('lib')
     requires: deps,
     install_dir: get_option('libdir') / 'pkgconfig',
   )
-  #
-  # custom_target(
-  #   typelib,
-  #   command: [
-  #     find_program('g-ir-compiler'),
-  #     '--output', '@OUTPUT@',
-  #     '--shared-library', get_option('prefix') / get_option('libdir') / '@PLAINNAME@',
-  #     meson.current_build_dir() / gir,
-  #   ],
-  #   input: lib,
-  #   output: typelib,
-  #   depends: lib,
-  #   install: true,
-  #   install_dir: get_option('libdir') / 'girepository-1.0',
-  # )
-endif
+  endif
 
 if get_option('cli')
   executable(
     meson.project_name(),
     ['cli.vala', sources],
     dependencies: deps,
-    vala_args: ['--pkg', 'DbusmenuGtk3-0.4', '--pkg', 'Dbusmenu-0.4'],
-    c_args: dbusmenu_cflags.split(' '),
-    link_args: dbusmenu_libs.split(' '),
     install: true,
   )
 endif