From 170075ce7ed3ecad7eeb2105e96050a62bf782dc Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 18 Nov 2022 01:51:25 +0100 Subject: [PATCH 1/9] hwids: update to 0.364 --- .../hwids/patches/pkgconfig-sysrootdir.patch | 25 +++++++++++++++++++ srcpkgs/hwids/template | 14 +++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/hwids/patches/pkgconfig-sysrootdir.patch diff --git a/srcpkgs/hwids/patches/pkgconfig-sysrootdir.patch b/srcpkgs/hwids/patches/pkgconfig-sysrootdir.patch new file mode 100644 index 000000000000..6af35847b88b --- /dev/null +++ b/srcpkgs/hwids/patches/pkgconfig-sysrootdir.patch @@ -0,0 +1,25 @@ +From d3325fd72bd45ba74e709b4083521104193b224e Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Wed, 9 Nov 2022 18:37:41 +0100 +Subject: [PATCH] hwdata.pc.in: use sysroot prefix for pkgdatadir variable + +The pc_sysroot is automatically added to cflags and libs but not +to 'pkg-config --variable'. This matches what wayland-protocols does. + +Signed-off-by: Markus Volk +--- + hwdata.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hwdata.pc.in b/hwdata.pc.in +index 8dd73b6..c5791d3 100644 +--- a/hwdata.pc.in ++++ b/hwdata.pc.in +@@ -1,6 +1,6 @@ + prefix=@prefix@ + datadir=@datadir@ +-pkgdatadir=@pkgdatadir@ ++pkgdatadir=${pc_sysrootdir}@pkgdatadir@ + + Name: @NAME@ + Description: Hardware identification and configuration data diff --git a/srcpkgs/hwids/template b/srcpkgs/hwids/template index aa52f74824d4..57619713fc34 100644 --- a/srcpkgs/hwids/template +++ b/srcpkgs/hwids/template @@ -1,18 +1,28 @@ # Template file for 'hwids' pkgname=hwids reverts="20201207_1 20210613_1 20200813.1_1 20200813.1_2 20200306_1 20200204_1 20191025_1 20190818_1 20190316_1 20180917_1 20180518_1 20180315_1 20171003_1 20170715_1 20170328_1 20161103_1 20160801_1 20160421_1 20160306_1 20150717_1 20150421_1 20150129_1 20150118_1" -version=0.361 +version=0.364 revision=1 short_desc="Hardware Identification Databases" maintainer="John " license="GPL-2.0-or-later" homepage="https://github.com/vcrhonek/hwdata" distfiles="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${version}.tar.gz" -checksum=d16c4be2a0476be039dce114401e7e8417f704eb89d9e5add7b3538dd58a2462 +checksum=e79ee7e0251c94273ac8ffa7f68892152d3cfc243a471bc61771d8ab53da3331 do_install() { vmkdir usr/share/hwdata for i in *.ids; do vinstall $i 644 usr/share/hwdata done + + vmkdir usr/share/pkgconfig + vinstall hwdata.pc.in 644 usr/share/pkgconfig hwdata.pc + vsed -i \ + -e 's|@prefix@|/usr|g' \ + -e 's|@datadir@|/usr/share|g' \ + -e 's|@pkgdatadir@|${datadir}/hwdata|g' \ + -e "s|@VERSION@|${version}|g" \ + -e "s|@NAME@|hwdata|g" \ + ${DESTDIR}/usr/share/pkgconfig/hwdata.pc } From 10895385355bef8a036e9f95347d5aa4dc001ca2 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 18 Nov 2022 01:56:17 +0100 Subject: [PATCH 2/9] wlroots: update to 0.16.0 --- common/shlibs | 2 +- srcpkgs/wlroots/template | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 74ae97843d38..fac3698ca17d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3526,7 +3526,7 @@ libcodecore.so.0 libio.elementary.code-3.0_1 libpantheon-files-core.so.6 libio.elementary.files-6.0.0_1 libpantheon-files-widgets.so.6 libio.elementary.files-6.0.0_1 libwlroots.so.9 wlroots0.14-0.14.1_1 -libwlroots.so.10 wlroots-0.15.0_1 +libwlroots.so.11 wlroots-0.16.0_1 libbaseencode.so.1 libbaseencode-1.0.9_1 libcotp.so.12 libcotp-1.2.1_1 libunarr.so.1 libunarr-1.0.1_1 diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template index d767d7d80e54..cf131b43903e 100644 --- a/srcpkgs/wlroots/template +++ b/srcpkgs/wlroots/template @@ -1,13 +1,13 @@ # Template file for 'wlroots' pkgname=wlroots -version=0.15.1 +version=0.16.0 revision=1 build_style=meson # Follow upstream packaging recommendations: # https://github.com/swaywm/wlroots/wiki/Packaging-recommendations configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false" -hostmakedepends="pkg-config wayland-devel glslang" +hostmakedepends="pkg-config wayland-devel glslang hwids" _devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols vulkan-loader Vulkan-Headers xcb-util-errors-devel @@ -20,7 +20,7 @@ maintainer="Isaac Freund " license="MIT" homepage="https://gitlab.freedesktop.org/wlroots/wlroots" distfiles="${homepage}/-/releases/${version}/downloads/wlroots-${version}.tar.gz" -checksum=5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373 +checksum=8478ab30bb96c5d5dc5b8180844909300a8d4a7d907d48271a8f389572c384cf post_install() { vlicense LICENSE @@ -28,6 +28,7 @@ post_install() { wlroots-devel_package() { depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}" + conflicts="wlroots0.15-devel" short_desc+=" - development files" pkg_install() { vmove usr/include From b02013fa4ec1bc39d1034d5284db237301ddcaab Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 18 Nov 2022 01:58:01 +0100 Subject: [PATCH 3/9] New package: wlroots0.15-0.15.1 --- common/shlibs | 1 + srcpkgs/wlroots0.15-devel | 1 + srcpkgs/wlroots0.15/template | 38 ++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 120000 srcpkgs/wlroots0.15-devel create mode 100644 srcpkgs/wlroots0.15/template diff --git a/common/shlibs b/common/shlibs index fac3698ca17d..2c2a3b2d59e0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3526,6 +3526,7 @@ libcodecore.so.0 libio.elementary.code-3.0_1 libpantheon-files-core.so.6 libio.elementary.files-6.0.0_1 libpantheon-files-widgets.so.6 libio.elementary.files-6.0.0_1 libwlroots.so.9 wlroots0.14-0.14.1_1 +libwlroots.so.10 wlroots0.15-0.15.1_1 libwlroots.so.11 wlroots-0.16.0_1 libbaseencode.so.1 libbaseencode-1.0.9_1 libcotp.so.12 libcotp-1.2.1_1 diff --git a/srcpkgs/wlroots0.15-devel b/srcpkgs/wlroots0.15-devel new file mode 120000 index 000000000000..2e1ce6ccc624 --- /dev/null +++ b/srcpkgs/wlroots0.15-devel @@ -0,0 +1 @@ +wlroots0.15 \ No newline at end of file diff --git a/srcpkgs/wlroots0.15/template b/srcpkgs/wlroots0.15/template new file mode 100644 index 000000000000..b4060a945992 --- /dev/null +++ b/srcpkgs/wlroots0.15/template @@ -0,0 +1,38 @@ +# Template file for 'wlroots0.15' +pkgname=wlroots0.15 +version=0.15.1 +revision=1 +build_style=meson +# Follow upstream packaging recommendations: +# https://github.com/swaywm/wlroots/wiki/Packaging-recommendations +configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false + -Db_ndebug=false" +hostmakedepends="pkg-config wayland-devel glslang" +_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel + libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel + wayland-protocols vulkan-loader Vulkan-Headers xcb-util-errors-devel + xcb-util-wm-devel xcb-util-renderutil-devel " +makedepends="${_devel_depends} + libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel + xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland" +short_desc="Modular Wayland compositor library" +maintainer="Isaac Freund " +license="MIT" +homepage="https://gitlab.freedesktop.org/wlroots/wlroots" +distfiles="${homepage}/-/releases/${version}/downloads/wlroots-${version}.tar.gz" +checksum=5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373 + +post_install() { + vlicense LICENSE +} + +wlroots0.15-devel_package() { + depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}" + conflicts="wlroots0.14-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} From b421fc4d4e5d5dc4b52f2986f054b307e192b5bd Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 18 Nov 2022 02:04:17 +0100 Subject: [PATCH 4/9] hikari: rebuild for wlroots0.15 --- srcpkgs/hikari/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template index 7bd6ffa4bf51..64811ea08b14 100644 --- a/srcpkgs/hikari/template +++ b/srcpkgs/hikari/template @@ -1,7 +1,7 @@ # Template file for 'hikari' pkgname=hikari version=2.3.3 -revision=1 +revision=2 build_style=gnu-makefile make_cmd=bmake make_use_env=yes @@ -9,7 +9,7 @@ make_build_args="WITH_POSIX_C_SOURCE=YES WITH_XWAYLAND=YES WITH_SCREENCOPY=YES WITH_GAMMACONTROL=YES WITH_LAYERSHELL=YES ETC_PREFIX=" make_install_args="ETC_PREFIX= WITHOUT_SUID=YES" hostmakedepends="bmake pkg-config wayland-devel" -makedepends="wlroots-devel pango-devel cairo-devel pam-devel glib-devel libucl-devel" +makedepends="wlroots0.15-devel pango-devel cairo-devel pam-devel glib-devel libucl-devel" short_desc="Stacking Wayland compositor with tiling features" maintainer="Andrew J. Hesford " license="BSD-2-Clause" From aedb23bd340c8fa7ad9f108093c0b38961d5aac8 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 18 Nov 2022 02:06:16 +0100 Subject: [PATCH 5/9] river: rebuild for wlroots0.15 --- srcpkgs/river/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/river/template b/srcpkgs/river/template index 5c34a94799c9..3906858d507e 100644 --- a/srcpkgs/river/template +++ b/srcpkgs/river/template @@ -1,11 +1,11 @@ # Template file for 'river' pkgname=river version=0.1.1 -revision=1 +revision=2 build_style=zig-build configure_args="$(vopt_if xwayland -Dxwayland)" hostmakedepends="pkg-config wayland-devel scdoc" -makedepends="wlroots-devel libevdev-devel" +makedepends="wlroots0.15-devel libevdev-devel" depends="$(vopt_if xwayland xorg-server-xwayland)" short_desc="Dynamic tiling Wayland compositor" maintainer="Isaac Freund " From 38eb56b9bf265b0d618d942d0b3b05eccb4d959f Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 18 Nov 2022 02:07:15 +0100 Subject: [PATCH 6/9] sway: rebuild for wlroots0.15 --- srcpkgs/sway/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index bfb862c9aaaf..f6c994194a18 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -1,12 +1,12 @@ # Template file for 'sway' pkgname=sway version=1.7 -revision=1 +revision=2 build_style=meson configure_args="-Dwerror=false -Db_ndebug=false" conf_files="/etc/sway/config" hostmakedepends="pkg-config wayland-devel scdoc git" -makedepends="wlroots-devel pcre-devel json-c-devel pango-devel cairo-devel +makedepends="wlroots0.15-devel pcre-devel json-c-devel pango-devel cairo-devel gdk-pixbuf-devel libevdev-devel" depends="swaybg xorg-server-xwayland" short_desc="Tiling Wayland compositor compatible with i3" From 4748f8d418c6fb8e247561f487884b7dcf30671a Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 18 Nov 2022 02:08:09 +0100 Subject: [PATCH 7/9] wayfire: update to 0.7.4, build for wlroots0.15 --- srcpkgs/wayfire/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template index 5fdef2abd639..007aa15da955 100644 --- a/srcpkgs/wayfire/template +++ b/srcpkgs/wayfire/template @@ -1,7 +1,7 @@ # Template file for 'wayfire' pkgname=wayfire -version=0.7.3 -revision=2 +version=0.7.4 +revision=1 _utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403 create_wrksrc=yes @@ -9,7 +9,7 @@ build_wrksrc="${pkgname}-${version}" build_style=meson configure_args="-Dprint_trace=false" hostmakedepends="pkg-config wayland-devel" -makedepends="wf-config-devel wlroots-devel cairo-devel pango-devel +makedepends="wf-config-devel wlroots0.15-devel cairo-devel pango-devel $(vopt_if image 'libjpeg-turbo-devel libpng-devel')" depends="xorg-server-xwayland" short_desc="3D wayland compositor" @@ -19,7 +19,7 @@ homepage="https://wayfire.org" distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz https://github.com/WayfireWM/wf-touch/archive/${_touch_commit}.tar.gz" -checksum="72575b6d598087d6fe737a8066db5405d7cff88a3041447f56b83313ac9a0684 +checksum="343093e3b062383d2a6965ca09eb26d0f68cb897d8efeb69f4967679bb128c8e bbde37e1a8b5ecb322096b32891593c14264800291be8773f7f0708fc110ed2f 09061c8a4d3d964e8dcfd1a7b97f7dc43d0fc30743b0993585439c6923ce422f" From a9a8b52ecc59faa96972bed1e294690261f158b1 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 18 Nov 2022 02:09:31 +0100 Subject: [PATCH 8/9] wayfire-plugins-extra: rebuild for wayfire --- srcpkgs/wayfire-plugins-extra/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template index a666281e177a..94afcfbbfafd 100644 --- a/srcpkgs/wayfire-plugins-extra/template +++ b/srcpkgs/wayfire-plugins-extra/template @@ -1,7 +1,7 @@ # Template file for 'wayfire-plugins-extra' pkgname=wayfire-plugins-extra version=0.7.0 -revision=6 +revision=7 build_style=meson hostmakedepends="pkg-config wayland-devel" makedepends="wayfire-devel glibmm-devel" @@ -10,7 +10,7 @@ short_desc="Additional plugins for Wayfire" maintainer="Érico Nogueira " license="MIT" homepage="https://wayfire.org/" -distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/v${version}.tar.gz" +distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/refs/tags/v${version}.tar.gz" checksum=e6377e7f2cd6b0a19fe0a256c819f801ee1d963524ed4e4930b702474bc04287 post_install() { From 2df0c05bc91afa6cefdbd2f7148bb294622ffaf0 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 18 Nov 2022 02:11:59 +0100 Subject: [PATCH 9/9] labwc: update to 0.6.0 --- srcpkgs/labwc/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/labwc/template b/srcpkgs/labwc/template index eb5099cc725b..2b898a51bfb6 100644 --- a/srcpkgs/labwc/template +++ b/srcpkgs/labwc/template @@ -1,7 +1,7 @@ # Template file for 'labwc' pkgname=labwc -version=0.5.3 -revision=2 +version=0.6.0 +revision=1 build_style=meson hostmakedepends="pkg-config scdoc wayland-devel" makedepends="cairo-devel glib-devel libxml2-devel pango-devel wlroots-devel" @@ -10,8 +10,8 @@ maintainer="Marcin Puc " license="GPL-2.0-or-later" homepage="https://labwc.github.io/" changelog="https://raw.githubusercontent.com/labwc/labwc/master/NEWS.md" -distfiles="https://github.com/labwc/labwc/archive/${version}.tar.gz" -checksum=0b67bc89a5d9059fae28822f3ba2373553dea290cd931c9384a91dbeb2054650 +distfiles="https://github.com/labwc/labwc/archive/refs/tags/${version}.tar.gz" +checksum=3a4ee960b4f764f276d581f83c95692c74c6a685e55438fb37ca6dd92e02f069 post_install() { local _example