From 41b0b7846fb5eb32dee6e36981bd87dab8b2ea2a Mon Sep 17 00:00:00 2001
From: Artem Polishchuk <ego.cordatus@gmail.com>
Date: Thu, 30 Sep 2021 23:35:29 +0300
Subject: [PATCH] build(update): 41

build: Switch to Meson
build(add BR): jq
---
 .gitignore                              |  1 +
 0001-Add-support-for-GNOME-41.patch     | 29 ------------------------
 gnome-shell-extension-appindicator.spec | 30 ++++++++++++++++---------
 sources                                 |  2 +-
 4 files changed, 21 insertions(+), 41 deletions(-)
 delete mode 100644 0001-Add-support-for-GNOME-41.patch

diff --git a/.gitignore b/.gitignore
index 59577bb..04ea953 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /gnome-shell-extension-appindicator-35.tar.gz
 /gnome-shell-extension-appindicator-37.tar.gz
 /gnome-shell-extension-appindicator-40.tar.gz
+/gnome-shell-extension-appindicator-41.tar.gz
diff --git a/0001-Add-support-for-GNOME-41.patch b/0001-Add-support-for-GNOME-41.patch
deleted file mode 100644
index d4f0e9b..0000000
--- a/0001-Add-support-for-GNOME-41.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 358c3aafebfdca21010b1b1e735d1ee006c2ec85 Mon Sep 17 00:00:00 2001
-From: Ivan Mironov <mironov.ivan@gmail.com>
-Date: Thu, 23 Sep 2021 11:26:22 +0300
-Subject: [PATCH] Add support for GNOME 41
-
-This is a trivial change. Tested on Fedora 35 beta.
-
-Fixes https://github.com/ubuntu/gnome-shell-extension-appindicator/issues/307
----
- metadata.json | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/metadata.json b/metadata.json
-index 294953133a00..31cee8937ca1 100644
---- a/metadata.json
-+++ b/metadata.json
-@@ -4,7 +4,8 @@
-         "3.34",
-         "3.36",
-         "3.38",
--        "40"
-+        "40",
-+        "41"
-     ],
-     "gettext-domain": "AppIndicatorExtension",
-     "settings-schema": "org.gnome.shell.extensions.appindicator",
--- 
-2.32.0
-
diff --git a/gnome-shell-extension-appindicator.spec b/gnome-shell-extension-appindicator.spec
index 24d9ace..6e4f1f6 100644
--- a/gnome-shell-extension-appindicator.spec
+++ b/gnome-shell-extension-appindicator.spec
@@ -1,8 +1,8 @@
 %global uuid appindicatorsupport@rgcjonas.gmail.com
 
 Name: gnome-shell-extension-appindicator
-Version: 40
-Release: 2%{?dist}
+Version: 41
+Release: 1%{?dist}
 Summary: AppIndicator/KStatusNotifierItem support for GNOME Shell
 BuildArch: noarch
 
@@ -10,9 +10,10 @@ License: GPLv2
 URL: https://github.com/ubuntu/gnome-shell-extension-appindicator
 Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
-Patch0: 0001-Add-support-for-GNOME-41.patch
-
-BuildRequires: make glib2 gettext
+BuildRequires: gettext
+BuildRequires: glib2
+BuildRequires: jq
+BuildRequires: meson
 
 Requires: gnome-shell >= 3.14.0
 Requires: libappindicator-gtk3
@@ -37,23 +38,30 @@ You can use gnome-tweaks (additional package) or run in terminal:
 
 
 %build
-%make_build
+%meson \
+    -Dlocal_install=disabled
+%meson_build
 
 
 %install
-mkdir -p %{buildroot}%{_datadir}/gnome-shell/extensions/%{uuid}
-cp -axv --parents *.js metadata.json interfaces-xml locale/*/LC_MESSAGES/*.mo \
-                  schemas/*.xml schemas/gschemas.compiled                     \
-    %{buildroot}%{_datadir}/gnome-shell/extensions/%{uuid}/
+%meson_install
+%find_lang AppIndicatorExtension
+rm %{buildroot}%{_datadir}/glib-2.0/schemas/gschemas.compiled
 
 
-%files
+%files -f AppIndicatorExtension.lang
 %license LICENSE
 %doc README.md AUTHORS.md
 %{_datadir}/gnome-shell/extensions/%{uuid}/
+%{_datadir}/glib-2.0/schemas/*.gschema.xml
 
 
 %changelog
+* Thu Sep 30 2021 Artem Polishchuk <ego.cordatus@gmail.com> - 41-1
+- build(update): 41
+- build: Switch to Meson
+- build(add BR): jq
+
 * Thu Sep 23 2021 Ivan Mironov <mironov.ivan@gmail.com> - 40-2
 - Add support for GNOME 41
 
diff --git a/sources b/sources
index d3fb0fb..ec44532 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-shell-extension-appindicator-40.tar.gz) = 72b3ecf0eadde40fd3567b19d7c7064953847ec86298691097f9fe14cada37206f8edd898c1d2a8fe71aeb0ace4921d1797d2dcc9eeacc0cb04a25841125b2ef
+SHA512 (gnome-shell-extension-appindicator-41.tar.gz) = 8c67011884bc4cf6e4ddfc3ac0c191830775050d07cf3f8d7462ff4e0050cea00fd3f8372b1c75211e433344c64fea9903982769bc4d0428b51161efd275f5d9