Compare commits
2 Commits
imports/c8
...
c8
Author | SHA1 | Date | |
---|---|---|---|
6ca679a655 | |||
|
55fb6a86a8 |
@ -1,2 +0,0 @@
|
|||||||
f8c05bd58302c6b0ad3220f9e82df4a43b4ea4f3 SOURCES/chrome-gnome-shell-10.1.tar.xz
|
|
||||||
73bcbdc45be4db907a864e829b06cd869f77f4f7 SOURCES/jq-1.6.tar.gz
|
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,2 +1 @@
|
|||||||
SOURCES/chrome-gnome-shell-10.1.tar.xz
|
SOURCES/gnome-browser-connector-42.1.tar.xz
|
||||||
SOURCES/jq-1.6.tar.gz
|
|
||||||
|
37
SOURCES/0001-Don-t-use-enhanced-annotations.patch
Normal file
37
SOURCES/0001-Don-t-use-enhanced-annotations.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
From f9b10b97246f723cde725d77001308f9e6ed56d8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
||||||
|
Date: Wed, 24 May 2023 12:13:20 +0200
|
||||||
|
Subject: [PATCH] Don't use enhanced annotations
|
||||||
|
|
||||||
|
---
|
||||||
|
gnome_browser_connector/application.py | 2 --
|
||||||
|
gnome_browser_connector/connector.py | 2 --
|
||||||
|
2 files changed, 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/gnome_browser_connector/application.py b/gnome_browser_connector/application.py
|
||||||
|
index 8e57ef1..2069a34 100644
|
||||||
|
--- a/gnome_browser_connector/application.py
|
||||||
|
+++ b/gnome_browser_connector/application.py
|
||||||
|
@@ -1,7 +1,5 @@
|
||||||
|
# SPDX-License-Identifer: GPL-3.0-or-later
|
||||||
|
|
||||||
|
-from __future__ import annotations
|
||||||
|
-
|
||||||
|
import signal
|
||||||
|
import sys
|
||||||
|
import traceback
|
||||||
|
diff --git a/gnome_browser_connector/connector.py b/gnome_browser_connector/connector.py
|
||||||
|
index e72c432..a81b5ed 100644
|
||||||
|
--- a/gnome_browser_connector/connector.py
|
||||||
|
+++ b/gnome_browser_connector/connector.py
|
||||||
|
@@ -1,7 +1,5 @@
|
||||||
|
# SPDX-License-Identifer: GPL-3.0-or-later
|
||||||
|
|
||||||
|
-from __future__ import annotations
|
||||||
|
-
|
||||||
|
import json
|
||||||
|
import struct
|
||||||
|
import sys
|
||||||
|
--
|
||||||
|
2.40.0
|
||||||
|
|
@ -1,39 +0,0 @@
|
|||||||
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.21.0
|
|
||||||
|
|
@ -1,31 +1,27 @@
|
|||||||
%global debug_package %{nil}
|
%global debug_package %{nil}
|
||||||
|
%global source_name gnome-browser-connector
|
||||||
|
|
||||||
Name: chrome-gnome-shell
|
Name: chrome-gnome-shell
|
||||||
Version: 10.1
|
Version: 42.1
|
||||||
Release: 6%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Support for managing GNOME Shell Extensions through web browsers
|
Summary: Support for managing GNOME Shell Extensions through web browsers
|
||||||
|
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome
|
URL: https://gitlab.gnome.org/GNOME/%{source_name}
|
||||||
Source0: https://download.gnome.org/sources/%{name}/%{version}/%{name}-%{version}.tar.xz
|
Source0: https://download.gnome.org/sources/%{source_name}/42/%{source_name}-%{version}.tar.xz
|
||||||
Source1: https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz
|
|
||||||
|
|
||||||
Patch1: 0001-build-Install-icons-in-hicolor-theme.patch
|
|
||||||
|
|
||||||
BuildRequires: cmake
|
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
|
BuildRequires: meson
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: /usr/bin/base64
|
BuildRequires: python3-gobject-base
|
||||||
BuildRequires: /usr/bin/head
|
|
||||||
BuildRequires: /usr/bin/sha256sum
|
|
||||||
BuildRequires: /usr/bin/tr
|
|
||||||
|
|
||||||
Requires: dbus
|
Requires: dbus
|
||||||
Requires: gnome-shell
|
Requires: gnome-shell
|
||||||
Requires: hicolor-icon-theme
|
Requires: hicolor-icon-theme
|
||||||
Requires: mozilla-filesystem
|
Requires: mozilla-filesystem
|
||||||
Requires: python3-gobject-base
|
Requires: python3-gobject-base
|
||||||
Requires: python3-requests
|
|
||||||
|
Patch1: 0001-Don-t-use-enhanced-annotations.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Browser extension for Google Chrome/Chromium, Firefox, Vivaldi, Opera (and
|
Browser extension for Google Chrome/Chromium, Firefox, Vivaldi, Opera (and
|
||||||
@ -34,45 +30,40 @@ and native host messaging connector that provides integration with GNOME Shell
|
|||||||
and the corresponding extensions repository https://extensions.gnome.org.
|
and the corresponding extensions repository https://extensions.gnome.org.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n jq-1.6 -b1 -T
|
%autosetup -p1 -n %{source_name}-%{version}
|
||||||
%autosetup
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
(cd ../jq-1.6
|
%meson
|
||||||
./configure --with-oniguruma=no \
|
%meson_build
|
||||||
--prefix=$PWD
|
|
||||||
make %{?_smp_mflags}
|
|
||||||
make install)
|
|
||||||
export PATH=$PWD/../jq-1.6/bin:$PATH
|
|
||||||
mkdir build
|
|
||||||
pushd build
|
|
||||||
%cmake -DBUILD_EXTENSION=OFF \
|
|
||||||
-DCMAKE_INSTALL_LIBDIR=%{_lib} \
|
|
||||||
-DPython_ADDITIONAL_VERSIONS=3 \
|
|
||||||
..
|
|
||||||
%make_build
|
|
||||||
popd
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
pushd build
|
%meson_install
|
||||||
%make_install
|
|
||||||
popd
|
|
||||||
|
|
||||||
%check
|
%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
|
%files
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
|
%doc NEWS README.md
|
||||||
%{_sysconfdir}/chromium/
|
%{_sysconfdir}/chromium/
|
||||||
%{_sysconfdir}/opt/chrome/
|
%{_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/
|
%{_libdir}/mozilla/native-messaging-hosts/
|
||||||
%{python3_sitelib}/chrome_gnome_shell-*.egg-info
|
%{_datadir}/applications/org.gnome.BrowserConnector.desktop
|
||||||
%{_datadir}/applications/org.gnome.ChromeGnomeShell.desktop
|
%{_datadir}/dbus-1/services/org.gnome.BrowserConnector.service
|
||||||
%{_datadir}/dbus-1/services/org.gnome.ChromeGnomeShell.service
|
%{_datadir}/icons/hicolor/*/apps/org.gnome.BrowserConnector.png
|
||||||
%{_datadir}/icons/hicolor/*/apps/org.gnome.ChromeGnomeShell.png
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 17 2023 Florian Müllner <fmuellner@redhat.com> - 42.1-1
|
||||||
|
- Update to gnome-browser-connector-42.1
|
||||||
|
Resolves: #2209628
|
||||||
|
|
||||||
|
* Mon Jan 25 2021 Florian Müllner <fmuellner@redhat.com> - 10.1-7
|
||||||
|
- Disable updates support
|
||||||
|
Resolves: #1802105
|
||||||
|
|
||||||
* Fri Jul 12 2019 Florian Müllner <fmuellner@redhat.com> - 10.1-6
|
* Fri Jul 12 2019 Florian Müllner <fmuellner@redhat.com> - 10.1-6
|
||||||
- Install icons in 'hicolor' instead of 'gnome'
|
- Install icons in 'hicolor' instead of 'gnome'
|
||||||
Related: #1694203
|
Related: #1694203
|
||||||
|
Loading…
Reference in New Issue
Block a user