[gedit] build: continue to simplify deps



commit 7c29c252ad8fce86e7b20fd9a7dd07b242a49f71
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sat Mar 14 15:06:05 2020 +0100

    build: continue to simplify deps
    
    libpeas is pulled in by libpeas-gtk.
    
    simplify code.

 docs/reference/meson.build |  1 -
 gedit/meson.build          |  1 -
 meson.build                | 15 ++++-----------
 3 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 1b686158b..edac1919c 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -15,7 +15,6 @@ gedit_doc_deps = [
   gtk_dep,
   gtksourceview_dep,
   tepl_dep,
-  libpeas_dep,
   libpeas_gtk_dep,
 ]
 
diff --git a/gedit/meson.build b/gedit/meson.build
index 8fd3d820e..0a7f2dccf 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -115,7 +115,6 @@ libgedit_deps = [
   gtksourceview_dep,
   tepl_dep,
   introspection_dep,
-  libpeas_dep,
   libpeas_gtk_dep,
   libgd_dep,
 ]
diff --git a/meson.build b/meson.build
index 407bc05eb..29718df69 100644
--- a/meson.build
+++ b/meson.build
@@ -50,16 +50,15 @@ libgd_subproject = subproject(
 libgd_dep = libgd_subproject.get_variable('libgd_dep')
 
 # Dependencies
-libpeas_req = '>= 1.14.1'
-
 gio_dep = dependency('gio-2.0', version: '>= 2.52')
 gtk_dep = dependency('gtk+-3.0', version: '>= 3.22')
 gtksourceview_dep = dependency('gtksourceview-4', version: '>= 4.0.2')
 tepl_dep = dependency('tepl-4', version: '>= 4.4')
-libpeas_dep = dependency('libpeas-1.0', version: libpeas_req)
-libpeas_gtk_dep = dependency('libpeas-gtk-1.0', version: libpeas_req)
+libpeas_gtk_dep = dependency('libpeas-gtk-1.0', version: '>= 1.14.1')
 gspell_dep = dependency('gspell-1', version: '>= 1.0')
-x11_dep = dependency('x11', required: false)
+
+x11_dep_required = (host_machine.system() != 'darwin') and (host_machine.system() != 'windows')
+x11_dep = dependency('x11', required: x11_dep_required)
 
 introspection_dep = dependency('gobject-introspection-1.0')
 vapigen_dep = dependency('vapigen', version: '>= 0.25.1')
@@ -72,12 +71,6 @@ if build_checkupdate_plugin
 endif
 
 # Configurations
-if ((host_machine.system() != 'darwin') and
-    (host_machine.system() != 'windows') and
-    (not x11_dep.found()))
-  error('Native dependency \'x11\' not found.')
-endif
-
 config_h = configuration_data()
 config_h.set_quoted('PACKAGE_STRING', package_string)
 config_h.set_quoted('GETTEXT_PACKAGE', meson.project_name())


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]