From dd0d228d2cd3cb762bc8dca50a4ba93638c8fd8f Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Wed, 16 Feb 2022 11:27:38 +0000
Subject: [PATCH] Fix build on s390

---
 .gitignore                                    |  1 +
 ...ontrol-center-42.beta-s390-resources.patch | 26 +++++++++++++++++++
 gnome-control-center.spec                     | 15 ++++++-----
 sources                                       |  2 +-
 4 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 gnome-control-center-42.beta-s390-resources.patch

diff --git a/.gitignore b/.gitignore
index b8e60ea..9ea431f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@
 /gnome-control-center-41.1.tar.xz
 /gnome-control-center-41.2.tar.xz
 /gnome-control-center-41.4.tar.xz
+/gnome-control-center-42.beta.tar.xz
diff --git a/gnome-control-center-42.beta-s390-resources.patch b/gnome-control-center-42.beta-s390-resources.patch
new file mode 100644
index 0000000..aaf9f12
--- /dev/null
+++ b/gnome-control-center-42.beta-s390-resources.patch
@@ -0,0 +1,26 @@
+From 741aeffed7751a0ae1514d708022284906fd6845 Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Wed, 16 Feb 2022 11:14:12 +0000
+Subject: [PATCH] common: Add missing source_dir
+
+This seems to match other uses of compile_resources(). Without this, the
+build fails on s390 as the resources header is not generated.
+---
+ panels/common/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/panels/common/meson.build b/panels/common/meson.build
+index 20b9dcf16..bc4cc339a 100644
+--- a/panels/common/meson.build
++++ b/panels/common/meson.build
+@@ -66,6 +66,7 @@ resource_data = files(
+ sources += gnome.compile_resources(
+   'cc-common-resources',
+   'common.gresource.xml',
++  source_dir: '.',
+   c_name: 'cc_common',
+   dependencies: resource_data,
+   export: true
+-- 
+2.35.1
+
diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index 3a0d5a0..dbc43f1 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -22,6 +22,8 @@ Source0:        https://download.gnome.org/sources/gnome-control-center/42/gnome
 
 # https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/965
 Patch0:         distro-logo.patch
+# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1229
+Patch1:         gnome-control-center-42.beta-s390-resources.patch
 
 BuildRequires:  chrpath
 BuildRequires:  cups-devel
@@ -184,23 +186,24 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
 %{_bindir}/gnome-control-center
 %{_datadir}/applications/*.desktop
 %{_datadir}/bash-completion/completions/gnome-control-center
-%{_datadir}/dbus-1/services/org.gnome.ControlCenter.SearchProvider.service
-%{_datadir}/dbus-1/services/org.gnome.ControlCenter.service
+%{_datadir}/dbus-1/services/org.gnome.Settings.SearchProvider.service
+%{_datadir}/dbus-1/services/org.gnome.Settings.service
 %{_datadir}/gettext/
-%{_datadir}/glib-2.0/schemas/org.gnome.ControlCenter.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.Settings.gschema.xml
 %{_datadir}/gnome-control-center/keybindings/*.xml
 %{_datadir}/gnome-control-center/pixmaps
-%{_datadir}/gnome-shell/search-providers/gnome-control-center-search-provider.ini
-%{_datadir}/icons/*
+%{_datadir}/gnome-shell/search-providers/org.gnome.Settings.search-provider.ini
+%{_datadir}/icons/gnome-logo-text*.svg
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/man/man1/gnome-control-center.1*
-%{_datadir}/metainfo/gnome-control-center.appdata.xml
+%{_metainfodir}/org.gnome.Settings.appdata.xml
 %{_datadir}/pixmaps/faces
 %{_datadir}/pkgconfig/gnome-keybindings.pc
 %{_datadir}/polkit-1/actions/org.gnome.controlcenter.*.policy
 %{_datadir}/polkit-1/rules.d/gnome-control-center.rules
 %{_datadir}/sounds/gnome/default/*/*.ogg
 %{_libexecdir}/cc-remote-login-helper
+%{_libexecdir}/gnome-control-center-goa-helper
 %{_libexecdir}/gnome-control-center-search-provider
 %{_libexecdir}/gnome-control-center-print-renderer
 
diff --git a/sources b/sources
index 04336e9..02b8636 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-control-center-41.4.tar.xz) = 63fa20041a06f5075d172b543176b4f037fcd623d9fa5ca5f785e047a9b95ccd002c423d29de673dcb28b7d99a83157b39d7bd65ef77fe70065e9a03b5ae38a4
+SHA512 (gnome-control-center-42.beta.tar.xz) = 6ede2f8856dd76a14c172d1ccdcaf46d5167a648ab0676ceb588637cb6d4c1b417c6e62c41b2a3c5cfd51657c45cf59b59d0d2864d5ba054a209e3f2c3598125