summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorQue Quotion2018-07-03 22:44:27 +0900
committerQue Quotion2018-07-03 22:44:27 +0900
commit8390531c3213edfdc352b44fca0bc09b61d44063 (patch)
tree207e07ad43bb401d4532bc323a441cdee2a553c5
parent3afc79442c58621b61554a63929bed680b8a9571 (diff)
downloadaur-8390531c3213edfdc352b44fca0bc09b61d44063.tar.gz
Temporarily reverse upstream commit 105c1d0 to fix missing submenus in (Ayatana) indicators
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD14
-rw-r--r--reverse-105c1d0.patch23
3 files changed, 37 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index be384915ed4..f3cd2ef9621 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = wingpanel-standalone-git
pkgdesc = Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)
- pkgver = r358.5a038ca
- pkgrel = 2
+ pkgver = r361.f8341c8
+ pkgrel = 1
url = https://github.com/elementary/wingpanel
arch = i686
arch = x86_64
@@ -46,12 +46,14 @@ pkgbase = wingpanel-standalone-git
source = minus-gala.patch
source = y-is-broken-cogl.patch
source = autohide.patch
+ source = reverse-105c1d0.patch
sha256sums = SKIP
sha256sums = dc9870a9e58ba1c438c4b631c95ce7e5a5f76b9e53355959e67ce1ba0263b651
sha256sums = 7f972d79b4d72f7b274a96e1a5150cba0e3869ad85215ae01ad2bc19802cdbb9
sha256sums = 21e95aec3fbb920f3b8ef34b00bf4fc99f431e1837f84f020d5d00c4e3aaca0b
sha256sums = b1902c1d44ac546df63cd0224a7d2ef2cb6394ca556512c30c370d387db7bbab
sha256sums = cd7a7bf3c3cec2812f0bb4a355588fe95530c6220e0c92abcae49713ab66f924
+ sha256sums = 53bfa2220d14065ca848c36217abe812685c7d6e0d42251423d0faa2a0ac5394
pkgname = wingpanel-standalone-git
diff --git a/PKGBUILD b/PKGBUILD
index 704c9b36893..4fec7005a76 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Maxime Gauduin <alucryd@archlinux.org>
pkgname=wingpanel-standalone-git
-pkgver=r358.5a038ca
-pkgrel=2
+pkgver=r361.f8341c8
+pkgrel=1
pkgdesc='Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)'
arch=('i686' 'x86_64')
url='https://github.com/elementary/wingpanel'
@@ -27,13 +27,15 @@ source=('git+https://github.com/elementary/wingpanel.git'
'minus-galaplugin.patch'
'minus-gala.patch'
'y-is-broken-cogl.patch'
- 'autohide.patch')
+ 'autohide.patch'
+ 'reverse-105c1d0.patch')
sha256sums=('SKIP'
'dc9870a9e58ba1c438c4b631c95ce7e5a5f76b9e53355959e67ce1ba0263b651'
'7f972d79b4d72f7b274a96e1a5150cba0e3869ad85215ae01ad2bc19802cdbb9'
'21e95aec3fbb920f3b8ef34b00bf4fc99f431e1837f84f020d5d00c4e3aaca0b'
'b1902c1d44ac546df63cd0224a7d2ef2cb6394ca556512c30c370d387db7bbab'
- 'cd7a7bf3c3cec2812f0bb4a355588fe95530c6220e0c92abcae49713ab66f924')
+ 'cd7a7bf3c3cec2812f0bb4a355588fe95530c6220e0c92abcae49713ab66f924'
+ '53bfa2220d14065ca848c36217abe812685c7d6e0d42251423d0faa2a0ac5394')
pkgver() {
cd wingpanel
@@ -44,6 +46,10 @@ pkgver() {
prepare() {
cd wingpanel
+ #Reverse 105c1d0
+ msg2 "Autohide"
+ patch -Np1 < ../reverse-105c1d0.patch
+
#Autohide
msg2 "Autohide"
patch -Np2 < ../autohide.patch
diff --git a/reverse-105c1d0.patch b/reverse-105c1d0.patch
new file mode 100644
index 00000000000..85f52a71a03
--- /dev/null
+++ b/reverse-105c1d0.patch
@@ -0,0 +1,23 @@
+diff --git a/src/Widgets/IndicatorEntry.vala b/src/Widgets/IndicatorEntry.vala
+index 2ad9776..f68051d 100644
+--- a/src/Widgets/IndicatorEntry.vala
++++ b/src/Widgets/IndicatorEntry.vala
+@@ -59,6 +59,18 @@ public class Wingpanel.Widgets.IndicatorEntry : Gtk.MenuItem {
+ this.add (revealer);
+ revealer.add (display_widget);
+
++ if (indicator_widget == null) {
++ this.button_press_event.connect ((e) => {
++ popover_manager.close ();
++ display_widget.button_press_event (e);
++
++ return Gdk.EVENT_PROPAGATE;
++ });
++ set_reveal (base_indicator.visible);
++
++ return;
++ }
++
+ if (base_indicator.visible) {
+ popover_manager.register_indicator (this);
+ }