Deprecate Ayatana indicators, remove more mutter-related code

4 files changed, 30 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a8844c6000d..14772b7b13d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = wingpanel-standalone-git
 	pkgdesc = Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)
-	pkgver = r546.d8aeb88
+	pkgver = r563.88305e0
 	pkgrel = 1
 	url = https://github.com/elementary/wingpanel
 	arch = i686
@@ -46,11 +46,13 @@ pkgbase = wingpanel-standalone-git
 	source = minus-galaplugin.patch
 	source = autohide.patch
 	source = reverse-105c1d0.patch
+	source = no-mutter-typelib.patch
 	sha256sums = SKIP
-	sha256sums = d7104f0e32cd095e4b9564c90ca8d0f0f313e57f8a77a383c9bf5a30a6361a02
+	sha256sums = 69d564a34766b2bc16f9756b5915223da33cfd66c46b206aa6c4342f94404ba9
 	sha256sums = aa0a27e41df60a7b15e2fd7e0d06551663b98917b7632e4067e6b9a39407de1c
 	sha256sums = cbea39c2f11ecaf8f6d86f79253746575da479bdd25a166a36ee82f09f9135a0
 	sha256sums = 53bfa2220d14065ca848c36217abe812685c7d6e0d42251423d0faa2a0ac5394
+	sha256sums = 5b29e24b4dc9076d54621334b839d2dbfa6a6adce1e8b444e38c2412f314f8c7
 
 pkgname = wingpanel-standalone-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 3d172a0a92c8..cf4a6a46e089 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Maxime Gauduin <alucryd@archlinux.org>
 
 pkgname=wingpanel-standalone-git
-pkgver=r546.d8aeb88
+pkgver=r563.88305e0
 pkgrel=1
 pkgdesc='Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)'
 arch=('i686' 'x86_64')
@@ -24,12 +24,14 @@ source=('git+https://github.com/elementary/wingpanel.git'
         'minus-backgroundmanager.patch'
         'minus-galaplugin.patch'
         'autohide.patch'
-        'reverse-105c1d0.patch')
+        'reverse-105c1d0.patch'
+        'no-mutter-typelib.patch')
 sha256sums=('SKIP'
-            'd7104f0e32cd095e4b9564c90ca8d0f0f313e57f8a77a383c9bf5a30a6361a02'
+            '69d564a34766b2bc16f9756b5915223da33cfd66c46b206aa6c4342f94404ba9'
             'aa0a27e41df60a7b15e2fd7e0d06551663b98917b7632e4067e6b9a39407de1c'
             'cbea39c2f11ecaf8f6d86f79253746575da479bdd25a166a36ee82f09f9135a0'
-            '53bfa2220d14065ca848c36217abe812685c7d6e0d42251423d0faa2a0ac5394')
+            '53bfa2220d14065ca848c36217abe812685c7d6e0d42251423d0faa2a0ac5394'
+            '5b29e24b4dc9076d54621334b839d2dbfa6a6adce1e8b444e38c2412f314f8c7')
 
 pkgver() {
   cd wingpanel
@@ -45,9 +47,9 @@ prepare() {
   patch -Np1 < ../autohide.patch
   #patch -Np2 < ../autohide-testing.patch
 
-  #Reverse 105c1d0
-  msg2 "Reverse commit 105c1d0"
-  patch -Np1 < ../reverse-105c1d0.patch
+  #Reverse 105c1d0 (restores Ayatana indicator submenus)
+  #msg2 "Reverse commit 105c1d0"
+  #patch -Np1 < ../reverse-105c1d0.patch
 
   #Standalone patches
   msg2 "Remove Gala dependecies"
@@ -55,6 +57,8 @@ prepare() {
   rm src/Services/BackgroundManager.vala
   patch -Np2 < ../minus-backgroundmanager.patch
   patch -Np2 < ../minus-galaplugin.patch
+  patch -Np2 < ../no-mutter-typelib.patch
+  #rm vapi/meson.build
 
   [ ! -d build ] || rm -rf build
 }
diff --git a/minus-backgroundmanager.patch b/minus-backgroundmanager.patch
index 73e2062aa9e1..b61f45bd6c48 100644
--- a/minus-backgroundmanager.patch
+++ b/minus-backgroundmanager.patch
@@ -144,12 +144,12 @@
 -    }
  }
 --- src/wingpanel/src/meson.build	2018-12-02 05:25:42.153643446 +0900
-+++ src/wingpanel/src/meson.build.new	2018-12-02 05:27:27.293643581 +0900
++++ src/wingpanel/src/meson.build	2018-12-02 05:27:27.293643581 +0900
 @@ -1,7 +1,6 @@
- wingpanel_files = files(
-     'Wingpanel.vala',
      'PanelWindow.vala',
+     'SessionManager.vala',
+     'Wingpanel.vala',
 -    'Services/BackgroundManager.vala',
      'Services/IndicatorSorter.vala',
      'Services/PopoverManager.vala',
-     'Services/Settings.vala',
+     'Widgets/IndicatorEntry.vala',
diff --git a/no-mutter-typelib.patch b/no-mutter-typelib.patch
new file mode 100644
index 000000000000..a3221d158392
--- /dev/null
+++ b/no-mutter-typelib.patch
@@ -0,0 +1,11 @@
+--- src/wingpanel/meson.build	2020-03-14 00:07:59.858551777 +0900
++++ src/wingpanel/meson.build	2020-03-14 00:09:42.086551692 +0900
+@@ -44,8 +44,5 @@
+ endif
+ subdir('po')
+ vapigen = find_program('vapigen', required: false)
+-if vapigen.found()
+-	subdir('vapi')
+-endif
+ 
+ meson.add_install_script('meson/post_install.py')