diff options
| author | Felipe Borges <felipeborges@gnome.org> | 2021-09-27 10:32:31 +0200 |
|---|---|---|
| committer | Felipe Borges <felipeborges@gnome.org> | 2021-11-01 12:50:22 +0000 |
| commit | 8029bf706f2e53b545f1feddefbfde52d5f48f1c (patch) | |
| tree | def42b171ad4b587e86626a410a4ad0080acbdb5 | |
| parent | 39b9e0f8acbcae03382de2aacc496b546e1401bf (diff) | |
| download | gnome-control-center-remove-libhandy-as-subproject.tar.gz | |
Remove libhandy subprojectremove-libhandy-as-subproject
At this point libhandy is available in most of the popular and
enterprise distros. We no longer need to bundle it as a submodule.
Fixes #1470
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | meson.build | 16 | ||||
| m--------- | subprojects/libhandy | 0 |
4 files changed, 2 insertions, 18 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa8874c04..9981e63cc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,6 +96,7 @@ build.container.fedora@x86_64: libcanberra-devel libgtop2-devel libgudev-devel + libhandy1-devel libnma-devel libpwquality-devel libsmbclient-devel diff --git a/.gitmodules b/.gitmodules index 60b7a8dba..5ab4a386d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "subprojects/gvc"] path = subprojects/gvc url = https://gitlab.gnome.org/GNOME/libgnome-volume-control.git -[submodule "subprojects/libhandy"] - path = subprojects/libhandy - url = https://gitlab.gnome.org/GNOME/libhandy.git diff --git a/meson.build b/meson.build index 6e662e216..da4f8cb14 100644 --- a/meson.build +++ b/meson.build @@ -99,21 +99,6 @@ libgvc = subproject( ) libgvc_dep = libgvc.get_variable('libgvc_dep') -libhandy_dep = dependency('libhandy-1', version: '>= 1.2.0', required: false) -if not libhandy_dep.found() - libhandy = subproject( - 'libhandy', - default_options: [ - 'examples=false', - 'glade_catalog=disabled', - 'introspection=disabled', - 'tests=false', - 'vapi=false', - ] - ) - libhandy_dep = libhandy.get_variable('libhandy_dep') -endif - goa_req_version = '>= 3.25.3' pulse_req_version = '>= 2.0' @@ -126,6 +111,7 @@ gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.33.4') gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 3.27.90') goa_dep = dependency('goa-1.0', version: goa_req_version) gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 40.alpha') +libhandy_dep = dependency('libhandy-1', version: '>= 1.2.0') libxml_dep = dependency('libxml-2.0') pulse_dep = dependency('libpulse', version: pulse_req_version) pulse_mainloop_dep = dependency('libpulse-mainloop-glib', version: pulse_req_version) diff --git a/subprojects/libhandy b/subprojects/libhandy deleted file mode 160000 -Subproject 7b38a860ffcec6c2ad28153358cc3d037ddb618 |