[gnome-control-center/wip/rishi/background-remove-grilo] background: Drop the unused build dependency on Grilo
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/wip/rishi/background-remove-grilo] background: Drop the unused build dependency on Grilo
- Date: Tue, 20 Apr 2021 21:06:54 +0000 (UTC)
commit f85750274c2bbabac9ff6ee03150aeb1fdc8bc3d
Author: Debarshi Ray <debarshir gnome org>
Date: Tue Apr 20 23:00:28 2021 +0200
background: Drop the unused build dependency on Grilo
The code that uses Grilo to fetch the user's Flickr photos isn't
actually used by the Background panel, to the extent that the final
binary doesn't even link against Grilo. Getting rid of this unused code
will ensure that distributors aren't needlessly pulling in this
dependency.
https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1345
.gitlab-ci.yml | 1 -
build-aux/flatpak/org.gnome.Settings.json | 17 -
panels/background/bg-pictures-source.c | 855 --------------------------
panels/background/bg-pictures-source.h | 46 --
panels/background/cc-background-chooser.c | 1 -
panels/background/cc-background-grilo-miner.c | 315 ----------
panels/background/cc-background-grilo-miner.h | 31 -
panels/background/cc-background-panel.c | 2 -
panels/background/meson.build | 4 -
9 files changed, 1272 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a2aeed1b..86e6b27d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,6 @@ variables:
gnome-desktop3-devel
gnome-online-accounts-devel
gnome-settings-daemon-devel
- grilo-devel
gsettings-desktop-schemas-devel
gsound-devel
gtk3-devel ibus-devel
diff --git a/build-aux/flatpak/org.gnome.Settings.json b/build-aux/flatpak/org.gnome.Settings.json
index 3e19894b0..b64b4c2fd 100644
--- a/build-aux/flatpak/org.gnome.Settings.json
+++ b/build-aux/flatpak/org.gnome.Settings.json
@@ -485,23 +485,6 @@
}
]
},
- {
- "name" : "grilo",
- "buildsystem" : "meson",
- "config-opts" : [
- "-Denable-grl-pls=false",
- "-Denable-gtk-doc=false",
- "-Denable-introspection=false",
- "-Denable-test-ui=false",
- "-Denable-vala=false"
- ],
- "sources" : [
- {
- "type" : "git",
- "url" : "https://gitlab.gnome.org/GNOME/grilo.git"
- }
- ]
- },
{
"name" : "openldap",
"buildsystem" : "autotools",
diff --git a/panels/background/cc-background-chooser.c b/panels/background/cc-background-chooser.c
index 6c8f56136..04fd85c47 100644
--- a/panels/background/cc-background-chooser.c
+++ b/panels/background/cc-background-chooser.c
@@ -25,7 +25,6 @@
#include <libgnome-desktop/gnome-desktop-thumbnail.h>
#include "bg-colors-source.h"
-#include "bg-pictures-source.h"
#include "bg-recent-source.h"
#include "bg-wallpapers-source.h"
#include "cc-background-chooser.h"
diff --git a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c
index 29dedf165..3e50f506b 100644
--- a/panels/background/cc-background-panel.c
+++ b/panels/background/cc-background-panel.c
@@ -35,8 +35,6 @@
#include "cc-background-resources.h"
#include "cc-background-xml.h"
-#include "bg-pictures-source.h"
-
#define WP_PATH_ID "org.gnome.desktop.background"
#define WP_LOCK_PATH_ID "org.gnome.desktop.screensaver"
#define WP_URI_KEY "picture-uri"
diff --git a/panels/background/meson.build b/panels/background/meson.build
index e9fa398d4..eb5e9ec84 100644
--- a/panels/background/meson.build
+++ b/panels/background/meson.build
@@ -76,12 +76,10 @@ common_sources += gnome.compile_resources(
sources = common_sources + files(
'bg-colors-source.c',
- 'bg-pictures-source.c',
'bg-recent-source.c',
'bg-source.c',
'bg-wallpapers-source.c',
'cc-background-chooser.c',
- 'cc-background-grilo-miner.c',
'cc-background-item.c',
'cc-background-panel.c',
'cc-background-preview.c',
@@ -91,10 +89,8 @@ sources = common_sources + files(
deps = common_deps + [
gdk_pixbuf_dep,
gnome_desktop_dep,
- goa_dep,
libxml_dep,
dependency('cairo-gobject'),
- dependency('grilo-0.3', version: '>= 0.3.0')
]
cflags += [
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]