Revamp optdepends, update backgrounmanager removal

3 files changed, 37 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 29b75d31fb76..3cad03237948 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 = r637.15c0ad1
+	pkgdesc = Stylish top panel (without Gala dependencies)
+	pkgver = r654.0bb8396
 	pkgrel = 1
 	url = https://github.com/elementary/wingpanel
 	arch = i686
@@ -17,19 +17,21 @@ pkgbase = wingpanel-standalone-git
 	depends = libgranite.so
 	depends = libwnck3
 	depends = pantheon-notifications
-	optdepends = pantheon-applications-menu-git: Application launcher
-	optdepends = wingpanel-indicator-a11y-git: Tray applet
-	optdepends = wingpanel-indicator-bluetooth-git: Tray applet
-	optdepends = wingpanel-indicator-datetime-git: Tray applet
-	optdepends = wingpanel-indicator-keyboard-git: Tray applet
-	optdepends = wingpanel-indicator-network-git: Tray applet
-	optdepends = wingpanel-indicator-notifications-git: Tray applet
-	optdepends = wingpanel-indicator-power-git: Tray applet
-	optdepends = wingpanel-indicator-session-git: Tray applet
-	optdepends = wingpanel-indicator-sensors-git: Tray applet
-	optdepends = wingpanel-indicator-sound-git: Tray applet
-	optdepends = wingpanel-indicator-ayatana-git: Display Unity 7 tray applets}
-	optdepends = wingpanel-indicator-namarupa-git: Display Unity 7 tray applets}
+	optdepends = pantheon-applications-menu: Application launcher
+	optdepends = wingpanel-indicator-datetime: Clock and Calendar Widget
+	optdepends = wingpanel-indicator-a11y: System indicator
+	optdepends = wingpanel-indicator-bluetooth: System indicator
+	optdepends = wingpanel-indicator-keyboard: System indicator
+	optdepends = wingpanel-indicator-network: System indicator
+	optdepends = wingpanel-indicator-nightlight: System indicator
+	optdepends = wingpanel-indicator-notifications: System indicator
+	optdepends = wingpanel-indicator-power: System indicator
+	optdepends = wingpanel-indicator-privacy: System indicator
+	optdepends = wingpanel-indicator-sensors: System indicator
+	optdepends = wingpanel-indicator-sound: System indicator
+	optdepends = wingpanel-indicator-session-standalone-git: Session indicator for Wingpanel (without Gala dependencies)
+	optdepends = wingpanel-indicator-ayatana-git: Display Unity 7 indicators}
+	optdepends = wingpanel-indicator-namarupa-git: Display Unity 7 indicators}
 	provides = wingpanel
 	provides = wingpanel-git
 	provides = libwingpanel.so
@@ -38,7 +40,6 @@ pkgbase = wingpanel-standalone-git
 	conflicts = wingpanel-git
 	conflicts = libwingpanel.so
 	conflicts = libwingpanel-2.0.so
-	replaces = wingpanel-standalone-bzr
 	source = git+https://github.com/elementary/wingpanel.git
 	source = minus-backgroundmanager.patch
 	source = minus-galaplugin.patch
@@ -46,7 +47,7 @@ pkgbase = wingpanel-standalone-git
 	source = fix-for-openbox.patch
 	source = no-mutter-typelib.patch
 	sha256sums = SKIP
-	sha256sums = 4d674f514d68c87ff5c23d0daa58a6d7e7c62c67142ebc734e88c45e940f7751
+	sha256sums = 1fbc81bbb6c6ac59f7ea8761cdac0714fd2f39877dc81a0b0d6db855163d4f14
 	sha256sums = aa0a27e41df60a7b15e2fd7e0d06551663b98917b7632e4067e6b9a39407de1c
 	sha256sums = 6d4c88c4b6dd13fc7ca60f2e2387f3af86d804f89591bd7826cf93a946b6f1b6
 	sha256sums = aa15974b87a1000ab432bb048bc8a6ba0f36edd24e682d4e57833179c7b93f45
diff --git a/PKGBUILD b/PKGBUILD
index 84279048f69f..0a8f8868aade 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,22 @@
 # Contributor: Maxime Gauduin <alucryd@archlinux.org>
 
 pkgname=wingpanel-standalone-git
-pkgver=r637.15c0ad1
+pkgver=r654.0bb8396
 pkgrel=1
-pkgdesc='Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)'
+pkgdesc='Stylish top panel (without Gala dependencies)'
 arch=('i686' 'x86_64')
 url='https://github.com/elementary/wingpanel'
 license=('GPL3')
 groups=('pantheon-qq')
 depends=(glib2 gtk3 lib{gee,granite.so,wnck3} pantheon-notifications)
 makedepends=('meson' 'libgranite.so' 'git' 'vala')
-optdepends=("pantheon-applications-menu-git: Application launcher"
-            wingpanel-indicator-{a11y,bluetooth,datetime,keyboard,network,notifications,power,session,sensors,sound}-git": Tray applet"
-            wingpanel-indicator-{ayatana,namarupa}-git": Display Unity 7 tray applets"})
+optdepends=("pantheon-applications-menu: Application launcher"
+            "wingpanel-indicator-datetime: Clock and calendar widget"
+            wingpanel-indicator-{a11y,bluetooth,keyboard,network,nightlight,notifications,power,privacy,sensors,sound}": System indicator"
+            "wingpanel-indicator-session-standalone-git: Session indicator for Wingpanel (without Gala dependencies)"
+            wingpanel-indicator-{ayatana,namarupa}-git": Display Unity 7 indicators"})
 provides=(wingpanel{,-git} libwingpanel{,-2.0}.so)
-#provides=(wingpanel{,{,-standalone}-bzr,-git} 'libwingpanel-2.0.so')
 conflicts=(wingpanel{,-git} libwingpanel{,-2.0}.so)
-#conflicts=(wingpanel{,{,-standalone}-bzr,-git} 'libwingpanel-2.0.so')
-replaces=('wingpanel-standalone-bzr')
 source=('git+https://github.com/elementary/wingpanel.git'
         'minus-backgroundmanager.patch'
         'minus-galaplugin.patch'
@@ -26,7 +25,7 @@ source=('git+https://github.com/elementary/wingpanel.git'
         'fix-for-openbox.patch'
         'no-mutter-typelib.patch')
 sha256sums=('SKIP'
-            '4d674f514d68c87ff5c23d0daa58a6d7e7c62c67142ebc734e88c45e940f7751'
+            '1fbc81bbb6c6ac59f7ea8761cdac0714fd2f39877dc81a0b0d6db855163d4f14'
             'aa0a27e41df60a7b15e2fd7e0d06551663b98917b7632e4067e6b9a39407de1c'
             '6d4c88c4b6dd13fc7ca60f2e2387f3af86d804f89591bd7826cf93a946b6f1b6'
             'aa15974b87a1000ab432bb048bc8a6ba0f36edd24e682d4e57833179c7b93f45'
diff --git a/minus-backgroundmanager.patch b/minus-backgroundmanager.patch
index 2ec4879ed4ac..1bfc362e4a61 100644
--- a/minus-backgroundmanager.patch
+++ b/minus-backgroundmanager.patch
@@ -27,26 +27,20 @@
 --- src/wingpanel/src/Widgets/Panel.vala	2018-06-04 19:55:35.553769970 +0900
 +++ src/wingpanel/src/Widgets/Panel.vala	2018-06-04 21:39:40.293996810 +0900
 @@ -25,7 +25,6 @@
-     private MenuBar center_menubar;
+     private Gtk.MenuBar center_menubar;
  
      private unowned Gtk.StyleContext style_context;
 -    private Gtk.CssProvider? style_provider = null;
  
-     private int _draw_y = 0;
-     public int draw_y {
-@@ -64,8 +63,6 @@
-         style_context = get_style_context ();
+     private static Gtk.CssProvider resource_provider;
+ 
+@@ -82,39 +81,6 @@
          style_context.add_class (StyleClass.PANEL);
          style_context.add_provider (resource_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
--
--        Services.BackgroundManager.get_default ().background_state_changed.connect (update_background);
- 
-         var granite_settings = Granite.Settings.get_default ();
-         var gtk_settings = Gtk.Settings.get_default ();
-@@ -111,38 +108,6 @@
-         });
-     }
  
+-        Services.BackgroundManager.get_default ().background_state_changed.connect (update_background);
+-    }
+-
 -    public override bool button_press_event (Gdk.EventButton event) {
 -        if (event.button != Gdk.BUTTON_PRIMARY) {
 -            return Gdk.EVENT_PROPAGATE;
@@ -77,16 +71,13 @@
 -
 -        var background_manager = Services.BackgroundManager.get_default ();
 -        return background_manager.begin_grab_focused_window (x, y, (int)event.button, time, state);
--    }
--
+     }
+ 
      public void cycle (bool forward) {
-         var current = popover_manager.current_indicator;
-         if (current == null) {
-@@ -263,56 +229,4 @@
-             }
+@@ -282,55 +248,4 @@
          }
      }
--
+ 
 -    private void update_background (Services.BackgroundState state, uint animation_duration) {
 -        if (style_provider == null) {
 -            style_provider = new Gtk.CssProvider ();