[epiphany] Revert "build: Add libhandy-0.0 dependency"
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Revert "build: Add libhandy-0.0 dependency"
- Date: Tue, 11 Dec 2018 03:24:43 +0000 (UTC)
commit 46cd03d4e2ff022f9491608e1d88ad978df2f8a0
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Mon Dec 10 21:08:13 2018 -0600
Revert "build: Add libhandy-0.0 dependency"
This reverts commit ed4b901e3a51bc448344ec5fd89e8f4430bb2262.
meson.build | 11 -----------
src/meson.build | 1 -
subprojects/libhandy.wrap | 4 ----
3 files changed, 16 deletions(-)
---
diff --git a/meson.build b/meson.build
index e85f15513..32d6dbc31 100644
--- a/meson.build
+++ b/meson.build
@@ -86,7 +86,6 @@ icu_uc_dep = dependency('icu-uc', version: '>= 4.6')
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.29.4', required: false)
-libhandy_dep = dependency('libhandy-0.0', version: '>= 0.0.5', required: false)
libnotify_dep = dependency('libnotify', version: '>= 0.5.1')
libsecret_dep = dependency('libsecret-1', version: '>= 0.14')
libsoup_dep = dependency('libsoup-2.4', version: '>= 2.48.0')
@@ -105,16 +104,6 @@ if not libdazzle_dep.found()
'with_vapi=false']).get_variable('libdazzle_dep')
endif
-# 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=false',
- 'introspection=false',
- '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)
diff --git a/src/meson.build b/src/meson.build
index 967ea1143..3d4c6d137 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -53,7 +53,6 @@ libephymain_deps = [
ephymisc_dep,
ephysync_dep,
ephywidgets_dep,
- libhandy_dep,
libnotify_dep
]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]