Update patches

changed/i9/gnome-shell-extension-dash-to-panel-44-1.el9.inferit.1
Arkady L. Shane 1 year ago
parent c00985cf7e
commit 3d2bab11b9
Signed by: tigro
GPG Key ID: 9C7900103E1C4F8B

@ -1,7 +1,17 @@
diff -up dash-to-panel-55/Makefile.orig dash-to-panel-55/Makefile
--- dash-to-panel-55/Makefile.orig 2023-03-09 16:32:54.000000000 +0100
+++ dash-to-panel-55/Makefile 2023-03-15 13:42:54.227368912 +0100
@@ -10,9 +10,12 @@ EXTRA_IMAGES = highlight_stacked_bg.svg
From 30662444e52e5ac36c499514b59734744023116d Mon Sep 17 00:00:00 2001
From: tigro <arkadiy.sheyn@softline.com>
Date: Wed, 11 Oct 2023 23:05:09 +0300
Subject: [PATCH 1/3] Fix system install paths
---
Makefile | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/Makefile b/Makefile
index ecb8803..e6afe3e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,12 @@ EXTRA_IMAGES = highlight_stacked_bg.svg highlight_stacked_bg_2.svg highlight_sta
TOLOCALIZE = prefs.js appIcons.js
MSGSRC = $(wildcard po/*.po)
ifeq ($(strip $(DESTDIR)),)
@ -14,7 +24,7 @@ diff -up dash-to-panel-55/Makefile.orig dash-to-panel-55/Makefile
endif
INSTALLNAME = dash-to-panel@jderose9.github.com
@@ -71,6 +74,12 @@ install-local: _build
@@ -63,6 +66,12 @@ install-local: _build
rm -rf $(INSTALLBASE)/$(INSTALLNAME)
mkdir -p $(INSTALLBASE)/$(INSTALLNAME)
cp -r ./_build/* $(INSTALLBASE)/$(INSTALLNAME)/
@ -27,3 +37,6 @@ diff -up dash-to-panel-55/Makefile.orig dash-to-panel-55/Makefile
-rm -fR _build
echo done
--
2.41.0

@ -1,7 +1,7 @@
From 68f95e5af178ec9a8c3dda0c0011b7be2f188dc2 Mon Sep 17 00:00:00 2001
From def6f16524d1d24ce7dadf2a6d85860f72fb3b9a Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <sergey.cherevko@softline.com>
Date: Wed, 14 Jun 2023 14:12:48 +0300
Subject: [PATCH] Updated Russian translation
Subject: [PATCH 2/3] Updated Russian translation
---
po/ru.po | 1012 ++++++++++++++++++++++++++----------------------------
@ -1899,5 +1899,5 @@ index 5ad2f4d..03eff2d 100644
+#~ msgid "ms"
+#~ msgstr "(мс)"
--
2.39.2
2.41.0

@ -1,43 +1,12 @@
From 867554daf66a9d37d4495d2a9102a1d2b8c8971a Mon Sep 17 00:00:00 2001
From bc61be528d76851dc345e0cb725b43652e59ac24 Mon Sep 17 00:00:00 2001
From: tigro <arkadiy.sheyn@softline.com>
Date: Wed, 11 Oct 2023 22:57:16 +0300
Subject: [PATCH] Drop some items from panel menu
Subject: [PATCH 3/3] Drop some items from panel menu
---
Makefile | 9 +++++++++
appIcons.js | 6 ++++++
2 files changed, 15 insertions(+)
1 file changed, 6 insertions(+)
diff --git a/Makefile b/Makefile
index ecb8803..e6afe3e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,12 @@ EXTRA_IMAGES = highlight_stacked_bg.svg highlight_stacked_bg_2.svg highlight_sta
TOLOCALIZE = prefs.js appIcons.js
MSGSRC = $(wildcard po/*.po)
ifeq ($(strip $(DESTDIR)),)
+ INSTALLTYPE = local
INSTALLBASE = $(HOME)/.local/share/gnome-shell/extensions
else
+ INSTALLTYPE = system
INSTALLBASE = $(DESTDIR)/usr/share/gnome-shell/extensions
+ SHARE_PREFIX = $(DESTDIR)/usr/share
endif
INSTALLNAME = dash-to-panel@jderose9.github.com
@@ -63,6 +66,12 @@ install-local: _build
rm -rf $(INSTALLBASE)/$(INSTALLNAME)
mkdir -p $(INSTALLBASE)/$(INSTALLNAME)
cp -r ./_build/* $(INSTALLBASE)/$(INSTALLNAME)/
+ifeq ($(INSTALLTYPE),system)
+ rm -r $(INSTALLBASE)/$(INSTALLNAME)/schemas $(INSTALLBASE)/$(INSTALLNAME)/locale
+ mkdir -p $(SHARE_PREFIX)/glib-2.0/schemas $(SHARE_PREFIX)/locale
+ cp -r ./schemas/*gschema.* $(SHARE_PREFIX)/glib-2.0/schemas
+ cp -r ./_build/locale/* $(SHARE_PREFIX)/locale
+endif
-rm -fR _build
echo done
diff --git a/appIcons.js b/appIcons.js
index e79eae8..f6b9563 100644
--- a/appIcons.js

@ -9,10 +9,10 @@ License: GPL-2.0-or-later
URL: https://github.com/home-sweet-gnome/dash-to-panel
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# correct install paths
Patch0: %{name}-system-install-paths.patch
Patch0: 0001-Fix-system-install-paths.patch
# MSVSphere
Patch100: 0001-Updated-Russian-translation.patch
Patch101: 0001-Drop-some-items-from-panel-menu.patch
Patch100: 0002-Updated-Russian-translation.patch
Patch101: 0003-Drop-some-items-from-panel-menu.patch
BuildArch: noarch
BuildRequires: gettext
BuildRequires: make

Loading…
Cancel
Save