From d96015d0b262fcd852f3a4c6d9b143773e94d724 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 21 Sep 2023 18:08:49 +0000 Subject: [PATCH] import CS chrome-gnome-shell-42.1-1.el9 --- .chrome-gnome-shell.metadata | 2 +- .gitignore | 2 +- ...build-Install-icons-in-hicolor-theme.patch | 39 --------------- SPECS/chrome-gnome-shell.spec | 49 +++++++++---------- 4 files changed, 25 insertions(+), 67 deletions(-) delete mode 100644 SOURCES/0001-build-Install-icons-in-hicolor-theme.patch diff --git a/.chrome-gnome-shell.metadata b/.chrome-gnome-shell.metadata index d57c7a1..c982b6e 100644 --- a/.chrome-gnome-shell.metadata +++ b/.chrome-gnome-shell.metadata @@ -1 +1 @@ -f8c05bd58302c6b0ad3220f9e82df4a43b4ea4f3 SOURCES/chrome-gnome-shell-10.1.tar.xz +b21f1e5aa4cab4264a880b178b006f37372801fc SOURCES/gnome-browser-connector-42.1.tar.xz diff --git a/.gitignore b/.gitignore index cd0934e..0a36a4a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/chrome-gnome-shell-10.1.tar.xz +SOURCES/gnome-browser-connector-42.1.tar.xz diff --git a/SOURCES/0001-build-Install-icons-in-hicolor-theme.patch b/SOURCES/0001-build-Install-icons-in-hicolor-theme.patch deleted file mode 100644 index 53ce263..0000000 --- a/SOURCES/0001-build-Install-icons-in-hicolor-theme.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bb1755043ce4b859406766dd2cdcb34b6fb300da Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -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 - diff --git a/SPECS/chrome-gnome-shell.spec b/SPECS/chrome-gnome-shell.spec index 56634a9..240173f 100644 --- a/SPECS/chrome-gnome-shell.spec +++ b/SPECS/chrome-gnome-shell.spec @@ -1,32 +1,25 @@ %global debug_package %{nil} +%global source_name gnome-browser-connector Name: chrome-gnome-shell -Version: 10.1 -Release: 14%{?dist} +Version: 42.1 +Release: 1%{?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 +URL: https://gitlab.gnome.org/GNOME/%{source_name} +Source0: https://download.gnome.org/sources/%{source_name}/42/%{source_name}-%{version}.tar.xz -# Backported from upstream -Patch0: 0001-build-Install-icons-in-hicolor-theme.patch - -BuildRequires: cmake BuildRequires: desktop-file-utils +BuildRequires: meson BuildRequires: python3-devel -BuildRequires: /usr/bin/base64 -BuildRequires: /usr/bin/head -BuildRequires: /usr/bin/jq -BuildRequires: /usr/bin/sha256sum -BuildRequires: /usr/bin/tr +BuildRequires: python3-gobject-base Requires: dbus Requires: gnome-shell Requires: hicolor-icon-theme Requires: mozilla-filesystem Requires: python3-gobject-base -Requires: python3-requests %description Browser extension for Google Chrome/Chromium, Firefox, Vivaldi, Opera (and @@ -35,32 +28,36 @@ and native host messaging connector that provides integration with GNOME Shell and the corresponding extensions repository https://extensions.gnome.org. %prep -%autosetup -p1 +%autosetup -p1 -n %{source_name}-%{version} %build -%cmake -DBUILD_EXTENSION=OFF \ - -DCMAKE_INSTALL_LIBDIR=%{_lib} \ - -DPython_ADDITIONAL_VERSIONS=3 -%cmake_build +%meson +%meson_build %install -%cmake_install +%meson_install %check -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.ChromeGnomeShell.desktop +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.BrowserConnector.desktop %files %license LICENSE +%doc NEWS README.md %{_sysconfdir}/chromium/ %{_sysconfdir}/opt/chrome/ -%{_bindir}/chrome-gnome-shell +%{_bindir}/gnome-browser-connector +%{_bindir}/gnome-browser-connector-host +%{python3_sitelib}/gnome_browser_connector/ %{_libdir}/mozilla/native-messaging-hosts/ -%{python3_sitelib}/chrome_gnome_shell-*.egg-info -%{_datadir}/applications/org.gnome.ChromeGnomeShell.desktop -%{_datadir}/dbus-1/services/org.gnome.ChromeGnomeShell.service -%{_datadir}/icons/hicolor/*/apps/org.gnome.ChromeGnomeShell.png +%{_datadir}/applications/org.gnome.BrowserConnector.desktop +%{_datadir}/dbus-1/services/org.gnome.BrowserConnector.service +%{_datadir}/icons/hicolor/*/apps/org.gnome.BrowserConnector.png %changelog +* Wed May 17 2023 Florian Müllner - 42.1-1 +- Update to gnome-browser-connector-42.1 + Resolves: #2204484 + * Mon Aug 09 2021 Mohan Boddu - 10.1-14 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688