From ad65e91b5bf1bb19850dc211a55cd71a0f3d1889 Mon Sep 17 00:00:00 2001 From: travankor Date: Tue, 27 Aug 2019 03:04:57 -0700 Subject: [PATCH 1/6] sway: update to 1.2. --- srcpkgs/sway/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index 574ff5f90cd..0a236516283 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -1,6 +1,6 @@ # Template file for 'sway' pkgname=sway -version=1.1.1 +version=1.2 revision=1 build_style=meson conf_files="/etc/sway/config" @@ -13,7 +13,7 @@ maintainer="Orphaned " license="MIT" homepage="https://swaywm.org" distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz" -checksum=740bf97556c54da83937a255113d715aaa05e05b44d61fbe85e01b53ff1f9922 +checksum=9f79382577ee132111c290b4d1a1a3e114ef485595c30cf5f181a11575bda846 build_options="elogind" desc_option_elogind="Uses elogind instead of setuid for privilege escalation" From f49bf1fcc77b8a4bc11a76100d1863d87eb0b003 Mon Sep 17 00:00:00 2001 From: travankor Date: Mon, 7 Oct 2019 16:58:21 -0700 Subject: [PATCH 2/6] wlroots: update to 0.8.1. --- srcpkgs/wlroots/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template index 7b88e324827..75ddb338a15 100644 --- a/srcpkgs/wlroots/template +++ b/srcpkgs/wlroots/template @@ -1,23 +1,23 @@ # Template file for 'wlroots' pkgname=wlroots -version=0.6.0 -revision=2 +version=0.8.1 +revision=1 build_style=meson configure_args="-Dlibcap=enabled -Dlogind=enabled -Dlogind-provider=elogind -Dxcb-errors=enabled -Dxcb-icccm=enabled -Dxwayland=enabled - -Dx11-backend=enabled -Dexamples=false -Drootston=false" + -Dx11-backend=enabled -Dexamples=false" hostmakedepends="pkg-config wayland-devel" makedepends="elogind-devel libcap-devel wayland-devel wayland-protocols MesaLib-devel libinput-devel libxkbcommon-devel libdrm-devel pixman-devel libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel xcb-util-errors-devel xcb-util-xrm-devel freerdp-devel" -short_desc="Module Wayland compositor library" +short_desc="Modular Wayland compositor library" maintainer="Orphaned " license="MIT" homepage="https://github.com/swaywm/wlroots" distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz" -checksum=9cf3716f3683d800df8b150f256ff66dad65faf13a9d67c284f67a9444d28c70 +checksum=202b86e0e21699b6660bbda56afc2e3358db7252f83ff69c89f01926b4900d98 post_install() { vlicense LICENSE From 86fbace24f00293d7d098849e9a332e92a6c6457 Mon Sep 17 00:00:00 2001 From: travankor Date: Tue, 8 Oct 2019 02:36:29 -0700 Subject: [PATCH 3/6] wf-config: update to 0.3. --- common/shlibs | 2 +- srcpkgs/wf-config-devel | 1 + srcpkgs/wf-config/patches/fix-musl.patch | 13 ------------- srcpkgs/wf-config/template | 20 ++++++++++++++------ 4 files changed, 16 insertions(+), 20 deletions(-) create mode 120000 srcpkgs/wf-config-devel delete mode 100644 srcpkgs/wf-config/patches/fix-musl.patch diff --git a/common/shlibs b/common/shlibs index 688275b7d9e..8be530d3a22 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3411,7 +3411,7 @@ libsnore-qt5.so.0.7 snorenotify-0.7.0_1 libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1 libTECkit.so.0 libteckit-2.5.8_1 libTECkit_Compiler.so.0 libteckit-2.5.8_1 -libwf-config.so wf-config-0.1_1 +libwf-config.so.0 wf-config-0.3_1 libQt5Pas.so.1 qt5pas-2.6~beta_1 libClp.so.1 libClp-1.16.11_1 libCoinUtils.so.3 libClp-1.16.11_1 diff --git a/srcpkgs/wf-config-devel b/srcpkgs/wf-config-devel new file mode 120000 index 00000000000..fb3df2e900c --- /dev/null +++ b/srcpkgs/wf-config-devel @@ -0,0 +1 @@ +wf-config/ \ No newline at end of file diff --git a/srcpkgs/wf-config/patches/fix-musl.patch b/srcpkgs/wf-config/patches/fix-musl.patch deleted file mode 100644 index b87797ba555..00000000000 --- a/srcpkgs/wf-config/patches/fix-musl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/config.cpp b/src/config.cpp -index f586ab5..811ce29 100644 ---- src/config.cpp -+++ src/config.cpp -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - - std::ofstream out; - - diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template index 98eee65d39e..adee709a060 100644 --- a/srcpkgs/wf-config/template +++ b/srcpkgs/wf-config/template @@ -1,6 +1,6 @@ # Template file for 'wf-config' pkgname=wf-config -version=0.1 +version=0.3 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -9,11 +9,19 @@ short_desc="Wayfire library for managing configuration files" maintainer="Young Jin Park " license="MIT" homepage="https://wayfire.org" -distfiles="https://github.com/WayfireWM/wf-config/archive/v${version}.tar.gz - https://raw.githubusercontent.com/WayfireWM/wf-config/master/LICENSE>LICENSE.txt" -checksum="0dac4683013d5a0b143f0e211288c7f2f621740b9ac664359297ff530a7dcdc5 - 7053b1aa75aaccfe2a2bfacd400c0a8694858797ff9c7d584664e2941fb3016e" +distfiles="https://github.com/WayfireWM/wf-config/archive/${version}.tar.gz" +checksum=5d1a5038b11a177174b392f3b383d787f568265ce483a5be9178698f548f7c66 post_install() { - vlicense ../LICENSE.txt + vlicense LICENSE +} + +wf-config-devel_package() { + depends="libevdev-devel wlroots-devel wf-config>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } } From 79ef1c4b5e9e6b0dfabf01a9bfd1d3c6e6a8ed24 Mon Sep 17 00:00:00 2001 From: travankor Date: Tue, 8 Oct 2019 03:48:04 -0700 Subject: [PATCH 4/6] wfconfig: rename wf-config to wfconfig due to xbps-src bug. --- common/shlibs | 2 +- srcpkgs/wf-config-devel | 1 - srcpkgs/wfconfig-devel | 1 + srcpkgs/{wf-config => wfconfig}/template | 10 ++++++---- 4 files changed, 8 insertions(+), 6 deletions(-) delete mode 120000 srcpkgs/wf-config-devel create mode 120000 srcpkgs/wfconfig-devel rename srcpkgs/{wf-config => wfconfig}/template (72%) diff --git a/common/shlibs b/common/shlibs index 8be530d3a22..3ad5af56f29 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3411,7 +3411,7 @@ libsnore-qt5.so.0.7 snorenotify-0.7.0_1 libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1 libTECkit.so.0 libteckit-2.5.8_1 libTECkit_Compiler.so.0 libteckit-2.5.8_1 -libwf-config.so.0 wf-config-0.3_1 +libwf-config.so.0 wfconfig-0.3_1 libQt5Pas.so.1 qt5pas-2.6~beta_1 libClp.so.1 libClp-1.16.11_1 libCoinUtils.so.3 libClp-1.16.11_1 diff --git a/srcpkgs/wf-config-devel b/srcpkgs/wf-config-devel deleted file mode 120000 index fb3df2e900c..00000000000 --- a/srcpkgs/wf-config-devel +++ /dev/null @@ -1 +0,0 @@ -wf-config/ \ No newline at end of file diff --git a/srcpkgs/wfconfig-devel b/srcpkgs/wfconfig-devel new file mode 120000 index 00000000000..9806e3a908e --- /dev/null +++ b/srcpkgs/wfconfig-devel @@ -0,0 +1 @@ +wfconfig/ \ No newline at end of file diff --git a/srcpkgs/wf-config/template b/srcpkgs/wfconfig/template similarity index 72% rename from srcpkgs/wf-config/template rename to srcpkgs/wfconfig/template index adee709a060..a68939164b9 100644 --- a/srcpkgs/wf-config/template +++ b/srcpkgs/wfconfig/template @@ -1,7 +1,8 @@ -# Template file for 'wf-config' -pkgname=wf-config +# Template file for 'wfconfig' +pkgname=wfconfig version=0.3 revision=1 +wrksrc=wf-config-${version} build_style=meson hostmakedepends="pkg-config" makedepends="libevdev-devel wlroots-devel" @@ -16,8 +17,9 @@ post_install() { vlicense LICENSE } -wf-config-devel_package() { - depends="libevdev-devel wlroots-devel wf-config>=${version}_${revision}" +# xbps-src bug: can't have three dashes in keyword +wfconfig-devel_package() { + depends="libevdev-devel wlroots-devel wfconfig>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From eecae7a36dd389838e69ec2c676c0c3539f227b5 Mon Sep 17 00:00:00 2001 From: travankor Date: Tue, 8 Oct 2019 03:49:41 -0700 Subject: [PATCH 5/6] wayfire: update to 0.3.0. --- srcpkgs/wayfire/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template index 2ee4bd17ae9..cdaec561150 100644 --- a/srcpkgs/wayfire/template +++ b/srcpkgs/wayfire/template @@ -1,16 +1,16 @@ # Template file for 'wayfire' pkgname=wayfire -version=0.2 +version=0.3.0 revision=1 build_style=meson hostmakedepends="pkg-config wayland-devel" -makedepends="wlroots-devel glm cairo-devel wf-config" +makedepends="wlroots-devel glm cairo-devel wfconfig-devel" short_desc="3D wayland compositor" maintainer="Young Jin Park " license="MIT" homepage="https://wayfire.org" -distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz" -checksum=94fe93bb2b86048fd1c7601f97b167767e19618bb6b6226e21c22fbd052540bf +distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz" +checksum=c686bf5abb7f0db829196785bba4136c85d7b52d701212e21636dad75e1da0aa case $XBPS_TARGET_MACHINE in *-musl) makedepends+=" libexecinfo-devel" From 7360847773a4a021b4a8ce441aa582232508d250 Mon Sep 17 00:00:00 2001 From: travankor Date: Tue, 8 Oct 2019 04:40:29 -0700 Subject: [PATCH 6/6] wf-shell: update to 0.3. --- srcpkgs/wf-shell/template | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template index ccfd8c574a0..e8abf92d28c 100644 --- a/srcpkgs/wf-shell/template +++ b/srcpkgs/wf-shell/template @@ -1,16 +1,33 @@ # Template file for 'wf-shell' pkgname=wf-shell -version=0.1 +version=0.3 revision=1 +_gtklayershell_hash="d1f9d94be32f8cc61c0a53af7558146570f0fa9f" +_gvc_hash="468022b708fc1a56154f3b0cc5af3b938fb3e9fb" +create_wrksrc=yes +build_wrksrc=${pkgname}-${version} build_style=meson -hostmakedepends="pkg-config wayland-devel" -makedepends="gtkmm-devel libevdev-devel wlroots-devel wf-config" +hostmakedepends="pkg-config unzip wayland-devel" +makedepends="alsa-lib-devel pulseaudio-devel gobject-introspection gtkmm-devel + gtk+3-devel libevdev-devel wlroots-devel wfconfig-devel" short_desc="Wayfire shell with GTK-based panel and background client" maintainer="Young Jin Park " license="MIT" homepage="https://wayfire.org" -distfiles="https://github.com/WayfireWM/wf-shell/archive/${version}.tar.gz" -checksum=625637fddf58a6a1825980e68d156ddb377cf4aae9bf5d844fb15aefee4c6f4f +distfiles="https://github.com/WayfireWM/wf-shell/archive/${version}.tar.gz + https://github.com/wmww/gtk-layer-shell/archive/${_gtklayershell_hash}.zip + https://github.com/GNOME/libgnome-volume-control/archive/${_gvc_hash}.zip" +checksum="326c732415a10215997c0915741fd561a306412327fae123eab67f1af9ee41de + a5f43f0f660a4147a2a50c51ee2214b29cf057c3bf0b439451a86b8cc21b9013 + bf10e33e030f8a5a1ce903cd8201f0882532931d26d530d3ebe2aea174771fd0" + +post_extract() { + _gtklayershell_dir="${pkgname}-${version}/subprojects/gtk-layer-shell" + _gvc_dir="${pkgname}-${version}/subprojects/gvc" + rmdir ${_gtklayershell_dir} ${_gvc_dir} + mv gtk-layer-shell-d1f9d94be32f8cc61c0a53af7558146570f0fa9f ${_gtklayershell_dir} + mv libgnome-volume-control-468022b708fc1a56154f3b0cc5af3b938fb3e9fb ${_gvc_dir} +} post_install() { vlicense LICENSE