summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorQue Quotion2018-06-04 23:24:33 +0900
committerQue Quotion2018-06-04 23:24:33 +0900
commit9d72066a9083da2a3030cbb987558a7318ad8c7c (patch)
tree79d81f400ccdbd3cba5928ccaad9aad16e73554a
parentfd3f9998fe138c648d72885a0a6819dbfd13effc (diff)
downloadaur-9d72066a9083da2a3030cbb987558a7318ad8c7c.tar.gz
Remove more gala-dependent functions, including drag from panel (kind of pointless with autohide...) NOTE: it is time to rebuild indicators!
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD9
-rw-r--r--minus-backgroundmanager.patch56
-rw-r--r--minus-gala.patch2
-rw-r--r--minus-galaplugin.patch2
5 files changed, 50 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2a69340474d..8de8af8535b 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 = r355.69a0e08
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/elementary/wingpanel
arch = i686
arch = x86_64
@@ -47,9 +47,9 @@ pkgbase = wingpanel-standalone-git
source = y-is-broken-cogl.patch
source = autohide.patch
sha256sums = SKIP
- sha256sums = b8bfc357158efb84113e234f9d0efa108cea460a3d160c2db25d966c93412875
- sha256sums = a1c6e3a9c1553abdf1f676b1861531c3eacb2c32923bff51ca9d96872646636a
- sha256sums = 47934e9aff119cedcfe7d184078ad60d3d715e07f1ca7cb1715e50b2e0c517e8
+ sha256sums = dc9870a9e58ba1c438c4b631c95ce7e5a5f76b9e53355959e67ce1ba0263b651
+ sha256sums = 7f972d79b4d72f7b274a96e1a5150cba0e3869ad85215ae01ad2bc19802cdbb9
+ sha256sums = 21e95aec3fbb920f3b8ef34b00bf4fc99f431e1837f84f020d5d00c4e3aaca0b
sha256sums = b1902c1d44ac546df63cd0224a7d2ef2cb6394ca556512c30c370d387db7bbab
sha256sums = da77ed83459b7d49056f35b9de1dd8b487b3c51234911f43b2fa401a38b6dd4a
diff --git a/PKGBUILD b/PKGBUILD
index bd6c0faf5f6..6d46524f080 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=wingpanel-standalone-git
pkgver=r355.69a0e08
-pkgrel=1
+pkgrel=2
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'
@@ -29,9 +29,9 @@ source=('git+https://github.com/elementary/wingpanel.git'
'y-is-broken-cogl.patch'
'autohide.patch')
sha256sums=('SKIP'
- 'b8bfc357158efb84113e234f9d0efa108cea460a3d160c2db25d966c93412875'
- 'a1c6e3a9c1553abdf1f676b1861531c3eacb2c32923bff51ca9d96872646636a'
- '47934e9aff119cedcfe7d184078ad60d3d715e07f1ca7cb1715e50b2e0c517e8'
+ 'dc9870a9e58ba1c438c4b631c95ce7e5a5f76b9e53355959e67ce1ba0263b651'
+ '7f972d79b4d72f7b274a96e1a5150cba0e3869ad85215ae01ad2bc19802cdbb9'
+ '21e95aec3fbb920f3b8ef34b00bf4fc99f431e1837f84f020d5d00c4e3aaca0b'
'b1902c1d44ac546df63cd0224a7d2ef2cb6394ca556512c30c370d387db7bbab'
'da77ed83459b7d49056f35b9de1dd8b487b3c51234911f43b2fa401a38b6dd4a')
@@ -52,6 +52,7 @@ prepare() {
#Standalone patches
msg2 "Remove Gala dependecies"
rm -rf wingpanel-interface
+ rm src/Services/BackgroundManager.vala
patch -Np2 < ../minus-backgroundmanager.patch
patch -Np2 < ../minus-galaplugin.patch
patch -Np2 < ../minus-gala.patch
diff --git a/minus-backgroundmanager.patch b/minus-backgroundmanager.patch
index 7c71dad2d71..234c7bb1481 100644
--- a/minus-backgroundmanager.patch
+++ b/minus-backgroundmanager.patch
@@ -1,5 +1,5 @@
--- src/wingpanel/src/PanelWindow.vala 2016-10-21 23:51:49.434036000 +0900
-+++ src/wingpanel/src/PanelWindow.vala.new 2016-10-22 00:21:00.991151961 +0900
++++ src/wingpanel/src/PanelWindow.vala 2016-10-22 00:21:00.991151961 +0900
@@ -86,7 +86,6 @@
private void on_realize () {
update_panel_dimensions ();
@@ -24,8 +24,8 @@
this.expanded = false;
---- src/wingpanel/src/Widgets/Panel.vala 2016-10-22 00:14:45.485792472 +0900
-+++ src/wingpanel/src/Widgets/Panel.vala.new 2016-10-22 00:15:13.386112571 +0900
+--- 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;
@@ -33,29 +33,52 @@
- private Gtk.CssProvider? style_provider = null;
public Panel (Services.PopoverManager popover_manager) {
- Object (popover_manager : popover_manager, orientation: Gtk.Orientation.HORIZONTAL);
-@@ -60,7 +60,6 @@
+ Object (popover_manager : popover_manager);
+@@ -64,39 +63,6 @@
style_context = this.get_style_context ();
- Services.BackgroundManager.get_default ().background_state_changed.connect (update_background);
- }
-
- private void add_indicator (Indicator indicator) {
-@@ -93,8 +93,7 @@
-
- popover_manager.close ();
-
+- }
+-
+- public override bool button_press_event (Gdk.EventButton event) {
+- if (event.button != Gdk.BUTTON_PRIMARY) {
+- return Gdk.EVENT_PROPAGATE;
+- }
+-
+- var window = get_window ();
+- if (window == null) {
+- return Gdk.EVENT_PROPAGATE;
+- }
+-
+- // Grabbing with touchscreen on X does not work unfortunately
+- if (event.device.get_source () == Gdk.InputSource.TOUCHSCREEN) {
+- return Gdk.EVENT_PROPAGATE;
+- }
+-
+- uint32 time = event.time;
+-
+-#if HAS_GTK320
+- window.get_display ().get_default_seat ().ungrab ();
+-#else
+- window.get_display ().pointer_ungrab (time);
+-#endif
+-
+- Gdk.ModifierType state;
+- event.get_state (out state);
+-
+- popover_manager.close ();
+-
- var background_manager = Services.BackgroundManager.get_default ();
- return background_manager.begin_grab_focused_window ((int)event.x_root, (int)event.y_root, (int)event.button, time, state);
-+ return Gdk.EVENT_PROPAGATE;
}
public void cycle (bool forward) {
-@@ -228,55 +227,4 @@
+@@ -263,56 +229,4 @@
+ }
}
}
-
+-
- private void update_background (Services.BackgroundState state, uint animation_duration) {
- if (style_provider == null) {
- style_provider = new Gtk.CssProvider ();
@@ -109,7 +132,7 @@
- }
}
--- src/wingpanel/src/CMakeLists.txt 2017-10-13 03:28:23.119421691 +0900
-+++ src/wingpanel/src/CMakeLists.txt.new 2017-10-13 03:30:12.838158479 +0900
++++ src/wingpanel/src/CMakeLists.txt 2017-10-13 03:30:12.838158479 +0900
@@ -10,7 +10,6 @@
Services/IndicatorSorter.vala
Services/PopoverManager.vala
@@ -118,4 +141,3 @@
)
vala_precompile (CLIENT_VALA_C ${CMAKE_PROJECT_NAME}
-
diff --git a/minus-gala.patch b/minus-gala.patch
index a77af80faf7..f6c93f4d0f6 100644
--- a/minus-gala.patch
+++ b/minus-gala.patch
@@ -1,5 +1,5 @@
--- src/wingpanel/.travis.yml 2017-10-13 02:26:35.980021306 +0900
-+++ src/wingpanel/.travis.yml.new 2017-10-13 02:29:58.537336177 +0900
++++ src/wingpanel/.travis.yml 2017-10-13 02:29:58.537336177 +0900
@@ -4,7 +4,7 @@
- docker
diff --git a/minus-galaplugin.patch b/minus-galaplugin.patch
index fba87d82ffa..e4be0c99a92 100644
--- a/minus-galaplugin.patch
+++ b/minus-galaplugin.patch
@@ -1,5 +1,5 @@
--- src/wingpanel/CMakeLists.txt 2017-10-13 03:25:28.007664080 +0900
-+++ src/wingpanel/CMakeLists.txt.new 2017-10-13 03:27:00.135900068 +0900
++++ src/wingpanel/CMakeLists.txt 2017-10-13 03:27:00.135900068 +0900
@@ -121,8 +121,6 @@
set (DEPS_LIBRARIES ${DEPS_LIBRARIES} ${LIB_NAME})
add_subdirectory (src)