Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/chrome-gnome-shell.git#24fa8a53bb6b9944ca5d0cfa804366145c8afc11
This commit is contained in:
DistroBaker 2021-02-05 15:01:41 +00:00
parent e4f7637cfa
commit 926fdf4bca
2 changed files with 48 additions and 4 deletions

View File

@ -0,0 +1,39 @@
From bb1755043ce4b859406766dd2cdcb34b6fb300da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Fri, 12 Jul 2019 16:13:27 +0200
Subject: [PATCH] build: Install icons in hicolor theme
This is the theme that will always be used as fallback regardless of the
icon-theme setting, and the expected location for application icons[0].
[0] https://wiki.gnome.org/HowDoI/ThemedIcons
https://gitlab.gnome.org/GNOME/chrome-gnome-shell/merge_requests/4
---
CMakeLists.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f41ed4a..170c9f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,13 +202,13 @@ if(BUILD_CONNECTOR)
install(FILES "${CMAKE_BINARY_DIR}/org.gnome.ChromeGnomeShell.service" DESTINATION "${CMAKE_INSTALL_DATADIR}/dbus-1/services/")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/extension/icons/GnomeLogo-16.png"
- DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/gnome/16x16/apps/"
+ DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/16x16/apps/"
RENAME org.gnome.ChromeGnomeShell.png)
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/extension/icons/GnomeLogo-48.png"
- DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/gnome/48x48/apps/"
+ DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps/"
RENAME org.gnome.ChromeGnomeShell.png)
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/extension/icons/GnomeLogo-128.png"
- DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/gnome/128x128/apps/"
+ DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps/"
RENAME org.gnome.ChromeGnomeShell.png)
endif(BUILD_CONNECTOR)
--
2.29.2

View File

@ -2,13 +2,16 @@
Name: chrome-gnome-shell
Version: 10.1
Release: 11%{?dist}
Release: 12%{?dist}
Summary: Support for managing GNOME Shell Extensions through web browsers
License: GPLv3+
URL: https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome
Source0: https://download.gnome.org/sources/%{name}/%{version}/%{name}-%{version}.tar.xz
# Backported from upstream
Patch0: 0001-build-Install-icons-in-hicolor-theme.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: python3-devel
@ -19,7 +22,6 @@ BuildRequires: /usr/bin/sha256sum
BuildRequires: /usr/bin/tr
Requires: dbus
Requires: gnome-icon-theme
Requires: gnome-shell
Requires: hicolor-icon-theme
Requires: mozilla-filesystem
@ -33,7 +35,7 @@ and native host messaging connector that provides integration with GNOME Shell
and the corresponding extensions repository https://extensions.gnome.org.
%prep
%autosetup
%autosetup -p1
%build
%cmake -DBUILD_EXTENSION=OFF \
@ -56,9 +58,12 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.ChromeGn
%{python3_sitelib}/chrome_gnome_shell-*.egg-info
%{_datadir}/applications/org.gnome.ChromeGnomeShell.desktop
%{_datadir}/dbus-1/services/org.gnome.ChromeGnomeShell.service
%{_datadir}/icons/gnome/*/apps/org.gnome.ChromeGnomeShell.png
%{_datadir}/icons/hicolor/*/apps/org.gnome.ChromeGnomeShell.png
%changelog
* Fri Feb 05 2021 Kalev Lember <klember@redhat.com> - 10.1-12
- Install icons into hicolor icon theme
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 10.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild