vala-panel: update to 0.5.0

Close: #26383
This commit is contained in:
Joshua Kraemer 2020-11-07 21:35:16 +01:00 committed by Đoàn Trần Công Danh
parent 3bb1a65f9d
commit 41d8b7aef3
3 changed files with 27 additions and 71 deletions

View file

@ -1,61 +0,0 @@
diff --git applets/drawing/monitors/mem.c applets/drawing/monitors/mem.c
index 80bdc7a..cc1db92 100644
--- applets/drawing/monitors/mem.c
+++ applets/drawing/monitors/mem.c
@@ -17,7 +17,6 @@
*/
#include <errno.h>
-#include <error.h>
#include <stdbool.h>
#include <stdio.h>
diff --git applets/drawing/monitors/monitor.c applets/drawing/monitors/monitor.c
index c84dfca..bb296e1 100644
--- applets/drawing/monitors/monitor.c
+++ applets/drawing/monitors/monitor.c
@@ -17,7 +17,6 @@
*/
#include <errno.h>
-#include <error.h>
#include <stdbool.h>
#include <stdio.h>
diff --git applets/drawing/monitors/swap.c applets/drawing/monitors/swap.c
index 33e6b8b..be8437c 100644
--- applets/drawing/monitors/swap.c
+++ applets/drawing/monitors/swap.c
@@ -17,7 +17,6 @@
*/
#include <errno.h>
-#include <error.h>
#include <stdbool.h>
#include <stdio.h>
diff --git applets/drawing/netmon/monitor.c applets/drawing/netmon/monitor.c
index f98b0db..e58eea7 100644
--- applets/drawing/netmon/monitor.c
+++ applets/drawing/netmon/monitor.c
@@ -18,7 +18,6 @@
#include <ctype.h>
#include <errno.h>
-#include <error.h>
#include <stdbool.h>
#include <stdio.h>
diff --git applets/drawing/netmon/net.c applets/drawing/netmon/net.c
index c139341..9647030 100644
--- applets/drawing/netmon/net.c
+++ applets/drawing/netmon/net.c
@@ -18,7 +18,6 @@
#include <ctype.h>
#include <errno.h>
-#include <error.h>
#include <stdbool.h>
#include <stdio.h>

View file

@ -0,0 +1,13 @@
--- meson.build.orig 2020-11-23 23:23:28.989158257 +0700
+++ meson.build 2020-11-23 23:24:02.056503894 +0700
@@ -90,8 +90,8 @@
conf_data.set('PLUGINS_DATA', applets_datadir)
conf_data.set('DATADIR', project_datadir)
conf_data.set('PROFILES_DIR', profiles_dir)
-conf_data.set('PLATFORM_X11','x11' in platforms)
-conf_data.set('PLATFORM_LAYER_SHELL','layer-shell' in platforms)
+conf_data.set('PLATFORM_X11',platforms['x11'])
+conf_data.set('PLATFORM_LAYER_SHELL',platforms['layer-shell'])
config = configure_file(input : join_paths('util','config.h.in'),
output : 'config.h',

View file

@ -1,22 +1,26 @@
# Template file for 'vala-panel'
pkgname=vala-panel
version=0.4.88
_glhash=da591ffc8460b2a473e1aba3e3dcf178
version=0.5.0
revision=1
build_style=cmake
hostmakedepends="gettext pkg-config vala glib-devel"
makedepends="vala-devel cmake-vala gtk+3-devel"
short_desc="GTK+3 desktop panel inspired by LXPanel"
maintainer="John Eira <john.eira@web.de>"
build_style=meson
configure_args="$(vopt_if wayland -Dplatforms=x11,layer-shell -Dplatforms=x11)"
hostmakedepends="vala pkg-config gettext glib-devel"
makedepends="gtk+3-devel libwnck-devel $(vopt_if wayland gtk-layer-shell-devel)"
short_desc="GTK+3 desktop panel forked from LXPanel"
maintainer="Joshua Krämer <joshua@kraemer.link>"
license="LGPL-3.0-or-later"
homepage="https://gitlab.com/vala-panel-project/vala-panel"
distfiles="https://gitlab.com/vala-panel-project/vala-panel/uploads/c42b5fbbfb42c5889e7184f5ead03f65/vala-panel-${version}.tar.xz"
checksum=09635f557e3d52894267a66297552119e874a25f9366bf5a1eeda8cfba948462
distfiles="https://gitlab.com/vala-panel-project/vala-panel/uploads/$_glhash/vala-panel-${version}.tar.xz"
checksum=ee3a9e000133da43b218ecd1738463c2de3f45783a5a09a11b9c263df4e233d1
CFLAGS="-I$XBPS_CROSS_BASE/usr/include/harfbuzz"
# Package build options
build_options="wayland"
build_options_default="wayland"
vala-panel-devel_package() {
short_desc+=" - development files"
depends="vala-panel-${version}_${revision}"
depends="vala-panel>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig