[epiphany/mcatanzaro/system-libhandy] Require libhandy as a system dependency
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/mcatanzaro/system-libhandy] Require libhandy as a system dependency
- Date: Fri, 22 Nov 2019 18:02:09 +0000 (UTC)
commit a8799d67324a72756a549c1548991313da4f832e
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Fri Nov 22 12:01:33 2019 -0600
Require libhandy as a system dependency
libhandy has been around for a while now, so we shouldn't need to bundle
it anymore.
meson.build | 14 +-------------
subprojects/libhandy | 1 -
2 files changed, 1 insertion(+), 14 deletions(-)
---
diff --git a/meson.build b/meson.build
index 08e9787b4..031c61b71 100644
--- a/meson.build
+++ b/meson.build
@@ -92,7 +92,7 @@ hogweed_dep = dependency('hogweed', version: nettle_requirement)
iso_codes_dep = dependency('iso-codes', version: '>= 0.35')
json_glib_dep = dependency('json-glib-1.0', version: '>= 1.2.4')
libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.31.90')
-libhandy_dep = dependency('libhandy-0.0', version: '>= 0.0.10', required: false)
+libhandy_dep = dependency('libhandy-0.0', version: '>= 0.0.10')
libnotify_dep = dependency('libnotify', version: '>= 0.5.1')
libsecret_dep = dependency('libsecret-1', version: '>= 0.19.0')
libsoup_dep = dependency('libsoup-2.4', version: '>= 2.48.0')
@@ -102,18 +102,6 @@ sqlite3_dep = dependency('sqlite3', version: '>= 3.0')
webkit2gtk_dep = dependency('webkit2gtk-4.0', version: webkitgtk_requirement)
webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.0', version: webkitgtk_requirement)
-# Ubuntu 18.04 doesn't have libhandy at all, and we need 0.0.5, so bundle it if
-# the system copy is missing or too old.
-if not libhandy_dep.found()
- libhandy_dep = subproject('libhandy', default_options: ['examples=false',
- 'glade_catalog=disabled',
- 'introspection=disabled',
- 'package_subdir=epiphany',
- 'static=true',
- 'tests=false',
- 'vapi=false']).get_variable('libhandy_dep')
-endif
-
cc = meson.get_compiler('c')
gmp_dep = cc.find_library('gmp')
m_dep = cc.find_library('m', required: false)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]