summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorQue Quotion2018-12-02 05:34:15 +0900
committerQue Quotion2018-12-02 05:34:15 +0900
commit5c7461e2b960ec99acc683ef02ace6d35f742247 (patch)
treef2931dbf120d8efe0e662215580c60e3ba0b529c
parent17df3bfe461d61f71fe00e5ec85eeb3846c83339 (diff)
downloadaur-5c7461e2b960ec99acc683ef02ace6d35f742247.tar.gz
Switch to meson build; update patches to remove gala plugins, etc. from meson build files
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD22
-rw-r--r--minus-backgroundmanager.patch10
-rw-r--r--minus-galaplugin.patch10
4 files changed, 31 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6c0e71b715f..79a63856305 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = wingpanel-standalone-git
pkgdesc = Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)
- pkgver = r379.8aacbcf
+ pkgver = r380.b009131
pkgrel = 1
url = https://github.com/elementary/wingpanel
arch = i686
@@ -47,8 +47,8 @@ pkgbase = wingpanel-standalone-git
source = autohide.patch
source = reverse-105c1d0.patch
sha256sums = SKIP
- sha256sums = 67ffdac17cd4f46fb866eb8d33dd06db918bca16ae8ed4b2a2a00c3112f87a2b
- sha256sums = 7f972d79b4d72f7b274a96e1a5150cba0e3869ad85215ae01ad2bc19802cdbb9
+ sha256sums = 838dfc047b0deb1e1e63325f1aa78a67254ec80c0400b59d74cb619a06008ffd
+ sha256sums = d9ce223b7e7b34d6187f5bf78d0d41acf5fb4be4bcced49116f01c0d7ed10fc4
sha256sums = 04fc55095e9fabc61862ef9a54934402b940b6cfa90fe5ed67462aa78e6e8f8e
sha256sums = b1902c1d44ac546df63cd0224a7d2ef2cb6394ca556512c30c370d387db7bbab
sha256sums = 40872d84e403aa8a62904b598df6b66b817215cd43c847bc26eacf988dc7c751
diff --git a/PKGBUILD b/PKGBUILD
index 933f5d015c2..bb4c16eeae3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Maxime Gauduin <alucryd@archlinux.org>
pkgname=wingpanel-standalone-git
-pkgver=r379.8aacbcf
+pkgver=r380.b009131
pkgrel=1
pkgdesc='Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)'
arch=('i686' 'x86_64')
@@ -30,8 +30,8 @@ source=('git+https://github.com/elementary/wingpanel.git'
'autohide.patch'
'reverse-105c1d0.patch')
sha256sums=('SKIP'
- '67ffdac17cd4f46fb866eb8d33dd06db918bca16ae8ed4b2a2a00c3112f87a2b'
- '7f972d79b4d72f7b274a96e1a5150cba0e3869ad85215ae01ad2bc19802cdbb9'
+ '838dfc047b0deb1e1e63325f1aa78a67254ec80c0400b59d74cb619a06008ffd'
+ 'd9ce223b7e7b34d6187f5bf78d0d41acf5fb4be4bcced49116f01c0d7ed10fc4'
'04fc55095e9fabc61862ef9a54934402b940b6cfa90fe5ed67462aa78e6e8f8e'
'b1902c1d44ac546df63cd0224a7d2ef2cb6394ca556512c30c370d387db7bbab'
'40872d84e403aa8a62904b598df6b66b817215cd43c847bc26eacf988dc7c751'
@@ -74,20 +74,14 @@ prepare() {
}
build() {
- cd wingpanel/build
-
- cmake .. \
- -DCMAKE_BUILD_TYPE='Release' \
- -DCMAKE_INSTALL_PREFIX='/usr' \
- -DCMAKE_INSTALL_LIBDIR='lib' \
- -DGSETTINGS_COMPILE='FALSE'
- make
+ cd wingpanel/
+ arch-meson build
+ ninja -C build
}
package() {
- cd wingpanel/build
-
- make DESTDIR="${pkgdir}" install
+ cd wingpanel/
+ DESTDIR="${pkgdir}" ninja -C build install
}
# vim: ts=2 sw=2 et:
diff --git a/minus-backgroundmanager.patch b/minus-backgroundmanager.patch
index 9a8250841f2..9f0c21fc26c 100644
--- a/minus-backgroundmanager.patch
+++ b/minus-backgroundmanager.patch
@@ -145,3 +145,13 @@
)
vala_precompile (CLIENT_VALA_C ${CMAKE_PROJECT_NAME}
+--- src/wingpanel/src/meson.build 2018-12-02 05:25:42.153643446 +0900
++++ src/wingpanel/src/meson.build.new 2018-12-02 05:27:27.293643581 +0900
+@@ -1,7 +1,6 @@
+ wingpanel_files = files(
+ 'Wingpanel.vala',
+ 'PanelWindow.vala',
+- 'Services/BackgroundManager.vala',
+ 'Services/IndicatorSorter.vala',
+ 'Services/PopoverManager.vala',
+ 'Services/Settings.vala',
diff --git a/minus-galaplugin.patch b/minus-galaplugin.patch
index e4be0c99a92..d7123a2b4e8 100644
--- a/minus-galaplugin.patch
+++ b/minus-galaplugin.patch
@@ -9,3 +9,13 @@
if (BUILD_SAMPLE)
add_subdirectory (sample)
endif ()
+--- src/wingpanel/meson.build 2018-12-02 05:28:40.983643676 +0900
++++ src/wingpanel/meson.build.new 2018-12-02 05:29:34.203643745 +0900
+@@ -38,7 +38,6 @@
+ subdir('lib')
+ subdir('schemas')
+ subdir('src')
+-subdir('wingpanel-interface')
+ if get_option('example')
+ subdir('sample')
+ endif