From 44b5807623f0e56898529223acbcb62423afb52a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 22 Mar 2020 10:14:22 +0100 Subject: [PATCH] wayfire: update to 0.4.0. --- srcpkgs/wayfire/INSTALL.msg | 2 +- ...re-0.3.1-fix-building-with-wlroots-0.10.0.patch | 11 ----------- srcpkgs/wayfire/template | 14 +++++++------- 3 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/wayfire/patches/wayfire-0.3.1-fix-building-with-wlroots-0.10.0.patch diff --git a/srcpkgs/wayfire/INSTALL.msg b/srcpkgs/wayfire/INSTALL.msg index c1fd90c287f..164d23c2b3a 100644 --- a/srcpkgs/wayfire/INSTALL.msg +++ b/srcpkgs/wayfire/INSTALL.msg @@ -1,5 +1,5 @@ Before running Wayfire, copy the default configuration file to your user: - cp /usr/share/wayfire/wayfire.ini.default ~/.config/wayfire.ini + cp /usr/share/examples/wayfire/wayfire.ini ~/.config/wayfire.ini You also probably want to install elogind, then restart your computer diff --git a/srcpkgs/wayfire/patches/wayfire-0.3.1-fix-building-with-wlroots-0.10.0.patch b/srcpkgs/wayfire/patches/wayfire-0.3.1-fix-building-with-wlroots-0.10.0.patch deleted file mode 100644 index 3cd4d3fe6f9..00000000000 --- a/srcpkgs/wayfire/patches/wayfire-0.3.1-fix-building-with-wlroots-0.10.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- meson.build -+++ meson.build -@@ -29,7 +29,7 @@ libinput = dependency('libinput', version: '>=1.7.0') - pixman = dependency('pixman-1') - threads = dependency('threads') - xkbcommon = dependency('xkbcommon') --wlroots = dependency('wlroots', version: ['>=0.9.0', '<0.10.0'], fallback: ['wlroots', 'wlroots']) -+wlroots = dependency('wlroots', version: ['>=0.9.0', '<0.11.0'], fallback: ['wlroots', 'wlroots']) - wfconfig = dependency('wf-config', version: '>=0.3', fallback: ['wf-config', 'wfconfig']) - - needs_libinotify = ['freebsd', 'dragonfly'].contains(host_machine.system()) diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template index cdcd900b67e..4f7aabbef14 100644 --- a/srcpkgs/wayfire/template +++ b/srcpkgs/wayfire/template @@ -1,22 +1,22 @@ # Template file for 'wayfire' pkgname=wayfire -version=0.3.1 +version=0.4.0 revision=1 build_style=meson hostmakedepends="pkg-config wayland-devel" -makedepends="xcb-util-wm-devel xcb-util-errors-devel wlroots-devel glm cairo-devel wf-config-devel" +makedepends="xcb-util-wm-devel xcb-util-errors-devel glm cairo-devel wf-config-devel" short_desc="3D wayland compositor" maintainer="Young Jin Park " license="MIT" homepage="https://wayfire.org" distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz" -checksum=e3bf727696f7f089b3474e8f4161e59adaeaa019de191b3e47a4f4663044cd00 +checksum=9c009c01bccce97149d0695b5429cf44787fdc1423c58425ba8e8de601019e97 -case $XBPS_TARGET_MACHINE in - *-musl) makedepends+=" libexecinfo-devel" -esac +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + makedepends+=" libexecinfo-devel" +fi post_install() { vlicense LICENSE - vinstall wayfire.ini.default 755 /usr/share/wayfire + vsconf wayfire.ini }