Update to 42~beta
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson
parent
b955d5423d
commit
383c30c33e
@ -58,13 +58,13 @@ index 6e832eb35..3db143d80 100644
|
||||
+#ifdef DISTRIBUTOR_LOGO
|
||||
+ gtk_image_set_from_file (panel->os_logo, DISTRIBUTOR_LOGO);
|
||||
+#else
|
||||
GtkIconTheme *icon_theme;
|
||||
g_autofree char *logo_name = g_get_os_info ("LOGO");
|
||||
g_autoptr(GPtrArray) array = NULL;
|
||||
g_autoptr(GIcon) icon = NULL;
|
||||
g_autoptr(GtkIconPaintable) icon_paintable = NULL;
|
||||
@@ -920,6 +923,7 @@ setup_os_logo (CcInfoOverviewPanel *panel)
|
||||
|
||||
icon = g_themed_icon_new_from_names ((char **) array->pdata, array->len);
|
||||
gtk_image_set_from_gicon (panel->os_logo, icon, GTK_ICON_SIZE_INVALID);
|
||||
gtk_widget_get_direction (GTK_WIDGET (panel)),
|
||||
0);
|
||||
gtk_picture_set_paintable (panel->os_logo, GDK_PAINTABLE (icon_paintable));
|
||||
+#endif
|
||||
}
|
||||
|
||||
@ -126,8 +126,8 @@ index 3db143d80..434850e7a 100644
|
||||
use_dark_theme (CcInfoOverviewPanel *panel)
|
||||
{
|
||||
@@ -897,11 +898,19 @@ use_dark_theme (CcInfoOverviewPanel *panel)
|
||||
g_object_get (settings, "gtk-theme-name", &theme_name, NULL);
|
||||
return (theme_name != NULL && g_str_has_suffix (theme_name, "dark")) ? TRUE : FALSE;
|
||||
|
||||
return adw_style_manager_get_dark (style_manager);
|
||||
}
|
||||
+#endif
|
||||
|
||||
@ -144,7 +144,7 @@ index 3db143d80..434850e7a 100644
|
||||
+#endif
|
||||
gtk_image_set_from_file (panel->os_logo, DISTRIBUTOR_LOGO);
|
||||
#else
|
||||
g_autofree char *logo_name = g_get_os_info ("LOGO");
|
||||
GtkIconTheme *icon_theme;
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
||||
@ -1,24 +1,24 @@
|
||||
%define gnome_online_accounts_version 3.25.3
|
||||
%define glib2_version 2.56.0
|
||||
%define gnome_desktop_version 3.35.4
|
||||
%define gsd_version 3.35.0
|
||||
%define gsettings_desktop_schemas_version 3.37.1
|
||||
%define glib2_version 2.68.0
|
||||
%define gnome_desktop_version 42~alpha
|
||||
%define gsd_version 41.0
|
||||
%define gsettings_desktop_schemas_version 42~alpha
|
||||
%define upower_version 0.99.8
|
||||
%define gtk3_version 3.22.20
|
||||
%define cheese_version 3.28.0
|
||||
%define gnome_bluetooth_version 3.18.2
|
||||
%define gtk4_version 4.4
|
||||
%define gnome_bluetooth_version 42~alpha
|
||||
%define libadwaita_version 1.1~alpha
|
||||
%define nm_version 1.24
|
||||
|
||||
%global tarball_version %%(echo %{version} | tr '~' '.')
|
||||
|
||||
Name: gnome-control-center
|
||||
Version: 41.4
|
||||
Version: 42~beta
|
||||
Release: 1%{?dist}
|
||||
Summary: Utilities to configure the GNOME desktop
|
||||
|
||||
License: GPLv2+ and CC-BY-SA
|
||||
URL: http://www.gnome.org
|
||||
Source0: https://download.gnome.org/sources/gnome-control-center/41/gnome-control-center-%{tarball_version}.tar.xz
|
||||
Source0: https://download.gnome.org/sources/gnome-control-center/42/gnome-control-center-%{tarball_version}.tar.xz
|
||||
|
||||
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/965
|
||||
Patch0: distro-logo.patch
|
||||
@ -31,34 +31,29 @@ BuildRequires: gcc
|
||||
BuildRequires: gettext
|
||||
BuildRequires: meson
|
||||
BuildRequires: pkgconfig(accountsservice)
|
||||
BuildRequires: pkgconfig(cheese) >= %{cheese_version}
|
||||
BuildRequires: pkgconfig(cheese-gtk)
|
||||
BuildRequires: pkgconfig(clutter-gtk-1.0)
|
||||
BuildRequires: pkgconfig(colord)
|
||||
BuildRequires: pkgconfig(colord-gtk)
|
||||
BuildRequires: pkgconfig(gcr-3)
|
||||
BuildRequires: pkgconfig(colord-gtk4)
|
||||
BuildRequires: pkgconfig(gcr-base-3)
|
||||
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
|
||||
BuildRequires: pkgconfig(gdk-wayland-3.0)
|
||||
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
|
||||
BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version}
|
||||
BuildRequires: pkgconfig(gnome-desktop-4) >= %{gnome_desktop_version}
|
||||
BuildRequires: pkgconfig(gnome-settings-daemon) >= %{gsd_version}
|
||||
BuildRequires: pkgconfig(goa-1.0) >= %{gnome_online_accounts_version}
|
||||
BuildRequires: pkgconfig(goa-backend-1.0)
|
||||
BuildRequires: pkgconfig(grilo-0.3)
|
||||
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version}
|
||||
BuildRequires: pkgconfig(gsound)
|
||||
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
|
||||
BuildRequires: pkgconfig(gtk4) >= %{gtk4_version}
|
||||
BuildRequires: pkgconfig(gudev-1.0)
|
||||
BuildRequires: pkgconfig(ibus-1.0)
|
||||
BuildRequires: pkgconfig(libcanberra-gtk3)
|
||||
BuildRequires: pkgconfig(libadwaita-1) >= %{libadwaita_version}
|
||||
BuildRequires: pkgconfig(libgtop-2.0)
|
||||
BuildRequires: pkgconfig(libhandy-1)
|
||||
BuildRequires: pkgconfig(libnm) >= %{nm_version}
|
||||
BuildRequires: pkgconfig(libnma)
|
||||
BuildRequires: pkgconfig(libnma-gtk4)
|
||||
BuildRequires: pkgconfig(libpulse)
|
||||
BuildRequires: pkgconfig(libpulse-mainloop-glib)
|
||||
BuildRequires: pkgconfig(libsecret-1)
|
||||
BuildRequires: pkgconfig(libsoup-2.4)
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(malcontent-0)
|
||||
BuildRequires: pkgconfig(mm-glib)
|
||||
@ -70,18 +65,18 @@ BuildRequires: pkgconfig(x11)
|
||||
BuildRequires: pkgconfig(xi)
|
||||
BuildRequires: pkgconfig(udisks2)
|
||||
%ifnarch s390 s390x
|
||||
BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= %{gnome_bluetooth_version}
|
||||
BuildRequires: pkgconfig(gnome-bluetooth-3.0) >= %{gnome_bluetooth_version}
|
||||
BuildRequires: pkgconfig(libwacom)
|
||||
%endif
|
||||
|
||||
# Versioned library deps
|
||||
Requires: cheese-libs%{?_isa} >= %{cheese_version}
|
||||
Requires: libadwaita%{?_isa} >= %{libadwaita_version}
|
||||
Requires: glib2%{?_isa} >= %{glib2_version}
|
||||
Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version}
|
||||
Requires: gnome-desktop4%{?_isa} >= %{gnome_desktop_version}
|
||||
Requires: gnome-online-accounts%{?_isa} >= %{gnome_online_accounts_version}
|
||||
Requires: gnome-settings-daemon%{?_isa} >= %{gsd_version}
|
||||
Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version}
|
||||
Requires: gtk3%{?_isa} >= %{gtk3_version}
|
||||
Requires: gtk4%{?_isa} >= %{gtk4_version}
|
||||
Requires: upower%{?_isa} >= %{upower_version}
|
||||
%ifnarch s390 s390x
|
||||
Requires: gnome-bluetooth%{?_isa} >= 1:%{gnome_bluetooth_version}
|
||||
@ -215,6 +210,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
|
||||
%dir %{_datadir}/gnome/wm-properties
|
||||
|
||||
%changelog
|
||||
* Tue Feb 15 2022 Adam Williamson <awilliam@redhat.com> - 42~beta-1
|
||||
- Update to 42~beta
|
||||
|
||||
* Mon Feb 14 2022 David King <amigadave@amigadave.com> - 41.4-1
|
||||
- Update to 41.4
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user