applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Drop all references to clutter-gtk

Browse source 
It's currently just added whenever cheese is enabled, however that should
be already an indirect dependency. There is no need for it to explicitly
to be explicitly linked here.

And same goes for CI Docker files, the dependency will be indirectly
installed through cheese anyway.
This commit is contained in:
Carlos Garnacho 2018-10-11 00:41:59 +02:00 • committed by Georges Basile Stavracas Neto
parent d51336c2c2
commit 697789083d
4 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build-aux/ci/Dockerfile.arm64v8.fedora.rawhide
View file

@ -10,7 +10,7 @@ ADD x86_64_qemu-aarch64-static.tar.gz /usr/bin
RUN dnf -y --nogpgcheck upgrade && \
dnf -y install \
@c-development @development-tools clang \
accountsservice-devel cheese-libs-devel chrpath clutter-gtk-devel colord-devel \
accountsservice-devel cheese-libs-devel chrpath colord-devel \
colord-gtk-devel cups-devel desktop-file-utils docbook-style-xsl gdk-pixbuf2-devel \
gettext git glib2-devel gnome-bluetooth-libs-devel gnome-desktop3-devel \
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel \

2
build-aux/ci/Dockerfile.fedora.rawhide
View file

@ -8,7 +8,7 @@ LABEL description="Docker image to run CI for GNOME Settings."
RUN dnf -y --nogpgcheck upgrade && \
dnf -y install \
@c-development @development-tools clang \
accountsservice-devel cheese-libs-devel chrpath clutter-gtk-devel colord-devel \
accountsservice-devel cheese-libs-devel chrpath colord-devel \
colord-gtk-devel cups-devel desktop-file-utils docbook-style-xsl gdk-pixbuf2-devel \
gettext git glib2-devel gnome-bluetooth-libs-devel gnome-desktop3-devel \
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel \

2
build-aux/ci/Dockerfile.ppc64le.fedora.rawhide
View file

@ -10,7 +10,7 @@ ADD x86_64_qemu-ppc64le-static.tar.gz /usr/bin
RUN dnf -y --nogpgcheck upgrade && \
dnf -y install \
@c-development @development-tools clang \
accountsservice-devel cheese-libs-devel chrpath clutter-gtk-devel colord-devel \
accountsservice-devel cheese-libs-devel chrpath colord-devel \
colord-gtk-devel cups-devel desktop-file-utils docbook-style-xsl gdk-pixbuf2-devel \
gettext git glib2-devel gnome-bluetooth-libs-devel gnome-desktop3-devel \
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel \

4
meson.build
View file

@ -100,7 +100,6 @@ goa_req_version = '>= 3.25.3'
pulse_req_version = '>= 2.0'
accounts_dep = dependency('accountsservice', version: '>= 0.6.39')
clutter_gtk_dep = dependency('clutter-gtk-1.0', required: false)
colord_dep = dependency('colord', version: '>= 0.1.34')
gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: '>= 2.23.0')
gio_dep = dependency('gio-2.0')
@ -151,10 +150,7 @@ endforeach
# Optional dependency for the user accounts panel
enable_cheese = get_option('cheese')
if enable_cheese
assert(clutter_gtk_dep.found(), 'cheese support requested, but clutter-gtk library is not available. Use -Dcheese=false to build without it.')
cheese_deps = [
clutter_gtk_dep,
dependency('cheese', version: '>= 3.28.0'),
dependency('cheese-gtk', version: '>= 3.5.91')
]