diff options
| -rw-r--r-- | .SRCINFO | 56 | ||||
| -rw-r--r-- | PKGBUILD | 37 | ||||
| -rw-r--r-- | autohide.patch | 4 | ||||
| -rw-r--r-- | minus-backgroundmanager.patch | 31 |
4 files changed, 53 insertions, 75 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 = r620.6437f0d + pkgdesc = Stylish top panel (without Gala dependencies) + pkgver = r677.f8b98a5 pkgrel = 1 url = https://github.com/elementary/wingpanel arch = i686 @@ -8,40 +8,37 @@ pkgbase = wingpanel-standalone-git groups = pantheon-qq license = GPL3 makedepends = meson - makedepends = libgranite.so makedepends = git makedepends = vala + depends = glib2 + depends = gtk3 depends = libgee depends = libgranite.so depends = libwnck3 - depends = cogl - 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 = indicator-powersave: On the fly power savings and performance toggles - optdepends = glippy-indicator: Excellent clipboard manager applet - optdepends = ubuntu-indicator-weather: Simple weather applet + depends = pantheon-notifications + 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-bzr - provides = wingpanel-standalone-bzr provides = wingpanel-git - provides = libwingpanel-3.0.so + provides = libwingpanel.so + provides = libwingpanel-2.0.so conflicts = wingpanel - conflicts = wingpanel-bzr - conflicts = wingpanel-standalone-bzr conflicts = wingpanel-git - conflicts = libwingpanel-3.0.so - replaces = wingpanel-standalone-bzr + conflicts = libwingpanel.so + conflicts = libwingpanel-2.0.so source = git+https://github.com/elementary/wingpanel.git source = minus-backgroundmanager.patch source = minus-galaplugin.patch @@ -49,11 +46,10 @@ 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 = 87732bcf30de9d2b9ad63d2ac185dcd1940553880bb96a5b1c44f53ee189b910 sha256sums = aa15974b87a1000ab432bb048bc8a6ba0f36edd24e682d4e57833179c7b93f45 sha256sums = 5b29e24b4dc9076d54621334b839d2dbfa6a6adce1e8b444e38c2412f314f8c7 pkgname = wingpanel-standalone-git - @@ -2,26 +2,22 @@ # Contributor: Maxime Gauduin <alucryd@archlinux.org> pkgname=wingpanel-standalone-git -pkgver=r620.6437f0d +pkgver=r677.f8b98a5 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=(lib{gee,granite.so,wnck3} 'cogl') -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" - "indicator-powersave: On the fly power savings and performance toggles" - "glippy-indicator: Excellent clipboard manager applet" - "ubuntu-indicator-weather: Simple weather applet") -provides=(wingpanel{,{,-standalone}-bzr,-git} 'libwingpanel-3.0.so') -#provides=(wingpanel{,{,-standalone}-bzr,-git} 'libwingpanel-2.0.so') -conflicts=(wingpanel{,{,-standalone}-bzr,-git} 'libwingpanel-3.0.so') -#conflicts=(wingpanel{,{,-standalone}-bzr,-git} 'libwingpanel-2.0.so') -replaces=('wingpanel-standalone-bzr') +depends=(glib2 gtk3 lib{gee,granite.so,wnck3} pantheon-notifications) +makedepends=('meson' 'git' 'vala') +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) +conflicts=(wingpanel{,-git} libwingpanel{,-2.0}.so) source=('git+https://github.com/elementary/wingpanel.git' 'minus-backgroundmanager.patch' 'minus-galaplugin.patch' @@ -29,9 +25,9 @@ source=('git+https://github.com/elementary/wingpanel.git' 'fix-for-openbox.patch' 'no-mutter-typelib.patch') sha256sums=('SKIP' - '4d674f514d68c87ff5c23d0daa58a6d7e7c62c67142ebc734e88c45e940f7751' + '1fbc81bbb6c6ac59f7ea8761cdac0714fd2f39877dc81a0b0d6db855163d4f14' 'aa0a27e41df60a7b15e2fd7e0d06551663b98917b7632e4067e6b9a39407de1c' - '6d4c88c4b6dd13fc7ca60f2e2387f3af86d804f89591bd7826cf93a946b6f1b6' + '87732bcf30de9d2b9ad63d2ac185dcd1940553880bb96a5b1c44f53ee189b910' 'aa15974b87a1000ab432bb048bc8a6ba0f36edd24e682d4e57833179c7b93f45' '5b29e24b4dc9076d54621334b839d2dbfa6a6adce1e8b444e38c2412f314f8c7') @@ -44,27 +40,22 @@ pkgver() { prepare() { cd wingpanel - #Lie - #msg2 "FAKE 2.0 API" + #Fake 2.0 API #git revert -n c6313641f56fd12d14ad4d064dd64422f1140ff3 #Autohide - msg2 "Autohide" patch -Np1 < ../autohide.patch #patch -Np2 < ../autohide-testing.patch #Fixes - msg2 "Fix multiple-monitor strut method for openbox" patch -Np1 < ../fix-for-openbox.patch #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 < ../no-mutter-typelib.patch - #rm vapi/meson.build [ ! -d build ] || rm -rf build } diff --git a/autohide.patch b/autohide.patch index e827ad28689e..4592f88a8163 100644 --- a/autohide.patch +++ b/autohide.patch @@ -355,7 +355,7 @@ index c3708dd..4357d4e 100644 libwingpanel_dep, granite_dep, + libwnck_dep, - gdk_x11_dep + gdk_x11_dep, + posix_dep ] - executable(meson.project_name(), 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 (); |