Don't try to patch .gitlab-ci.yml

Fallout from b4d97a07bf

Resolves: #1952274
This commit is contained in:
Debarshi Ray 2021-04-28 15:16:34 +02:00
parent b4d97a07bf
commit 61d38d4111
2 changed files with 6 additions and 15 deletions

View File

@ -1,4 +1,4 @@
From f85750274c2bbabac9ff6ee03150aeb1fdc8bc3d Mon Sep 17 00:00:00 2001 From e2d3f71a37a7e587b0af2a9818377ec1ac098e79 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org> From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 20 Apr 2021 23:00:28 +0200 Date: Tue, 20 Apr 2021 23:00:28 +0200
Subject: [PATCH] background: Drop the unused build dependency on Grilo Subject: [PATCH] background: Drop the unused build dependency on Grilo
@ -9,9 +9,11 @@ binary doesn't even link against Grilo. Getting rid of this unused code
will ensure that distributors aren't needlessly pulling in this will ensure that distributors aren't needlessly pulling in this
dependency. dependency.
This patch has been customized for RHEL 9 to skip the .gitlab-ci.yml
file, which isn't part of the 'ninja dist' generated tarball.
https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1345 https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1345
--- ---
.gitlab-ci.yml | 1 -
build-aux/flatpak/org.gnome.Settings.json | 17 - build-aux/flatpak/org.gnome.Settings.json | 17 -
panels/background/bg-pictures-source.c | 855 ------------------ panels/background/bg-pictures-source.c | 855 ------------------
panels/background/bg-pictures-source.h | 46 - panels/background/bg-pictures-source.h | 46 -
@ -20,24 +22,12 @@ https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1345
panels/background/cc-background-grilo-miner.h | 31 - panels/background/cc-background-grilo-miner.h | 31 -
panels/background/cc-background-panel.c | 2 - panels/background/cc-background-panel.c | 2 -
panels/background/meson.build | 4 - panels/background/meson.build | 4 -
9 files changed, 1272 deletions(-) 8 files changed, 1271 deletions(-)
delete mode 100644 panels/background/bg-pictures-source.c delete mode 100644 panels/background/bg-pictures-source.c
delete mode 100644 panels/background/bg-pictures-source.h delete mode 100644 panels/background/bg-pictures-source.h
delete mode 100644 panels/background/cc-background-grilo-miner.c delete mode 100644 panels/background/cc-background-grilo-miner.c
delete mode 100644 panels/background/cc-background-grilo-miner.h delete mode 100644 panels/background/cc-background-grilo-miner.h
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a2aeed1bef8..86e6b27d682d 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 diff --git a/build-aux/flatpak/org.gnome.Settings.json b/build-aux/flatpak/org.gnome.Settings.json
index 3e19894b0484..b64b4c2fdbc5 100644 index 3e19894b0484..b64b4c2fdbc5 100644
--- a/build-aux/flatpak/org.gnome.Settings.json --- a/build-aux/flatpak/org.gnome.Settings.json

View File

@ -23,6 +23,7 @@ Source0: https://download.gnome.org/sources/gnome-control-center/40/gnome
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/965 # https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/965
Patch0: distro-logo.patch Patch0: distro-logo.patch
# Customized for RHEL 9 to skip the .gitlab-ci.yml file
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1345 # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1345
# https://bugzilla.redhat.com/show_bug.cgi?id=1952274 # https://bugzilla.redhat.com/show_bug.cgi?id=1952274
Patch1: gnome-control-center-Drop-the-unused-build-dependency-on-Grilo.patch Patch1: gnome-control-center-Drop-the-unused-build-dependency-on-Grilo.patch