diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | PKGBUILD | 19 | ||||
| -rw-r--r-- | autohide.patch | 60 | ||||
| -rw-r--r-- | minus-backgroundmanager.patch | 17 | ||||
| -rw-r--r-- | minus-gala.patch | 11 |
5 files changed, 39 insertions, 84 deletions
@@ -1,6 +1,6 @@ pkgbase = wingpanel-standalone-git pkgdesc = Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies) - pkgver = r387.fc1b8ea + pkgver = r413.b6811e8 pkgrel = 1 url = https://github.com/elementary/wingpanel arch = i686 @@ -10,9 +10,6 @@ pkgbase = wingpanel-standalone-git makedepends = meson makedepends = git makedepends = vala - depends = glib2 - depends = glibc - depends = gtk3 depends = libgee depends = libgranite.so depends = libwnck3 @@ -26,11 +23,12 @@ pkgbase = wingpanel-standalone-git 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: Unity 7 Tray applets + optdepends = wingpanel-indicator-ayatana-git: Display Unity 7 tray applets + optdepends = wingpanel-indicator-namarupa-git: Display Unity 7 tray applets optdepends = indicator-powersave: On the fly power savings and performance toggles optdepends = glippy-indicator: Excellent clipboard manager applet - optdepends = indicator-sensors: Sensors readout applet optdepends = ubuntu-indicator-weather: Simple weather applet provides = wingpanel provides = wingpanel-bzr @@ -46,14 +44,12 @@ pkgbase = wingpanel-standalone-git source = git+https://github.com/elementary/wingpanel.git source = minus-backgroundmanager.patch source = minus-galaplugin.patch - source = minus-gala.patch source = autohide.patch source = reverse-105c1d0.patch sha256sums = SKIP - sha256sums = 206e5e66501bd0aaefaa422edb4ef5b47dc5c1aff8a90410971b8be2147245e6 + sha256sums = ab49041873724b299131e6d6f59ff20cbfd1c48b9cd61bbac4ab16cc005d0f1a sha256sums = aa0a27e41df60a7b15e2fd7e0d06551663b98917b7632e4067e6b9a39407de1c - sha256sums = 04fc55095e9fabc61862ef9a54934402b940b6cfa90fe5ed67462aa78e6e8f8e - sha256sums = 54d0fa9110eb948bc7a8ac55ed323b6979aabdf0657dcabfae2304b1dd16c194 + sha256sums = 1d5ccfa659b0e63637a8a84adbbf1fb104a3f9ca565755f13ec89ed7e9073384 sha256sums = 53bfa2220d14065ca848c36217abe812685c7d6e0d42251423d0faa2a0ac5394 pkgname = wingpanel-standalone-git @@ -2,22 +2,20 @@ # Contributor: Maxime Gauduin <alucryd@archlinux.org> pkgname=wingpanel-standalone-git -pkgver=r387.fc1b8ea +pkgver=r413.b6811e8 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' license=('GPL3') groups=('pantheon-qq') -depends=('glib2' 'glibc' 'gtk3' 'libgee' - 'libgranite.so' 'libwnck3' 'cogl') +depends=(lib{gee,granite.so,wnck3} 'cogl') makedepends=('meson' 'git' 'vala') optdepends=("pantheon-applications-menu-git: Application launcher" - wingpanel-indicator-{a11y,bluetooth,datetime,keyboard,network,notifications,power,session,sound}-git": Tray applet" - "wingpanel-indicator-ayatana-git: Unity 7 Tray applets" + 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" "indicator-powersave: On the fly power savings and performance toggles" "glippy-indicator: Excellent clipboard manager applet" - "indicator-sensors: Sensors readout applet" "ubuntu-indicator-weather: Simple weather applet") provides=(wingpanel{,{,-standalone}-bzr,-git} 'libwingpanel-2.0.so') conflicts=(wingpanel{,{,-standalone}-bzr,-git} 'libwingpanel-2.0.so') @@ -25,14 +23,12 @@ replaces=('wingpanel-standalone-bzr') source=('git+https://github.com/elementary/wingpanel.git' 'minus-backgroundmanager.patch' 'minus-galaplugin.patch' - 'minus-gala.patch' 'autohide.patch' 'reverse-105c1d0.patch') sha256sums=('SKIP' - '206e5e66501bd0aaefaa422edb4ef5b47dc5c1aff8a90410971b8be2147245e6' + 'ab49041873724b299131e6d6f59ff20cbfd1c48b9cd61bbac4ab16cc005d0f1a' 'aa0a27e41df60a7b15e2fd7e0d06551663b98917b7632e4067e6b9a39407de1c' - '04fc55095e9fabc61862ef9a54934402b940b6cfa90fe5ed67462aa78e6e8f8e' - '54d0fa9110eb948bc7a8ac55ed323b6979aabdf0657dcabfae2304b1dd16c194' + '1d5ccfa659b0e63637a8a84adbbf1fb104a3f9ca565755f13ec89ed7e9073384' '53bfa2220d14065ca848c36217abe812685c7d6e0d42251423d0faa2a0ac5394') pkgver() { @@ -59,7 +55,6 @@ prepare() { rm src/Services/BackgroundManager.vala patch -Np2 < ../minus-backgroundmanager.patch patch -Np2 < ../minus-galaplugin.patch - patch -Np2 < ../minus-gala.patch [ ! -d build ] || rm -rf build } @@ -74,5 +69,3 @@ package() { cd wingpanel/ DESTDIR="${pkgdir}" ninja -C build install } - -# vim: ts=2 sw=2 et: diff --git a/autohide.patch b/autohide.patch index 6687596e2918..64f1485f06d4 100644 --- a/autohide.patch +++ b/autohide.patch @@ -1,20 +1,7 @@ -diff --git a/./.travis.yml b/../wingpanel-qq/wingpanel-qq/.travis.yml -index 20a23ed..409aceb 100644 ---- a/./.travis.yml -+++ b/../wingpanel-qq/wingpanel-qq/.travis.yml -@@ -4,7 +4,7 @@ services: - - docker - - env: -- - DEPENDENCY_PACKAGES="libgala-dev libgee-0.8-dev libgirepository1.0-dev libglib2.0-dev libgranite-dev libgtk-3-dev meson valac" -+ - DEPENDENCY_PACKAGES="libgala-dev libgee-0.8-dev libgirepository1.0-dev libglib2.0-dev libgranite-dev libgtk-3-dev libwnck-3-dev meson valac" - - install: - - docker pull elementary/docker:juno-unstable -diff --git a/./meson.build b/../wingpanel-qq/wingpanel-qq/meson.build +diff --git a/./meson.build b/./meson.build index 4f0f279..19b4f65 100644 --- a/./meson.build -+++ b/../wingpanel-qq/wingpanel-qq/meson.build ++++ b/./meson.build @@ -14,7 +14,8 @@ add_project_arguments([ add_project_arguments([ @@ -33,10 +20,10 @@ index 4f0f279..19b4f65 100644 gee_dep = dependency('gee-0.8') granite_dep = dependency('granite') -diff --git a/./schemas/io.elementary.desktop.wingpanel.gschema.xml b/../wingpanel-qq/wingpanel-qq/schemas/io.elementary.desktop.wingpanel.gschema.xml +diff --git a/./schemas/io.elementary.desktop.wingpanel.gschema.xml b/./schemas/io.elementary.desktop.wingpanel.gschema.xml index a309a1d..aa150f7 100644 --- a/./schemas/io.elementary.desktop.wingpanel.gschema.xml -+++ b/../wingpanel-qq/wingpanel-qq/schemas/io.elementary.desktop.wingpanel.gschema.xml ++++ b/./schemas/io.elementary.desktop.wingpanel.gschema.xml @@ -6,5 +6,23 @@ <summary>Sets if the panel uses transparency.</summary> <description>Disable this to provide higher contrasts and make indicators better readable.</description> @@ -61,10 +48,10 @@ index a309a1d..aa150f7 100644 + </key> </schema> </schemalist> -diff --git a/./src/PanelWindow.vala b/../wingpanel-qq/wingpanel-qq/src/PanelWindow.vala +diff --git a/./src/PanelWindow.vala b/./src/PanelWindow.vala index 162c54a..e06472f 100644 --- a/./src/PanelWindow.vala -+++ b/../wingpanel-qq/wingpanel-qq/src/PanelWindow.vala ++++ b/./src/PanelWindow.vala @@ -29,6 +29,13 @@ public class Wingpanel.PanelWindow : Gtk.Window { private int panel_height; private bool expanded = false; @@ -73,23 +60,25 @@ index 162c54a..e06472f 100644 + private uint timeout; + private bool hiding = false; + private bool delay = false; -+ private string autohide = Services.PanelSettings.get_default ().autohide; -+ private int autohide_delay = Services.PanelSettings.get_default ().delay; ++ private string autohide = "Disabled"; ++ private int autohide_delay = 200; + private Wnck.Screen wnck_screen = Wnck.Screen.get_default (); public PanelWindow (Gtk.Application application) { Object ( -@@ -70,16 +77,65 @@ public class Wingpanel.PanelWindow : Gtk.Window { +@@ -70,16 +77,67 @@ public class Wingpanel.PanelWindow : Gtk.Window { application.add_accelerator ("<Control>Tab", "app.cycle", null); application.add_accelerator ("<Control><Shift>Tab", "app.cycle-back", null); -+ Services.PanelSettings.get_default ().notify["autohide"].connect (() => { -+ autohide = Services.PanelSettings.get_default ().autohide; ++ var panel_settings = new GLib.Settings ("io.elementary.desktop.wingpanel"); ++ ++ panel_settings.changed["autohide"].connect (() => { ++ autohide = panel_settings.get_string ("autohide"); + update_autohide_mode (); + }); + -+ Services.PanelSettings.get_default ().notify["delay"].connect (() => { -+ autohide_delay = Services.PanelSettings.get_default ().delay; ++ panel_settings.changed["delay"].connect (() => { ++ autohide_delay = panel_settings.get_int ("delay"); + }); + add (panel); @@ -287,25 +276,10 @@ index 162c54a..e06472f 100644 } private void update_visual () { -diff --git a/./src/Services/Settings.vala b/../wingpanel-qq/wingpanel-qq/src/Services/Settings.vala -index 6d8f0f1..e138162 100644 ---- a/./src/Services/Settings.vala -+++ b/../wingpanel-qq/wingpanel-qq/src/Services/Settings.vala -@@ -23,6 +23,10 @@ namespace Wingpanel.Services { - - public bool use_transparency { get; set; } - -+ public string autohide { get; set; } -+ -+ public int delay { get; set; } -+ - public PanelSettings () { - base ("io.elementary.desktop.wingpanel"); - } -diff --git a/./src/meson.build b/../wingpanel-qq/wingpanel-qq/src/meson.build +diff --git a/./src/meson.build b/./src/meson.build index 3703e53..b3b1b39 100644 --- a/./src/meson.build -+++ b/../wingpanel-qq/wingpanel-qq/src/meson.build ++++ b/./src/meson.build @@ -16,6 +16,7 @@ wingpanel_files = files( wingpanel_deps = [ libwingpanel_dep, diff --git a/minus-backgroundmanager.patch b/minus-backgroundmanager.patch index 603b7ccf241c..33c34f4108b6 100644 --- a/minus-backgroundmanager.patch +++ b/minus-backgroundmanager.patch @@ -34,11 +34,18 @@ public Panel (Services.PopoverManager popover_manager) { Object (popover_manager : popover_manager); -@@ -64,43 +63,6 @@ +@@ -64,46 +63,12 @@ + }); style_context = this.get_style_context (); - + style_context.add_provider (resource_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); +- - Services.BackgroundManager.get_default ().background_state_changed.connect (update_background); + } + + static construct { + resource_provider = new Gtk.CssProvider (); + resource_provider.load_from_resource ("io/elementary/wingpanel/application.css"); - } - - public override bool button_press_event (Gdk.EventButton event) { @@ -57,12 +64,8 @@ - } - - 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); diff --git a/minus-gala.patch b/minus-gala.patch deleted file mode 100644 index 090dde96fcc8..000000000000 --- a/minus-gala.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/wingpanel/.travis.yml 2017-10-13 02:26:35.980021306 +0900 -+++ src/wingpanel/.travis.yml 2017-10-13 02:29:58.537336177 +0900 -@@ -4,7 +4,7 @@ - - docker - - env: -- - DEPENDENCY_PACKAGES="libgala-dev libgee-0.8-dev libgirepository1.0-dev libglib2.0-dev libgranite-dev libgtk-3-dev libwnck-3-dev meson valac" -+ - DEPENDENCY_PACKAGES="libgee-0.8-dev libgirepository1.0-dev libglib2.0-dev libgranite-dev libgtk-3-dev libwnck-3-dev meson valac" - - install: - - docker pull elementary/docker:loki |