summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorj.r2022-04-17 11:54:49 +0200
committerj.r2022-04-17 11:54:49 +0200
commit2292232199b90c8362afd5720926597ae4fc929f (patch)
treec1142526c98feca357638062dbfdca5f4b8bf140
parentd48d69405908dbbd128e100819df72a0e7fb05f5 (diff)
downloadaur-2292232199b90c8362afd5720926597ae4fc929f.tar.gz
gnome-shell-extension-topicons-plus: patch for shell 42
-rw-r--r--.SRCINFO10
-rw-r--r--0001-fix-compatibility-with-gnome40.patch (renamed from 0001-fix-compatibility-with-gnome40_41.diff)24
-rw-r--r--0002-Declare-compatibility-with-GNOME-Shell-41.patch31
-rw-r--r--0003-Declare-GNOME-Shell-42-compatibility.patch26
-rw-r--r--PKGBUILD14
5 files changed, 94 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3cbfb114d1c..0e8e5ef2429 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,18 @@
pkgbase = gnome-shell-extension-topicons-plus
pkgdesc = Moves legacy tray icons to the top panel
pkgver = 27
- pkgrel = 4
+ pkgrel = 5
url = https://github.com/phocean/TopIcons-plus
arch = any
license = GPL2
depends = gnome-shell
source = gnome-shell-extension-topicons-plus-27.tar.gz::https://github.com/phocean/TopIcons-plus/archive/27.tar.gz
- source = 0001-fix-compatibility-with-gnome40_41.diff
+ source = 0001-fix-compatibility-with-gnome40.patch
+ source = 0002-Declare-compatibility-with-GNOME-Shell-41.patch
+ source = 0003-Declare-GNOME-Shell-42-compatibility.patch
sha256sums = 51c94aa52dd19e9f3740fee9580e47961414d7aec63dd588cb9c067cef8f4ad8
- sha256sums = 0a1f5537c1fe985e666858d40edc1c8a9849bd74c0ea6b4a94ea21c838dad54c
+ sha256sums = e3ed60fd7d9830ac53cf34adee24c26fab1092660705d079bbb15e15a82b6381
+ sha256sums = e4106d408a90af0d7c633cce394c276d35e2a69111758ad3229b42f8e19e53b8
+ sha256sums = 65b6970d4aadfcfce256e4830fde711a5aad3fd328ce9cb42e5b7457047c866f
pkgname = gnome-shell-extension-topicons-plus
diff --git a/0001-fix-compatibility-with-gnome40_41.diff b/0001-fix-compatibility-with-gnome40.patch
index fded01e3e7a..5472291f036 100644
--- a/0001-fix-compatibility-with-gnome40_41.diff
+++ b/0001-fix-compatibility-with-gnome40.patch
@@ -1,18 +1,31 @@
+From aa6d016f42dd4ac80275ba7e72ac669f9c8d82e6 Mon Sep 17 00:00:00 2001
+From: Tiramisu Mokka <kofemann@gmail.com>
+Date: Fri, 19 Mar 2021 19:00:32 +0100
+Subject: [PATCH 1/3] fix compatibility with gnome40
+
+---
+ metadata.json | 5 ++---
+ prefs.js | 6 ++----
+ 2 files changed, 4 insertions(+), 7 deletions(-)
+
diff --git a/metadata.json b/metadata.json
-index e4c9691..c5d8a70 100644
+index e4c9691..8a07918 100644
--- a/metadata.json
+++ b/metadata.json
-@@ -3,8 +3,8 @@
+@@ -3,11 +3,10 @@
"name": "TopIcons Plus",
"gettext-domain": "TopIcons-Plus",
"shell-version": [
- "3.34",
- "3.36"
-+ "40",
-+ "41"
++ "40"
],
"settings-schema": "org.gnome.shell.extensions.topicons",
"url": "https://github.com/phocean/TopIcons-plus",
+ "uuid": "TopIcons@phocean.net",
+- "version": 27
++ "version": 28
+ }
diff --git a/prefs.js b/prefs.js
index bd372d2..f6b1277 100644
--- a/prefs.js
@@ -36,3 +49,6 @@ index bd372d2..f6b1277 100644
- return widget;
}
+--
+2.35.3
+
diff --git a/0002-Declare-compatibility-with-GNOME-Shell-41.patch b/0002-Declare-compatibility-with-GNOME-Shell-41.patch
new file mode 100644
index 00000000000..ab65238e124
--- /dev/null
+++ b/0002-Declare-compatibility-with-GNOME-Shell-41.patch
@@ -0,0 +1,31 @@
+From 5e9e011be38645452e74b5b82741d426d2019657 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@debian.org>
+Date: Sun, 17 Oct 2021 11:57:39 +0100
+Subject: [PATCH 2/3] Declare compatibility with GNOME Shell 41
+
+From some brief testing, it seems to be compatible without further
+changes.
+
+Bug-Debian: https://bugs.debian.org/996073
+Signed-off-by: Simon McVittie <smcv@debian.org>
+---
+ metadata.json | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/metadata.json b/metadata.json
+index 8a07918..9da5655 100644
+--- a/metadata.json
++++ b/metadata.json
+@@ -3,7 +3,8 @@
+ "name": "TopIcons Plus",
+ "gettext-domain": "TopIcons-Plus",
+ "shell-version": [
+- "40"
++ "40",
++ "41"
+ ],
+ "settings-schema": "org.gnome.shell.extensions.topicons",
+ "url": "https://github.com/phocean/TopIcons-plus",
+--
+2.35.3
+
diff --git a/0003-Declare-GNOME-Shell-42-compatibility.patch b/0003-Declare-GNOME-Shell-42-compatibility.patch
new file mode 100644
index 00000000000..f6c7249d821
--- /dev/null
+++ b/0003-Declare-GNOME-Shell-42-compatibility.patch
@@ -0,0 +1,26 @@
+From f86add72c1c7d8036a1229f3bdf116639da81bae Mon Sep 17 00:00:00 2001
+From: "j.r" <j.r@jugendhacker.de>
+Date: Sun, 17 Apr 2022 11:47:20 +0200
+Subject: [PATCH 3/3] Declare GNOME Shell 42 compatibility
+
+---
+ metadata.json | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/metadata.json b/metadata.json
+index 9da5655..1fbd6d4 100644
+--- a/metadata.json
++++ b/metadata.json
+@@ -4,7 +4,8 @@
+ "gettext-domain": "TopIcons-Plus",
+ "shell-version": [
+ "40",
+- "41"
++ "41",
++ "42"
+ ],
+ "settings-schema": "org.gnome.shell.extensions.topicons",
+ "url": "https://github.com/phocean/TopIcons-plus",
+--
+2.35.3
+
diff --git a/PKGBUILD b/PKGBUILD
index 7b4abf73acd..12416888ba3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,21 +4,27 @@
pkgname=gnome-shell-extension-topicons-plus
pkgver=27
-pkgrel=4
+pkgrel=5
pkgdesc="Moves legacy tray icons to the top panel"
arch=('any')
url="https://github.com/phocean/TopIcons-plus"
license=('GPL2')
depends=('gnome-shell')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/phocean/TopIcons-plus/archive/${pkgver}.tar.gz"
- "0001-fix-compatibility-with-gnome40_41.diff")
+ "0001-fix-compatibility-with-gnome40.patch"
+ "0002-Declare-compatibility-with-GNOME-Shell-41.patch"
+ "0003-Declare-GNOME-Shell-42-compatibility.patch")
sha256sums=('51c94aa52dd19e9f3740fee9580e47961414d7aec63dd588cb9c067cef8f4ad8'
- '0a1f5537c1fe985e666858d40edc1c8a9849bd74c0ea6b4a94ea21c838dad54c')
+ 'e3ed60fd7d9830ac53cf34adee24c26fab1092660705d079bbb15e15a82b6381'
+ 'e4106d408a90af0d7c633cce394c276d35e2a69111758ad3229b42f8e19e53b8'
+ '65b6970d4aadfcfce256e4830fde711a5aad3fd328ce9cb42e5b7457047c866f')
prepare() {
cd "${srcdir}/TopIcons-plus-${pkgver}"
- patch -p1 -i ${srcdir}/0001-fix-compatibility-with-gnome40_41.diff
+ patch -p1 -i ${srcdir}/0001-fix-compatibility-with-gnome40.patch
+ patch -p1 -i ${srcdir}/0002-Declare-compatibility-with-GNOME-Shell-41.patch
+ patch -p1 -i ${srcdir}/0003-Declare-GNOME-Shell-42-compatibility.patch
}
build(){