summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorQue Quotion2018-10-30 05:48:22 +0900
committerQue Quotion2018-10-30 05:48:22 +0900
commit17df3bfe461d61f71fe00e5ec85eeb3846c83339 (patch)
tree5c37417a4fc5bbe83051b4b354f8ec909e86799d
parentcd415e99b603d9a20810ef79dc55c8bfa40fd793 (diff)
downloadaur-17df3bfe461d61f71fe00e5ec85eeb3846c83339.tar.gz
prep for transition to meson
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD8
-rw-r--r--autohide.patch191
-rw-r--r--minus-gala.patch8
4 files changed, 128 insertions, 87 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5d44aa0d949..6c0e71b715f 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 = r367.6284121
- pkgrel = 3
+ pkgver = r379.8aacbcf
+ pkgrel = 1
url = https://github.com/elementary/wingpanel
arch = i686
arch = x86_64
@@ -49,9 +49,9 @@ pkgbase = wingpanel-standalone-git
sha256sums = SKIP
sha256sums = 67ffdac17cd4f46fb866eb8d33dd06db918bca16ae8ed4b2a2a00c3112f87a2b
sha256sums = 7f972d79b4d72f7b274a96e1a5150cba0e3869ad85215ae01ad2bc19802cdbb9
- sha256sums = 20ec1d51a6610bf0105c772e4d1d4ac8f35ea0ee33b066981db57dc19fe3bdc6
+ sha256sums = 04fc55095e9fabc61862ef9a54934402b940b6cfa90fe5ed67462aa78e6e8f8e
sha256sums = b1902c1d44ac546df63cd0224a7d2ef2cb6394ca556512c30c370d387db7bbab
- sha256sums = 2e38c3d5864f4faea7be7f7b5e7f490b62cbee4e7c97f53a566a515e6411997d
+ sha256sums = 40872d84e403aa8a62904b598df6b66b817215cd43c847bc26eacf988dc7c751
sha256sums = 53bfa2220d14065ca848c36217abe812685c7d6e0d42251423d0faa2a0ac5394
pkgname = wingpanel-standalone-git
diff --git a/PKGBUILD b/PKGBUILD
index 718d1b51fc3..933f5d015c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Maxime Gauduin <alucryd@archlinux.org>
pkgname=wingpanel-standalone-git
-pkgver=r367.6284121
-pkgrel=3
+pkgver=r379.8aacbcf
+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'
@@ -32,9 +32,9 @@ source=('git+https://github.com/elementary/wingpanel.git'
sha256sums=('SKIP'
'67ffdac17cd4f46fb866eb8d33dd06db918bca16ae8ed4b2a2a00c3112f87a2b'
'7f972d79b4d72f7b274a96e1a5150cba0e3869ad85215ae01ad2bc19802cdbb9'
- '20ec1d51a6610bf0105c772e4d1d4ac8f35ea0ee33b066981db57dc19fe3bdc6'
+ '04fc55095e9fabc61862ef9a54934402b940b6cfa90fe5ed67462aa78e6e8f8e'
'b1902c1d44ac546df63cd0224a7d2ef2cb6394ca556512c30c370d387db7bbab'
- '2e38c3d5864f4faea7be7f7b5e7f490b62cbee4e7c97f53a566a515e6411997d'
+ '40872d84e403aa8a62904b598df6b66b817215cd43c847bc26eacf988dc7c751'
'53bfa2220d14065ca848c36217abe812685c7d6e0d42251423d0faa2a0ac5394')
pkgver() {
diff --git a/autohide.patch b/autohide.patch
index eab42dc1c78..57adbd6a47c 100644
--- a/autohide.patch
+++ b/autohide.patch
@@ -1,7 +1,70 @@
-diff --git a/wingpanel/schemas/io.elementary.desktop.wingpanel.gschema.xml b/wingpanel-qq/schemas/io.elementary.desktop.wingpanel.gschema.xml
-index c81abd5..890e277 100644
---- a/wingpanel/schemas/io.elementary.desktop.wingpanel.gschema.xml
-+++ b/wingpanel-qq/schemas/io.elementary.desktop.wingpanel.gschema.xml
+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/./CMakeLists.txt b/../wingpanel-qq/wingpanel-qq/CMakeLists.txt
+index 2309c8b..878fc26 100644
+--- a/./CMakeLists.txt
++++ b/../wingpanel-qq/wingpanel-qq/CMakeLists.txt
+@@ -76,6 +76,7 @@ set (LIB_PACKAGES
+ gee-0.8
+ gmodule-2.0
+ gtk+-3.0
++ libwnck-3.0
+ )
+
+ set (LIB_PKG
+@@ -84,11 +85,15 @@ set (LIB_PKG
+ gee-0.8
+ gmodule-2.0
+ gtk+-3.0>=3.22
++ libwnck-3.0>=3.14
+ )
+ find_package(PkgConfig)
+
+ pkg_check_modules (LIB REQUIRED ${LIB_PKG})
+
++add_definitions (-DWNCK_I_KNOW_THIS_IS_UNSTABLE ${WNCK_CFLAGS})
++link_libraries (${WNCK_LIBRARIES})
++
+ set (GLOBAL_VALAC_OPTIONS
+ --vapidir=${CMAKE_BINARY_DIR}/lib
+ --vapidir=vapi
+diff --git a/./meson.build b/../wingpanel-qq/wingpanel-qq/meson.build
+index 4f0f279..19b4f65 100644
+--- a/./meson.build
++++ b/../wingpanel-qq/wingpanel-qq/meson.build
+@@ -14,7 +14,8 @@ add_project_arguments([
+
+ add_project_arguments([
+ '-DGETTEXT_PACKAGE="wingpanel"',
+- '-DG_LOG_DOMAIN="wingpanel"'
++ '-DG_LOG_DOMAIN="wingpanel"',
++ '-DWNCK_I_KNOW_THIS_IS_UNSTABLE'
+ ],
+ language: 'c'
+ )
+@@ -29,6 +30,7 @@ gio_dep = dependency('gio-2.0')
+ gio_unix_dep = dependency('gio-unix-2.0')
+ gmodule_dep = dependency('gmodule-2.0')
+ gtk_dep = dependency('gtk+-3.0', version: '>=3.10')
++libwnck_dep = dependency('libwnck-3.0', version: '>=3.14')
+ 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
+index a309a1d..aa150f7 100644
+--- a/./schemas/io.elementary.desktop.wingpanel.gschema.xml
++++ b/../wingpanel-qq/wingpanel-qq/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>
@@ -26,77 +89,28 @@ index c81abd5..890e277 100644
+ </key>
</schema>
</schemalist>
---- a/wingpanel/src/Services/Settings.vala
-+++ b/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");
- }
---- src/wingpanel/CMakeLists.txt~ 2018-09-17 00:14:55.430071710 +0900
-+++ src/wingpanel/CMakeLists.txt 2018-09-17 00:34:08.600075830 +0900
-@@ -76,6 +76,7 @@
- gee-0.8
- gmodule-2.0
- gtk+-3.0
-+ libwnck-3.0
- )
-
- set (LIB_PKG
-@@ -84,11 +85,15 @@
- gee-0.8
- gmodule-2.0
- gtk+-3.0>=3.22
-+ libwnck-3.0>=3.14
- )
- find_package(PkgConfig)
-
- pkg_check_modules (LIB REQUIRED ${LIB_PKG})
-
-+add_definitions (-DWNCK_I_KNOW_THIS_IS_UNSTABLE ${WNCK_CFLAGS})
-+link_libraries (${WNCK_LIBRARIES})
-+
- set (GLOBAL_VALAC_OPTIONS
- --vapidir=${CMAKE_BINARY_DIR}/lib
- --vapidir=vapi
-diff --git a/.travis.yml b/.travis.yml
-index dddddf1..4efb6c0 100644
---- src/wingpanel/.travis.yml
-+++ src/wingpanel/.travis.yml
-@@ -4,7 +4,7 @@ services:
- - docker
-
- env:
-- - DEPENDENCY_PACKAGES="cmake libgala-dev libgee-0.8-dev libgirepository1.0-dev libglib2.0-dev libgranite-dev libgtk-3-dev valac"
-+ - DEPENDENCY_PACKAGES="cmake libgala-dev libgee-0.8-dev libgirepository1.0-dev libglib2.0-dev libgranite-dev libgtk-3-dev libwnck-3-dev valac"
-
- install:
- - docker pull elementary/docker:juno-unstable
---- src/wingpanel/src/PanelWindow.vala~ 2018-09-18 22:59:21.301597018 +0900
-+++ src/wingpanel/src/PanelWindow.vala 2018-09-18 23:08:18.654947952 +0900
-@@ -30,6 +30,12 @@
+diff --git a/./src/PanelWindow.vala b/../wingpanel-qq/wingpanel-qq/src/PanelWindow.vala
+index 162c54a..e06472f 100644
+--- a/./src/PanelWindow.vala
++++ b/../wingpanel-qq/wingpanel-qq/src/PanelWindow.vala
+@@ -29,6 +29,13 @@ public class Wingpanel.PanelWindow : Gtk.Window {
+ private int panel_height;
private bool expanded = false;
private int panel_displacement;
- private uint shrink_timeout = 0;
++ private uint shrink_timeout = 0;
+ 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 Wnck.Screen wnck_screen = Wnck.Screen.get_default ();
-
+
public PanelWindow (Gtk.Application application) {
Object (
-@@ -71,16 +77,65 @@
+@@ -70,16 +77,65 @@ 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;
+ update_autohide_mode ();
@@ -108,7 +122,7 @@ index dddddf1..4efb6c0 100644
+
add (panel);
}
-
+
private bool animation_step () {
- if (panel_displacement <= panel_height * (-1)) {
- return false;
@@ -157,16 +171,16 @@ index dddddf1..4efb6c0 100644
+ }
+ panel_displacement--;
}
-
+
- panel_displacement--;
-
update_panel_dimensions ();
-
+
return true;
-@@ -91,7 +144,128 @@
-
+@@ -90,7 +146,128 @@ public class Wingpanel.PanelWindow : Gtk.Window {
+
Services.BackgroundManager.initialize (this.monitor_number, panel_height);
-
+
- Timeout.add (300 / panel_height, animation_step);
+ update_autohide_mode ();
+ }
@@ -283,7 +297,7 @@ index dddddf1..4efb6c0 100644
+ wnck_screen.viewports_changed.connect (viewports_changed);
+ break;
+ default:
-+ this.leave_notify_event.disconnect (hide_panel);
++ this.leave_notify_event.connect (hide_panel);
+ wnck_screen.active_window_changed.disconnect (active_window_changed);
+ wnck_screen.active_workspace_changed.disconnect (active_workspace_changed);
+ wnck_screen.viewports_changed.disconnect (viewports_changed);
@@ -291,13 +305,40 @@ index dddddf1..4efb6c0 100644
+ break;
+ }
}
-
+
private void update_panel_dimensions () {
-@@ -111,7 +315,6 @@
-
+@@ -110,7 +287,6 @@ public class Wingpanel.PanelWindow : Gtk.Window {
+
this.move (monitor_x, monitor_y - (panel_height + panel_displacement));
-
+
- update_struts ();
}
-
+
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
+index 3703e53..b3b1b39 100644
+--- a/./src/meson.build
++++ b/../wingpanel-qq/wingpanel-qq/src/meson.build
+@@ -16,6 +16,7 @@ wingpanel_files = files(
+ wingpanel_deps = [
+ libwingpanel_dep,
+ granite_dep,
++ libwnck_dep,
+ ]
+
+ executable(meson.project_name(),
diff --git a/minus-gala.patch b/minus-gala.patch
index 2adf145e0a5..090dde96fcc 100644
--- a/minus-gala.patch
+++ b/minus-gala.patch
@@ -2,10 +2,10 @@
+++ src/wingpanel/.travis.yml 2017-10-13 02:29:58.537336177 +0900
@@ -4,7 +4,7 @@
- docker
-
+
env:
-- - DEPENDENCY_PACKAGES="cmake libgala-dev libgee-0.8-dev libgirepository1.0-dev libglib2.0-dev libgranite-dev libgtk-3-dev libwnck-3-dev valac"
-+ - DEPENDENCY_PACKAGES="cmake libgee-0.8-dev libgirepository1.0-dev libglib2.0-dev libgranite-dev libgtk-3-dev libwnck-3-dev 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"
++ - 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