wingpanel-standalone-git: a replacement for wingpanel-standalone-bzr

7 files changed, 154 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d436a6516a83..b9ad463aea8e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,47 +1,58 @@
 # Generated by mksrcinfo v8
-# Sat Mar  4 16:22:59 UTC 2017
-pkgbase = wingpanel-standalone-bzr
-	pkgdesc = The Pantheon Panel (without Gala dependencies)
-	pkgver = r172
+# Mon May 15 04:34:03 UTC 2017
+pkgbase = wingpanel-standalone-git
+	pkgdesc = Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)
+	pkgver = r283.54cd1fe
 	pkgrel = 1
-	url = https://launchpad.net/wingpanel
-	install = wingpanel.install
+	url = https://github.com/elementary/wingpanel
 	arch = i686
 	arch = x86_64
+	groups = pantheon-unstable
 	groups = pantheon-qq
 	license = GPL3
-	makedepends = bzr
 	makedepends = cmake
+	makedepends = git
+	makedepends = granite-git
 	makedepends = vala
-	depends = clutter
-	depends = cogl
 	depends = glib2
 	depends = glibc
 	depends = gtk3
 	depends = libgee
 	depends = mutter
 	depends = libgranite.so
-	depends = slingshot-launcher-standalone-bzr
+	optdepends = slingshot-launcher-standalone-bzr: Application launcher (without Gala dependencies)
+	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-sound-git: Tray applet
+	optdepends = wingpanel-indicator-ayatana-bzr: Unity 7 Tray applets
 	optdepends = indicator-powersave: On the fly power savings and performance toggles
-	optdepends = wingpanel-indicator-ayatana-bzr: Tray applet
-	optdepends = wingpanel-indicator-bluetooth-bzr: Tray applet
-	optdepends = wingpanel-indicator-datetime-bzr: Tray applet
-	optdepends = wingpanel-indicator-network-bzr: Tray applet
-	optdepends = wingpanel-indicator-power-bzr: Tray applet
-	optdepends = wingpanel-indicator-sound-bzr: Tray applet
+	optdepends = glippy-indicator: Excellent clipboard manager applet
+	optdepends = indicator-sensors: Sensors readout applet
 	provides = wingpanel
 	provides = wingpanel-bzr
+	provides = wingpanel-standalone-bzr
+	provides = wingpanel-git
 	provides = libwingpanel-2.0.so
 	conflicts = wingpanel
-	conflicts = wingpanel-bzr
-	source = wingpanel::bzr+lp:wingpanel
+	replaces = wingpanel-standalone-bzr
+	source = git+https://github.com/elementary/wingpanel.git
 	source = minus-backgroundmanager.patch
 	source = minus-galaplugin.patch
-	source = disable-expanded.patch
+	source = minus-gala-cmake.patch
+	source = y-is-broken-cogl.patch
+	source = autohide.patch
 	sha256sums = SKIP
 	sha256sums = 0fd440cdb4b9871c5ee8812866b365e4a45b29813800345556db74429bacca3e
 	sha256sums = 1f50f34a7d36fc8331c1080c42c38f8208e35f4551eed97705919d304d410c95
-	sha256sums = 383e96233c95335d2ef4390e15c7c3cff1c146b6736390e90e96e5e59ea43f3e
+	sha256sums = 910130e7033db8874ed8d5e1734c6eb0ce75eed7ddf2620400c2a129cf05755d
+	sha256sums = df03ebb7fe08da77d51e6b96ab033b5c712530727d9fa2dd61420d2c7923fced
+	sha256sums = 2705bd49c38debd20ad2759fa880238661530abdd8962a5373d0b431cd7cf084
 
-pkgname = wingpanel-standalone-bzr
+pkgname = wingpanel-standalone-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 46e1fec75385..6d347d559b20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,43 @@
 # Maintainer: Que Quotion <quequotion@bugmenot.org>
 # Contributor: Maxime Gauduin <alucryd@archlinux.org>
-# Contributor: Ner0 <darkelfdarkelf666@yahoo.co.uk>
-# Contributor: flamelab <panosfilip@gmail.com>
 
-pkgname=wingpanel-standalone-bzr
-pkgver=r172
+pkgname=wingpanel-standalone-git
+pkgver=r283.54cd1fe
 pkgrel=1
-pkgdesc='The Pantheon Panel (without Gala dependencies)'
+pkgdesc='Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)'
 arch=('i686' 'x86_64')
-url='https://launchpad.net/wingpanel'
+url='https://github.com/elementary/wingpanel'
 license=('GPL3')
-groups=('pantheon-qq')
-depends=('clutter' 'cogl' 'glib2' 'glibc' 'gtk3' 'libgee' 'mutter'
-         'libgranite.so' 'slingshot-launcher-standalone-bzr')
-makedepends=('bzr' 'cmake' 'vala')
-optdepends=("indicator-powersave: On the fly power savings and performance toggles"
-            wingpanel-indicator-{ayatana,bluetooth,datetime,network,power,sound}-bzr": Tray applet")
-provides=(wingpanel{,-bzr} 'libwingpanel-2.0.so')
-conflicts=(wingpanel{,-bzr})
-install='wingpanel.install'
-source=('wingpanel::bzr+lp:wingpanel'
+groups=('pantheon-unstable' 'pantheon-qq')
+depends=('glib2' 'glibc' 'gtk3' 'libgee' 'mutter'
+         'libgranite.so')
+makedepends=('cmake' 'git' 'granite-git' 'vala')
+optdepends=("slingshot-launcher-standalone-bzr: Application launcher (without Gala dependencies)"
+            wingpanel-indicator-{a11y,bluetooth,datetime,keyboard,network,notifications,power,session,sound}-git": Tray applet"
+            "wingpanel-indicator-ayatana-bzr: Unity 7 Tray applets"
+            "indicator-powersave: On the fly power savings and performance toggles"
+            "glippy-indicator: Excellent clipboard manager applet"
+            "indicator-sensors: Sensors readout applet")
+provides=(wingpanel{,{,-standalone}-bzr,-git} 'libwingpanel-2.0.so')
+conflicts=('wingpanel')
+replaces=('wingpanel-standalone-bzr')
+source=('git+https://github.com/elementary/wingpanel.git'
         'minus-backgroundmanager.patch'
         'minus-galaplugin.patch'
-        'disable-expanded.patch')
+        'minus-gala-cmake.patch'
+        'y-is-broken-cogl.patch'
+        'autohide.patch')
 sha256sums=('SKIP'
             '0fd440cdb4b9871c5ee8812866b365e4a45b29813800345556db74429bacca3e'
             '1f50f34a7d36fc8331c1080c42c38f8208e35f4551eed97705919d304d410c95'
-            '383e96233c95335d2ef4390e15c7c3cff1c146b6736390e90e96e5e59ea43f3e')
+            '910130e7033db8874ed8d5e1734c6eb0ce75eed7ddf2620400c2a129cf05755d'
+            'df03ebb7fe08da77d51e6b96ab033b5c712530727d9fa2dd61420d2c7923fced'
+            '2705bd49c38debd20ad2759fa880238661530abdd8962a5373d0b431cd7cf084')
 
 pkgver() {
   cd wingpanel
 
-  echo "r$(bzr revno)"
+  echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 prepare() {
@@ -43,17 +49,27 @@ prepare() {
   mkdir build
 
   #Standalone patches
+  msg2 "minus bgm"
   patch -Np2 < ../minus-backgroundmanager.patch
+  msg2 "minus gpg"
   patch -Np2 < ../minus-galaplugin.patch
+  msg2 "minus gcm"
+  patch -Np2 < ../minus-gala-cmake.patch
 
-  #fix focus stealing
-  patch -Np2 < ../disable-expanded.patch
+  #autohide
+  #msg2 "autohide"
+  #patch -Np2 < ../autohide.patch
+
+  #Cogl can't be found, although it is installed. Arch-specific? .so bump?
+  msg2 "minus cgl"
+  patch -Np2 < ../y-is-broken-cogl.patch
 }
 
 build() {
   cd wingpanel/build
 
   cmake .. \
+    -DCMAKE_BUILD_TYPE='Release' \
     -DCMAKE_INSTALL_PREFIX='/usr' \
     -DCMAKE_INSTALL_LIBDIR='/usr/lib' \
     -DGSETTINGS_COMPILE='FALSE'
diff --git a/autohide.patch b/autohide.patch
new file mode 100644
index 000000000000..55b52d48e88d
--- /dev/null
+++ b/autohide.patch
@@ -0,0 +1,46 @@
+--- src/wingpanel/src/PanelWindow.vala	2017-05-14 21:30:04.493149180 +0900
++++ src/wingpanel/src/PanelWindow.vala.new	2017-05-14 21:34:12.288040769 +0900
+@@ -65,7 +65,9 @@
+         panel = new Widgets.Panel (popover_manager);
+         panel.realize.connect (on_realize);
+ 
++        panel.connect ("enter_notify_event", on_realize);
++        panel.connect ("leave_notify_event", on_idle);
+         this.add (panel);
+ 
+         this.set_size_request (monitor_width, -1);
+         this.resize (monitor_width, 1);
+@@ -83,12 +84,32 @@
+         return true;
+     }
+ 
++    private bool animation_unstep () {
++        if (panel_displacement == -1) {
++            return false;
++        }
++
++        panel_displacement++;
++
++        update_panel_dimensions ();
++
++        return true;
++    }
++
+     private void on_realize () {
+         update_panel_dimensions ();
+ 
+         //Services.BackgroundManager.get_default ().initialize (this.monitor_number, panel_height);
+ 
+-        Timeout.add (300 / panel_height, animation_step);
++        Timeout.add (250 / panel_height, animation_step);
++    }
++
++    private void on_idle () {
++        update_panel_dimensions ();
++
++        //Services.BackgroundManager.get_default ().initialize (this.monitor_number, panel_height);
++
++        Timeout.add (250 / panel_height, animation_unstep);
+     }
+ 
+     private void update_panel_dimensions () {
diff --git a/disable-expanded.patch b/disable-expanded.patch
deleted file mode 100644
index be0d6b869165..000000000000
--- a/disable-expanded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wingpanel/src/Services/PopoverManager.vala	2016-11-15 07:39:04.620620000 +0900
-+++ src/wingpanel/src/Services/PopoverManager.vala.new	2017-03-04 23:28:24.941257149 +0900
-@@ -187,7 +187,7 @@
-         });
- 
-         widg.enter_notify_event.connect ((w, e) => {
--            owner.set_expanded (true);
-+            //owner.set_expanded (true);
- 
-             if (mousing) {
-                 return Gdk.EVENT_PROPAGATE;
diff --git a/minus-gala-cmake.patch b/minus-gala-cmake.patch
new file mode 100644
index 000000000000..58a277db9fb1
--- /dev/null
+++ b/minus-gala-cmake.patch
@@ -0,0 +1,20 @@
+--- src/wingpanel/wingpanel-interface/CMakeLists.txt	2017-05-13 01:48:51.209152745 +0900
++++ src/wingpanel/wingpanel-interface/CMakeLists.txt.new	2017-05-13 01:49:13.359612729 +0900
+@@ -1,6 +1,6 @@
+ find_package (PkgConfig)
+ 
+-pkg_check_modules (PLUGIN REQUIRED gala granite)
++pkg_check_modules (PLUGIN REQUIRED granite)
+ 
+ add_definitions (${PLUGIN_CFLAGS})
+ link_directories (${PLUGIN_LIBRARY_DIRS})
+--- src/wingpanel/wingpanel-interface/CMakeLists.txt	2017-05-13 01:34:13.260556652 +0900
++++ src/wingpanel/wingpanel-interface/CMakeLists.txt.new	2017-05-13 01:42:23.542603844 +0900
+@@ -19,7 +19,6 @@
+   Settings.vala
+   Utils.vala
+ PACKAGES
+-  gala
+   granite
+   cogl-fixes
+ OPTIONS 
diff --git a/wingpanel.install b/wingpanel.install
deleted file mode 100644
index 0635cceb4eac..000000000000
--- a/wingpanel.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -ftq /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim: ts=2 sw=2 et:
diff --git a/y-is-broken-cogl.patch b/y-is-broken-cogl.patch
new file mode 100644
index 000000000000..47f6002bbee5
--- /dev/null
+++ b/y-is-broken-cogl.patch
@@ -0,0 +1,19 @@
+--- src/wingpanel/vapi/cogl-fixes.vapi	2017-05-13 02:46:33.880734704 +0900
++++ /dev/null	2017-05-12 04:15:23.019728097 +0900
+@@ -1,6 +0,0 @@
+-namespace CoglFixes
+-{
+-	[CCode (cname = "cogl_texture_get_data")]
+-	public int texture_get_data (Cogl.Texture texture, Cogl.PixelFormat format, uint rowstride, [CCode (array_length = false)] uint8[] pixels);
+-}
+-
+--- src/wingpanel/wingpanel-interface/CMakeLists.txt	2017-05-13 02:48:18.587182018 +0900
++++ src/wingpanel/wingpanel-interface/CMakeLists.txt.new	2017-05-13 02:50:36.857811056 +0900
+@@ -20,7 +20,6 @@
+   Utils.vala
+ PACKAGES
+   granite
+-  cogl-fixes
+ OPTIONS
+   --thread
+   --vapidir=${CMAKE_SOURCE_DIR}/vapi