Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] labwc: update to 0.6.0
@ 2022-11-18  1:15 tranzystorek-io
  2022-11-18  1:16 ` tranzystorek-io
                   ` (55 more replies)
  0 siblings, 56 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-18  1:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]

There is a new pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 13832 bytes --]

From 343e38cc32ca8d55c0c5600b30bbcf1311214525 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 01:51:25 +0100
Subject: [PATCH 1/9] hwids: update to 0.364

---
 srcpkgs/hwids/template | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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 <me@johnnynator.dev>"
 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 6a10c5d2e7ce77f61fb652b620bc8bac16258f94 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 07296762fcc4..45f938228d40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3524,7 +3524,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..5bf6adeb9e51 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,6 +1,6 @@
 # Template file for 'wlroots'
 pkgname=wlroots
-version=0.15.1
+version=0.16.0
 revision=1
 build_style=meson
 # Follow upstream packaging recommendations:
@@ -14,13 +14,13 @@ _devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-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"
+ xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland hwids"
 short_desc="Modular Wayland compositor library"
 maintainer="Isaac Freund <mail@isaacfreund.com>"
 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

From 7fffd2de1119a27461736f0e96f700488e32b3de Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 | 37 ++++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/wlroots0.15-devel
 create mode 100644 srcpkgs/wlroots0.15/template

diff --git a/common/shlibs b/common/shlibs
index 45f938228d40..23034bbf27cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3524,6 +3524,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..f2a8c3de3324
--- /dev/null
+++ b/srcpkgs/wlroots0.15/template
@@ -0,0 +1,37 @@
+# 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 <mail@isaacfreund.com>"
+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}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 4520a6334c66513bd29a0bc9bdd49434c74c9933 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From 52256377682a54fb0dbfe201b852ee386f4fb758 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 9cf3abe4b85b..3566a67765bc 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 git"
-makedepends="wlroots-devel"
+makedepends="libevdev-devel wlroots0.15-devel"
 depends="$(vopt_if xwayland xorg-server-xwayland)"
 short_desc="Dynamic tiling Wayland compositor"
 maintainer="Isaac Freund <mail@isaacfreund.com>"

From a47776004def524dd92300a8547d074cc53604d6 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 f0daec0a9d2ce380c6083e106bcfd0b3e7aa2120 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 c82bc833efbb4c2782e3f57f69de6e10d72fc53f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ericonr@disroot.org>"
 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 5021fe95947ae01b1f9890b58896fff6eac58c14 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
@ 2022-11-18  1:16 ` tranzystorek-io
  2022-11-18  1:30 ` [PR REVIEW] " paper42
                   ` (54 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-18  1:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 214 bytes --]

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#issuecomment-1319426354

Comment:
Ping @Johnnynator needed to bump hwids to add the pkgconfig file

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
  2022-11-18  1:16 ` tranzystorek-io
@ 2022-11-18  1:30 ` paper42
  2022-11-18  1:40 ` tranzystorek-io
                   ` (53 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: paper42 @ 2022-11-18  1:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 184 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1025902912

Comment:
Can we run `make hwdata.pc` instead?

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
  2022-11-18  1:16 ` tranzystorek-io
  2022-11-18  1:30 ` [PR REVIEW] " paper42
@ 2022-11-18  1:40 ` tranzystorek-io
  2022-11-18  1:47 ` [PR PATCH] [Updated] " tranzystorek-io
                   ` (52 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-18  1:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 509 bytes --]

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1025906993

Comment:
I'm getting

```
=> hwids-0.364_1: running do_install ...
./configure
Makefile.inc generated. Run the make again.
Makefile:25: Makefile.inc: No such file or directory
make: *** [Makefile:32: Makefile.inc] Error 1
=> ERROR: hwids-0.364_1: do_install: 'make Makefile.inc' exited with 2
=> ERROR:   in do_install() at srcpkgs/hwids/template:2
```

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (2 preceding siblings ...)
  2022-11-18  1:40 ` tranzystorek-io
@ 2022-11-18  1:47 ` tranzystorek-io
  2022-11-18  2:00 ` tranzystorek-io
                   ` (51 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-18  1:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 14104 bytes --]

From 343e38cc32ca8d55c0c5600b30bbcf1311214525 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 01:51:25 +0100
Subject: [PATCH 1/9] hwids: update to 0.364

---
 srcpkgs/hwids/template | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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 <me@johnnynator.dev>"
 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 81e62abf641a9210c11dbd3fcaf12fad4e138082 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 07296762fcc4..45f938228d40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3524,7 +3524,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..01aff5dd16ee 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,6 +1,6 @@
 # Template file for 'wlroots'
 pkgname=wlroots
-version=0.15.1
+version=0.16.0
 revision=1
 build_style=meson
 # Follow upstream packaging recommendations:
@@ -14,13 +14,13 @@ _devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-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"
+ xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland hwids"
 short_desc="Modular Wayland compositor library"
 maintainer="Isaac Freund <mail@isaacfreund.com>"
 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 76d3633bdb7cda101a24920673b79074be6cead5 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 45f938228d40..23034bbf27cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3524,6 +3524,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 <mail@isaacfreund.com>"
+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 9a7cb26fc33a3bf89948eeefcb29458606c2e9d1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From 94506d706bc39b5bac2ad7db732f6056a2d86516 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 9cf3abe4b85b..3566a67765bc 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 git"
-makedepends="wlroots-devel"
+makedepends="libevdev-devel wlroots0.15-devel"
 depends="$(vopt_if xwayland xorg-server-xwayland)"
 short_desc="Dynamic tiling Wayland compositor"
 maintainer="Isaac Freund <mail@isaacfreund.com>"

From d9a54f251756511184c35c9f124c9ba77db2ec47 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 2e22f3cee74b508da6952754a53e2e1ceb6c210a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 34c140f5abba26794db63bdd11fc216497acbfec Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ericonr@disroot.org>"
 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 1a62c3b48462f598696f2fc47e186d93df547607 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (3 preceding siblings ...)
  2022-11-18  1:47 ` [PR PATCH] [Updated] " tranzystorek-io
@ 2022-11-18  2:00 ` tranzystorek-io
  2022-11-18  2:56 ` cinerea0
                   ` (50 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-18  2:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 14104 bytes --]

From 343e38cc32ca8d55c0c5600b30bbcf1311214525 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 01:51:25 +0100
Subject: [PATCH 1/9] hwids: update to 0.364

---
 srcpkgs/hwids/template | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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 <me@johnnynator.dev>"
 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 81e62abf641a9210c11dbd3fcaf12fad4e138082 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 07296762fcc4..45f938228d40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3524,7 +3524,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..01aff5dd16ee 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,6 +1,6 @@
 # Template file for 'wlroots'
 pkgname=wlroots
-version=0.15.1
+version=0.16.0
 revision=1
 build_style=meson
 # Follow upstream packaging recommendations:
@@ -14,13 +14,13 @@ _devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-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"
+ xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland hwids"
 short_desc="Modular Wayland compositor library"
 maintainer="Isaac Freund <mail@isaacfreund.com>"
 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 76d3633bdb7cda101a24920673b79074be6cead5 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 45f938228d40..23034bbf27cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3524,6 +3524,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 <mail@isaacfreund.com>"
+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 9a7cb26fc33a3bf89948eeefcb29458606c2e9d1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From 94506d706bc39b5bac2ad7db732f6056a2d86516 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 9cf3abe4b85b..3566a67765bc 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 git"
-makedepends="wlroots-devel"
+makedepends="libevdev-devel wlroots0.15-devel"
 depends="$(vopt_if xwayland xorg-server-xwayland)"
 short_desc="Dynamic tiling Wayland compositor"
 maintainer="Isaac Freund <mail@isaacfreund.com>"

From d9a54f251756511184c35c9f124c9ba77db2ec47 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 2e22f3cee74b508da6952754a53e2e1ceb6c210a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 34c140f5abba26794db63bdd11fc216497acbfec Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ericonr@disroot.org>"
 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 488067c2be93a7010ccf404b19c8773c18a5fccd Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (4 preceding siblings ...)
  2022-11-18  2:00 ` tranzystorek-io
@ 2022-11-18  2:56 ` cinerea0
  2022-11-18  6:19 ` tranzystorek-io
                   ` (49 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: cinerea0 @ 2022-11-18  2:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 582 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#issuecomment-1319480071

Comment:
I'm confused as to why there's another split happening with wlroots. My recollection of the last split is that it was done because wayfire was taking a long time to update to wlroots-0.15; 0.16 was only released six days ago as of me typing this. Are you anticipating that there will be another long lag for only a couple compositors that depend on it? Alternatively, is there a big issue with the current version of labwc that this fixes?

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (5 preceding siblings ...)
  2022-11-18  2:56 ` cinerea0
@ 2022-11-18  6:19 ` tranzystorek-io
  2022-11-18 10:27 ` [PR PATCH] [Updated] " tranzystorek-io
                   ` (48 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-18  6:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 307 bytes --]

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#issuecomment-1319597920

Comment:
I see your point that we could wait a bit for other compositors to catch up;

I just went ahead since @ifreund had no objections when we discussed this topic

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (6 preceding siblings ...)
  2022-11-18  6:19 ` tranzystorek-io
@ 2022-11-18 10:27 ` tranzystorek-io
  2022-11-18 10:44 ` paper42
                   ` (47 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-18 10:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 14104 bytes --]

From 9ca793e4d85cdbd9c2dfd707772d8ec2004f9d15 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 01:51:25 +0100
Subject: [PATCH 1/9] hwids: update to 0.364

---
 srcpkgs/hwids/template | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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 <me@johnnynator.dev>"
 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 2ac3e536330de347119059a7779606774ab29141 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 07296762fcc4..45f938228d40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3524,7 +3524,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..01aff5dd16ee 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,6 +1,6 @@
 # Template file for 'wlroots'
 pkgname=wlroots
-version=0.15.1
+version=0.16.0
 revision=1
 build_style=meson
 # Follow upstream packaging recommendations:
@@ -14,13 +14,13 @@ _devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-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"
+ xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland hwids"
 short_desc="Modular Wayland compositor library"
 maintainer="Isaac Freund <mail@isaacfreund.com>"
 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 06363d21e6a7d9a954d59ba26e628f3a56f4c03c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 45f938228d40..23034bbf27cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3524,6 +3524,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 <mail@isaacfreund.com>"
+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 acb96fd1c306dd8a6eb4ba336b7bb9cffa8d9bbc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From ee1530e31dc42cfb1b5285a5d3a7d741d142d491 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 9cf3abe4b85b..3566a67765bc 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 git"
-makedepends="wlroots-devel"
+makedepends="libevdev-devel wlroots0.15-devel"
 depends="$(vopt_if xwayland xorg-server-xwayland)"
 short_desc="Dynamic tiling Wayland compositor"
 maintainer="Isaac Freund <mail@isaacfreund.com>"

From 69372d8feff0f6e1ae105edaa1f22d8b238bfeb1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 54d35f1c13f09045629b61161827346c589f6adf Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 d2fd6c262426af7d8b13624a650af3991a9966df Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ericonr@disroot.org>"
 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 cf9d08a1aff64d3e2aaa4fb1716b3529cbb3e3a2 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (7 preceding siblings ...)
  2022-11-18 10:27 ` [PR PATCH] [Updated] " tranzystorek-io
@ 2022-11-18 10:44 ` paper42
  2022-11-18 10:54 ` [PR PATCH] [Updated] wlroots: update to 0.16, " tranzystorek-io
                   ` (46 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: paper42 @ 2022-11-18 10:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1204 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#issuecomment-1319830389

Comment:
My proposal was to open this PR and keep adding updates to it until most of the major compositors are on 0.16 and then merge it. Last time the update took 3 months until we realized we don't want to keep waiting for every compositor to move to 0.15 and split 0.14. I would like to not wait 3 months just because some packages can not be updated this time. wayfire eventually moved to 0.15, but cage is still on 0.14. I would expect the same thing to happen here, even if just with river and because of issues on our side and not upstream's.

We unfortunately won't be able to update river because it needs zig 0.9 which needs LLVM 13 or later (we have LLVM 12) and the last version of LLVM that we would want to package doesn't build with our version of gcc. The current plan is to finish the gcc update to 12 and then package LLVM 15, then zig 0.9 and then we can update river. We are working on this, but this can take a while.

TLDR: I don't want to merge this right now, we should keep adding updates to this PR and merge it when enough compositors move.

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (8 preceding siblings ...)
  2022-11-18 10:44 ` paper42
@ 2022-11-18 10:54 ` tranzystorek-io
  2022-11-18 11:08 ` tranzystorek-io
                   ` (45 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-18 10:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

wlroots: update to 0.16, labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 15325 bytes --]

From b66af3adf04813a008b806c4ab285ce74f65a291 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <f_l_k@t-online.de>
+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 <f_l_k@t-online.de>
+---
+ 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 <me@johnnynator.dev>"
 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 76a3ecf43e411b377ef78a19a4036aa8d7b741e3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 07296762fcc4..45f938228d40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3524,7 +3524,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..01aff5dd16ee 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,6 +1,6 @@
 # Template file for 'wlroots'
 pkgname=wlroots
-version=0.15.1
+version=0.16.0
 revision=1
 build_style=meson
 # Follow upstream packaging recommendations:
@@ -14,13 +14,13 @@ _devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-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"
+ xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland hwids"
 short_desc="Modular Wayland compositor library"
 maintainer="Isaac Freund <mail@isaacfreund.com>"
 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 daa899345413be4150b5d8c8eb31d922cdaf3544 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 45f938228d40..23034bbf27cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3524,6 +3524,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 <mail@isaacfreund.com>"
+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 8c54f2abef4d80737f72730c2bf2f52d6ac2e8fb Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From 5413e5a8ca48116e868250c9472a1c00141f84ae Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 9cf3abe4b85b..3566a67765bc 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 git"
-makedepends="wlroots-devel"
+makedepends="libevdev-devel wlroots0.15-devel"
 depends="$(vopt_if xwayland xorg-server-xwayland)"
 short_desc="Dynamic tiling Wayland compositor"
 maintainer="Isaac Freund <mail@isaacfreund.com>"

From 6abeab79127376c60e961a9687b4d6d0d84026bf Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 28f88b7c14bfce07c607eff93cbbbefef1b6ccfe Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 ded0f073d21ed88a248e96bf7f41cfad0438c73e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ericonr@disroot.org>"
 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 208a27d8d2b3dbdac99feb8a95ccb07041b9f6d3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (9 preceding siblings ...)
  2022-11-18 10:54 ` [PR PATCH] [Updated] wlroots: update to 0.16, " tranzystorek-io
@ 2022-11-18 11:08 ` tranzystorek-io
  2022-11-18 12:05 ` ifreund
                   ` (44 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-18 11:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

wlroots: update to 0.16, labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 15403 bytes --]

From b66af3adf04813a008b806c4ab285ce74f65a291 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <f_l_k@t-online.de>
+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 <f_l_k@t-online.de>
+---
+ 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 <me@johnnynator.dev>"
 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 8108d3a0c594ec052599bccffb28758d638c4458 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 07296762fcc4..45f938228d40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3524,7 +3524,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 <mail@isaacfreund.com>"
 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 9106da2199c5e386f25846987969e5762deb9fa1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 45f938228d40..23034bbf27cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3524,6 +3524,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 <mail@isaacfreund.com>"
+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 8b81764b93230b653e0d5fc9641a2ad46ce865c4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From 0641d9d24758bd5c4629b08f95c6f4744774b1e7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 9cf3abe4b85b..3566a67765bc 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 git"
-makedepends="wlroots-devel"
+makedepends="libevdev-devel wlroots0.15-devel"
 depends="$(vopt_if xwayland xorg-server-xwayland)"
 short_desc="Dynamic tiling Wayland compositor"
 maintainer="Isaac Freund <mail@isaacfreund.com>"

From 1a9db4bbfe205b16074d123665d5358058200f14 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 1bd7019f2534743dc913699e8e5949ae5f1ba8f4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 4b8065fdc81be26268b21655b3ae61ebd771a724 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ericonr@disroot.org>"
 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 6762f8afaf436bbc08ae7fba6e538232e98b0dcd Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (10 preceding siblings ...)
  2022-11-18 11:08 ` tranzystorek-io
@ 2022-11-18 12:05 ` ifreund
  2022-11-18 12:07 ` tranzystorek-io
                   ` (43 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: ifreund @ 2022-11-18 12:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 573 bytes --]

New comment by ifreund on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#issuecomment-1319911626

Comment:
> The current plan is to finish the gcc update to 12 and then package LLVM 15, then zig 0.9 and then we can update river. We are working on this, but this can take a while.

Zig 0.9 requires exactly llvm 13 actually, but I intend for the next river release to depend on Zig 0.10 which depends on LLVM 15 so this shouldn't be an issue. Just leaving this comment here for clarity, the overall plan of action seems reasonable to me.

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (11 preceding siblings ...)
  2022-11-18 12:05 ` ifreund
@ 2022-11-18 12:07 ` tranzystorek-io
  2022-11-18 12:13 ` paper42
                   ` (42 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-18 12:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 275 bytes --]

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#issuecomment-1319913954

Comment:
I put `hwids` in wslroots hostmakedepends, since meson doesn't seem to correctly add sysroot to pkgconfig for cross builds :/

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (12 preceding siblings ...)
  2022-11-18 12:07 ` tranzystorek-io
@ 2022-11-18 12:13 ` paper42
  2022-11-26 18:55 ` [PR PATCH] [Updated] " tranzystorek-io
                   ` (41 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: paper42 @ 2022-11-18 12:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 789 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#issuecomment-1319919346

Comment:
> > The current plan is to finish the gcc update to 12 and then package LLVM 15, then zig 0.9 and then we can update river. We are working on this, but this can take a while.
> 
> Zig 0.9 requires exactly llvm 13 actually, but I intend for the next river release to depend on Zig 0.10 which depends on LLVM 15 so this shouldn't be an issue. Just leaving this comment here for clarity, the overall plan of action seems reasonable to me.

I am aware of that, but updating LLVM is a non-trivial task, so we will probably go straight to the latest available version and skip 13 and 14 which means an LLVM update has to happen after the gcc update.

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (13 preceding siblings ...)
  2022-11-18 12:13 ` paper42
@ 2022-11-26 18:55 ` tranzystorek-io
  2022-11-27  0:45 ` [PR REVIEW] " paper42
                   ` (40 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-26 18:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

wlroots: update to 0.16, labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 15414 bytes --]

From 170075ce7ed3ecad7eeb2105e96050a62bf782dc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <f_l_k@t-online.de>
+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 <f_l_k@t-online.de>
+---
+ 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 <me@johnnynator.dev>"
 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 <tranzystorek.io@protonmail.com>
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 <mail@isaacfreund.com>"
 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 <tranzystorek.io@protonmail.com>
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 <mail@isaacfreund.com>"
+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 <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From aedb23bd340c8fa7ad9f108093c0b38961d5aac8 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <mail@isaacfreund.com>"

From 38eb56b9bf265b0d618d942d0b3b05eccb4d959f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>
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 <ericonr@disroot.org>"
 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 <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (14 preceding siblings ...)
  2022-11-26 18:55 ` [PR PATCH] [Updated] " tranzystorek-io
@ 2022-11-27  0:45 ` paper42
  2022-11-27  8:53 ` [PR PATCH] [Updated] " tranzystorek-io
                   ` (39 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: paper42 @ 2022-11-27  0:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 218 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1032849549

Comment:
This update seems to be unrelated and should be moved to a separate PR

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (15 preceding siblings ...)
  2022-11-27  0:45 ` [PR REVIEW] " paper42
@ 2022-11-27  8:53 ` tranzystorek-io
  2022-11-27  8:57 ` [PR REVIEW] " tranzystorek-io
                   ` (38 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-27  8:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

wlroots: update to 0.16, labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 14821 bytes --]

From 170075ce7ed3ecad7eeb2105e96050a62bf782dc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <f_l_k@t-online.de>
+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 <f_l_k@t-online.de>
+---
+ 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 <me@johnnynator.dev>"
 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 <tranzystorek.io@protonmail.com>
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 <mail@isaacfreund.com>"
 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 <tranzystorek.io@protonmail.com>
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 <mail@isaacfreund.com>"
+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 <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From aedb23bd340c8fa7ad9f108093c0b38961d5aac8 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <mail@isaacfreund.com>"

From 38eb56b9bf265b0d618d942d0b3b05eccb4d959f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 f1599d8dddfc660e83365dd32892aea57ac129d2 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 27 Nov 2022 09:49:51 +0100
Subject: [PATCH 7/9] wayfire: rebuild for wlroots0.15

---
 srcpkgs/wayfire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 5fdef2abd639..8c80f97a6a4c 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
+revision=3
 _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"

From 3d703f4fa3c1da66caed6e6f7c202d79562247bf Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ericonr@disroot.org>"
 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 c91cf155ff57deb85d82ecc925bf99a9edb11598 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (16 preceding siblings ...)
  2022-11-27  8:53 ` [PR PATCH] [Updated] " tranzystorek-io
@ 2022-11-27  8:57 ` tranzystorek-io
  2022-11-27 16:35 ` paper42
                   ` (37 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-27  8:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1032892102

Comment:
Switched to a revbump instead

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (17 preceding siblings ...)
  2022-11-27  8:57 ` [PR REVIEW] " tranzystorek-io
@ 2022-11-27 16:35 ` paper42
  2022-11-27 16:35 ` paper42
                   ` (36 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: paper42 @ 2022-11-27 16:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1032963529

Comment:
Can we bump to 1.8rc1 which uses wlroots 0.16 for testing?

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (18 preceding siblings ...)
  2022-11-27 16:35 ` paper42
@ 2022-11-27 16:35 ` paper42
  2022-11-27 19:38 ` tranzystorek-io
                   ` (35 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: paper42 @ 2022-11-27 16:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 173 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1032963595

Comment:
why is git required here?

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (19 preceding siblings ...)
  2022-11-27 16:35 ` paper42
@ 2022-11-27 19:38 ` tranzystorek-io
  2022-11-28 17:13 ` [PR PATCH] [Updated] " tranzystorek-io
                   ` (34 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-27 19:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1032999146

Comment:
Doesn't seem like it's required; build config uses it to get hash and branch name

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (20 preceding siblings ...)
  2022-11-27 19:38 ` tranzystorek-io
@ 2022-11-28 17:13 ` tranzystorek-io
  2022-11-28 17:14 ` tranzystorek-io
                   ` (33 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-28 17:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

wlroots: update to 0.16, labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 14997 bytes --]

From 75d1d11fc3731ce8e3e36a2e29689b0c487209c4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <f_l_k@t-online.de>
+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 <f_l_k@t-online.de>
+---
+ 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 <me@johnnynator.dev>"
 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 0e08c62eef83a8b568fc558c5d71d89b5bcffde9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 fc5bb4dda7e6..8b1d10f553b3 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 <mail@isaacfreund.com>"
 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 a019aec6de686a1ee502b2efdfdc577f7c22ca33 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 8b1d10f553b3..f2e2a4c64526 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 <mail@isaacfreund.com>"
+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 700a6f3caf4e3cf600afc7c16aa31e92f9debb7c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From 8203b52db95bbeac5d449d3a0127016121d6e3d5 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <mail@isaacfreund.com>"

From 0fe0df211143be0761a478a2e43d18f97ef69d03 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 02:07:15 +0100
Subject: [PATCH 6/9] sway: update to 1.8-rc1, rebuild for wlroots0.15

---
 srcpkgs/sway/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index bfb862c9aaaf..fe2859b62cef 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,6 +1,7 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.7
+_rc="1"
+version=1.8
 revision=1
 build_style=meson
 configure_args="-Dwerror=false -Db_ndebug=false"
@@ -13,8 +14,8 @@ short_desc="Tiling Wayland compositor compatible with i3"
 maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84
+distfiles="https://github.com/swaywm/${pkgname}/archive/${version}-rc${_rc}.tar.gz"
+checksum=495da92b12c521d2cc6f81f4a1cc28a688c140d97bfd9fd9304d217104211a93
 
 post_install() {
 	vlicense LICENSE

From 0d5833b563ad5527eac00a3a29060dec853d65ce Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 27 Nov 2022 09:49:51 +0100
Subject: [PATCH 7/9] wayfire: rebuild for wlroots0.15

---
 srcpkgs/wayfire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 5fdef2abd639..8c80f97a6a4c 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
+revision=3
 _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"

From 442ca24826d9920d965919c9e20adf5c4e624e43 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ericonr@disroot.org>"
 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 41c075074f2e791972a027fc005aae193aa3d696 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (21 preceding siblings ...)
  2022-11-28 17:13 ` [PR PATCH] [Updated] " tranzystorek-io
@ 2022-11-28 17:14 ` tranzystorek-io
  2022-11-28 17:14 ` [PR REVIEW] " tranzystorek-io
                   ` (32 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-28 17:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

wlroots: update to 0.16, labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 14972 bytes --]

From 75d1d11fc3731ce8e3e36a2e29689b0c487209c4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <f_l_k@t-online.de>
+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 <f_l_k@t-online.de>
+---
+ 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 <me@johnnynator.dev>"
 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 0e08c62eef83a8b568fc558c5d71d89b5bcffde9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 fc5bb4dda7e6..8b1d10f553b3 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 <mail@isaacfreund.com>"
 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 a019aec6de686a1ee502b2efdfdc577f7c22ca33 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 8b1d10f553b3..f2e2a4c64526 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 <mail@isaacfreund.com>"
+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 700a6f3caf4e3cf600afc7c16aa31e92f9debb7c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From 8203b52db95bbeac5d449d3a0127016121d6e3d5 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <mail@isaacfreund.com>"

From 39f366d3ceb1fc0e13f0975291924f9ea4f2ad61 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 02:07:15 +0100
Subject: [PATCH 6/9] sway: update to 1.8-rc1

---
 srcpkgs/sway/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index bfb862c9aaaf..fe2859b62cef 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,6 +1,7 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.7
+_rc="1"
+version=1.8
 revision=1
 build_style=meson
 configure_args="-Dwerror=false -Db_ndebug=false"
@@ -13,8 +14,8 @@ short_desc="Tiling Wayland compositor compatible with i3"
 maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84
+distfiles="https://github.com/swaywm/${pkgname}/archive/${version}-rc${_rc}.tar.gz"
+checksum=495da92b12c521d2cc6f81f4a1cc28a688c140d97bfd9fd9304d217104211a93
 
 post_install() {
 	vlicense LICENSE

From 8a48f3b07829faef7b3eaaf62f64d34c4ce626ce Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 27 Nov 2022 09:49:51 +0100
Subject: [PATCH 7/9] wayfire: rebuild for wlroots0.15

---
 srcpkgs/wayfire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 5fdef2abd639..8c80f97a6a4c 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
+revision=3
 _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"

From fba244291230d239616ec03bff08abae96999c5a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ericonr@disroot.org>"
 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 c8d2d3aed271849a7d9686aac677f62efa7d866c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (22 preceding siblings ...)
  2022-11-28 17:14 ` tranzystorek-io
@ 2022-11-28 17:14 ` tranzystorek-io
  2022-11-28 17:42 ` paper42
                   ` (31 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-28 17:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1033822597

Comment:
Done

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (23 preceding siblings ...)
  2022-11-28 17:14 ` [PR REVIEW] " tranzystorek-io
@ 2022-11-28 17:42 ` paper42
  2022-11-28 17:42 ` paper42
                   ` (30 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: paper42 @ 2022-11-28 17:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 245 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1033838693

Comment:
```suggestion
distfiles="https://github.com/swaywm/sway/archive/${version}-rc${_rc}.tar.gz"
```

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (24 preceding siblings ...)
  2022-11-28 17:42 ` paper42
@ 2022-11-28 17:42 ` paper42
  2022-11-28 17:42 ` paper42
                   ` (29 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: paper42 @ 2022-11-28 17:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 370 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1033841068

Comment:
 according to the [changelog](https://github.com/swaywm/sway/issues/7019#issue-1244738993):

> On Linux, CAP_SYS_NICE can be set to improve scheduling

Is this something we want or do we want to leave this to the user?

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (26 preceding siblings ...)
  2022-11-28 17:42 ` paper42
@ 2022-11-28 17:42 ` paper42
  2022-11-28 17:56 ` [PR PATCH] [Updated] " tranzystorek-io
                   ` (27 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: paper42 @ 2022-11-28 17:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1033838519

Comment:
(I can not comment in the right place, so I will leave the comment here)

* replace pcre-devel with pcre2-devel

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (25 preceding siblings ...)
  2022-11-28 17:42 ` paper42
@ 2022-11-28 17:42 ` paper42
  2022-11-28 17:42 ` paper42
                   ` (28 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: paper42 @ 2022-11-28 17:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 284 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1033843252

Comment:
```suggestion
distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
```

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (27 preceding siblings ...)
  2022-11-28 17:42 ` paper42
@ 2022-11-28 17:56 ` tranzystorek-io
  2022-11-28 17:57 ` [PR REVIEW] " tranzystorek-io
                   ` (26 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-28 17:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

wlroots: update to 0.16, labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 15478 bytes --]

From 75d1d11fc3731ce8e3e36a2e29689b0c487209c4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <f_l_k@t-online.de>
+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 <f_l_k@t-online.de>
+---
+ 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 <me@johnnynator.dev>"
 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 b1818412ef8ab76264bf2773c8c7cef97007b386 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index fc5bb4dda7e6..8b1d10f553b3 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..80cc0fedecf0 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
@@ -19,8 +19,8 @@ short_desc="Modular Wayland compositor library"
 maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
-distfiles="${homepage}/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
-checksum=5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
+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 87061c552bf24e88dba1eef657d0ed60ae76b84d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 8b1d10f553b3..f2e2a4c64526 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..1cfd3c2a71c7
--- /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 <mail@isaacfreund.com>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/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 a7f6f1944183bf34eaf5441fd8d5879f3a230775 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From b6bb5e265d826b4883ae8b5e5ae56e108030c709 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <mail@isaacfreund.com>"

From e56b06fd26834d4dd3556edf02032313652c232d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 02:07:15 +0100
Subject: [PATCH 6/9] sway: update to 1.8-rc1

---
 srcpkgs/sway/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index bfb862c9aaaf..6f2f107df910 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,20 +1,21 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.7
+_rc="1"
+version=1.8
 revision=1
 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="wlroots-devel pcre2-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"
 maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84
+distfiles="https://github.com/swaywm/sway/archive/refs/tags${version}-rc${_rc}.tar.gz"
+checksum=495da92b12c521d2cc6f81f4a1cc28a688c140d97bfd9fd9304d217104211a93
 
 post_install() {
 	vlicense LICENSE

From 1b3d49fb673f3e2c505f2c1316d75b0181e4e55b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 27 Nov 2022 09:49:51 +0100
Subject: [PATCH 7/9] wayfire: rebuild for wlroots0.15

---
 srcpkgs/wayfire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 5fdef2abd639..8c80f97a6a4c 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
+revision=3
 _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"

From d933bbd101addb981a1ef79bac424247f663323f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ericonr@disroot.org>"
 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 56feae5c3a97026e1b70c9a6aabe2d490adb9493 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (28 preceding siblings ...)
  2022-11-28 17:56 ` [PR PATCH] [Updated] " tranzystorek-io
@ 2022-11-28 17:57 ` tranzystorek-io
  2022-11-28 17:57 ` tranzystorek-io
                   ` (25 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-28 17:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1033868976

Comment:
Done

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (29 preceding siblings ...)
  2022-11-28 17:57 ` [PR REVIEW] " tranzystorek-io
@ 2022-11-28 17:57 ` tranzystorek-io
  2022-11-28 17:58 ` tranzystorek-io
                   ` (24 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-28 17:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1033869292

Comment:
Done

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (30 preceding siblings ...)
  2022-11-28 17:57 ` tranzystorek-io
@ 2022-11-28 17:58 ` tranzystorek-io
  2022-11-28 18:08 ` [PR PATCH] [Updated] " tranzystorek-io
                   ` (23 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-28 17:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1033869891

Comment:
Done

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (31 preceding siblings ...)
  2022-11-28 17:58 ` tranzystorek-io
@ 2022-11-28 18:08 ` tranzystorek-io
  2022-11-29 18:16 ` skmpz
                   ` (22 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-11-28 18:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

wlroots: update to 0.16, labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 15479 bytes --]

From 75d1d11fc3731ce8e3e36a2e29689b0c487209c4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <f_l_k@t-online.de>
+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 <f_l_k@t-online.de>
+---
+ 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 <me@johnnynator.dev>"
 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 b1818412ef8ab76264bf2773c8c7cef97007b386 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index fc5bb4dda7e6..8b1d10f553b3 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..80cc0fedecf0 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
@@ -19,8 +19,8 @@ short_desc="Modular Wayland compositor library"
 maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
-distfiles="${homepage}/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
-checksum=5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
+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 87061c552bf24e88dba1eef657d0ed60ae76b84d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 8b1d10f553b3..f2e2a4c64526 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..1cfd3c2a71c7
--- /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 <mail@isaacfreund.com>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/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 a7f6f1944183bf34eaf5441fd8d5879f3a230775 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From b6bb5e265d826b4883ae8b5e5ae56e108030c709 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <mail@isaacfreund.com>"

From 785f9f54e6a1914896a6fe671b69970e906f4ae8 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 02:07:15 +0100
Subject: [PATCH 6/9] sway: update to 1.8-rc1

---
 srcpkgs/sway/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index bfb862c9aaaf..e0c4748595cb 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,20 +1,21 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.7
+_rc="1"
+version=1.8
 revision=1
 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="wlroots-devel pcre2-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"
 maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84
+distfiles="https://github.com/swaywm/sway/archive/refs/tags/${version}-rc${_rc}.tar.gz"
+checksum=495da92b12c521d2cc6f81f4a1cc28a688c140d97bfd9fd9304d217104211a93
 
 post_install() {
 	vlicense LICENSE

From 86b544fc5c73760bc85206d673c57f8721714860 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 27 Nov 2022 09:49:51 +0100
Subject: [PATCH 7/9] wayfire: rebuild for wlroots0.15

---
 srcpkgs/wayfire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 5fdef2abd639..8c80f97a6a4c 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
+revision=3
 _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"

From e4f5467faed4a882354eb16017d913c862d37fd7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ericonr@disroot.org>"
 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 7ab435772a4f75cc0482e7d9e09f76554d01b915 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (32 preceding siblings ...)
  2022-11-28 18:08 ` [PR PATCH] [Updated] " tranzystorek-io
@ 2022-11-29 18:16 ` skmpz
  2022-12-03 12:49 ` [PR REVIEW] " ardadem
                   ` (21 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: skmpz @ 2022-11-29 18:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 351 bytes --]

New comment by skmpz on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#issuecomment-1331097455

Comment:
@tranzystorek-io @paper42 i've managed to build using https://github.com/swaywm/sway/commit/dca0bb5749bc16f91ab964fc1b06ebb9a453368f and tested both with and without CAP_SYS_NICE.. everything looks good so far..

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (33 preceding siblings ...)
  2022-11-29 18:16 ` skmpz
@ 2022-12-03 12:49 ` ardadem
  2022-12-06  7:16 ` [PR PATCH] [Updated] " tranzystorek-io
                   ` (20 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: ardadem @ 2022-12-03 12:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

New review comment by ardadem on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1038773369

Comment:
I think something we want, kwin has it: https://github.com/void-linux/void-packages/blob/ded277952d79804a1a4ed473e5848f65fe121bda/srcpkgs/kwin/INSTALL

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (34 preceding siblings ...)
  2022-12-03 12:49 ` [PR REVIEW] " ardadem
@ 2022-12-06  7:16 ` tranzystorek-io
  2022-12-06  7:31 ` tranzystorek-io
                   ` (19 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-12-06  7:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

wlroots: update to 0.16, labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 15477 bytes --]

From 7f77e43aad54238cb893785dd0e14291e99d6c74 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <f_l_k@t-online.de>
+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 <f_l_k@t-online.de>
+---
+ 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 <me@johnnynator.dev>"
 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 d66cd61d89d10037039d531c8ed5b9a1acad75ed Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 965eef4df56f..f445758348b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,7 +3532,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..80cc0fedecf0 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
@@ -19,8 +19,8 @@ short_desc="Modular Wayland compositor library"
 maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
-distfiles="${homepage}/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
-checksum=5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
+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 67ba79b56e5e298098c109a24f46d792a7b87c4a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 f445758348b4..63c20f398101 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,6 +3532,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..1cfd3c2a71c7
--- /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 <mail@isaacfreund.com>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/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 f7cf1add3bf37e563c65f27b50a07d16951b1a8d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From 76cf972bf20fa2bc41351e937b0eb7dd5255b908 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <mail@isaacfreund.com>"

From f7318d88ae40b0db8e5ec11d9c2c7b4626ccbc54 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 02:07:15 +0100
Subject: [PATCH 6/9] sway: update to 1.8-rc2

---
 srcpkgs/sway/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index bfb862c9aaaf..13e6daa25b65 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,20 +1,21 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.7
+_rc=2
+version=1.8
 revision=1
 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="wlroots-devel pcre2-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"
 maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84
+distfiles="https://github.com/swaywm/sway/archive/refs/tags/${version}-rc${_rc}.tar.gz"
+checksum=edfac0584c421c630fd36fc4567740b8905be522209c233409e25108b9ecf157
 
 post_install() {
 	vlicense LICENSE

From 968171c0b88014d48805a24e80ec0b9bebd362fd Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 27 Nov 2022 09:49:51 +0100
Subject: [PATCH 7/9] wayfire: rebuild for wlroots0.15

---
 srcpkgs/wayfire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 5fdef2abd639..8c80f97a6a4c 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
+revision=3
 _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"

From 635646f3ea962aff7ca92c70f1f52c11b5e2f215 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ericonr@disroot.org>"
 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 11d9041afb74a9f3cc2c4ef166934a1df168dfbc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (35 preceding siblings ...)
  2022-12-06  7:16 ` [PR PATCH] [Updated] " tranzystorek-io
@ 2022-12-06  7:31 ` tranzystorek-io
  2022-12-06  8:50 ` [PR REVIEW] " paper42
                   ` (18 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-12-06  7:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 200 bytes --]

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#issuecomment-1338903958

Comment:
Bumped sway to 1.8-rc2, should be good to test out

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (36 preceding siblings ...)
  2022-12-06  7:31 ` tranzystorek-io
@ 2022-12-06  8:50 ` paper42
  2022-12-06 10:18 ` [PR PATCH] [Updated] " tranzystorek-io
                   ` (17 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: paper42 @ 2022-12-06  8:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 182 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1040667889

Comment:
0.7.5 is out and uses wlroots 0.16

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (37 preceding siblings ...)
  2022-12-06  8:50 ` [PR REVIEW] " paper42
@ 2022-12-06 10:18 ` tranzystorek-io
  2022-12-06 10:29 ` tranzystorek-io
                   ` (16 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-12-06 10:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

wlroots: update to 0.16, labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 15847 bytes --]

From 7f77e43aad54238cb893785dd0e14291e99d6c74 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <f_l_k@t-online.de>
+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 <f_l_k@t-online.de>
+---
+ 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 <me@johnnynator.dev>"
 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 d66cd61d89d10037039d531c8ed5b9a1acad75ed Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 965eef4df56f..f445758348b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,7 +3532,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..80cc0fedecf0 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
@@ -19,8 +19,8 @@ short_desc="Modular Wayland compositor library"
 maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
-distfiles="${homepage}/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
-checksum=5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
+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 67ba79b56e5e298098c109a24f46d792a7b87c4a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 f445758348b4..63c20f398101 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,6 +3532,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..1cfd3c2a71c7
--- /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 <mail@isaacfreund.com>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/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 f7cf1add3bf37e563c65f27b50a07d16951b1a8d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From 76cf972bf20fa2bc41351e937b0eb7dd5255b908 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <mail@isaacfreund.com>"

From f7318d88ae40b0db8e5ec11d9c2c7b4626ccbc54 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 02:07:15 +0100
Subject: [PATCH 6/9] sway: update to 1.8-rc2

---
 srcpkgs/sway/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index bfb862c9aaaf..13e6daa25b65 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,20 +1,21 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.7
+_rc=2
+version=1.8
 revision=1
 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="wlroots-devel pcre2-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"
 maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84
+distfiles="https://github.com/swaywm/sway/archive/refs/tags/${version}-rc${_rc}.tar.gz"
+checksum=edfac0584c421c630fd36fc4567740b8905be522209c233409e25108b9ecf157
 
 post_install() {
 	vlicense LICENSE

From 09572b68fc19dcb507775a0947e28b2030989fc5 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 27 Nov 2022 09:49:51 +0100
Subject: [PATCH 7/9] wayfire: update to 0.7.5, rebuild for wlroots 0.16

---
 srcpkgs/wayfire/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 5fdef2abd639..8419ee024a57 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.5
+revision=1
 _utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac
 _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403
 create_wrksrc=yes
@@ -16,10 +16,10 @@ short_desc="3D wayland compositor"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz
+distfiles="https://github.com/WayfireWM/wayfire/archive/refs/tags/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="ae9a44d3ddcdf97b2dbe2baeeaf880f24f95bfb18e11e1dd5ad7443c26c5e19e
  bbde37e1a8b5ecb322096b32891593c14264800291be8773f7f0708fc110ed2f
  09061c8a4d3d964e8dcfd1a7b97f7dc43d0fc30743b0993585439c6923ce422f"
 

From cebdf54659833a540ce137054a9fcf202119d3db Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ericonr@disroot.org>"
 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 3d32979e0bb764a3914d4126d1325afb14b0f309 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (38 preceding siblings ...)
  2022-12-06 10:18 ` [PR PATCH] [Updated] " tranzystorek-io
@ 2022-12-06 10:29 ` tranzystorek-io
  2022-12-06 10:45 ` tranzystorek-io
                   ` (15 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-12-06 10:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

wlroots: update to 0.16, labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 15984 bytes --]

From 7f77e43aad54238cb893785dd0e14291e99d6c74 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <f_l_k@t-online.de>
+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 <f_l_k@t-online.de>
+---
+ 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 <me@johnnynator.dev>"
 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 d66cd61d89d10037039d531c8ed5b9a1acad75ed Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 965eef4df56f..f445758348b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,7 +3532,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..80cc0fedecf0 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
@@ -19,8 +19,8 @@ short_desc="Modular Wayland compositor library"
 maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
-distfiles="${homepage}/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
-checksum=5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
+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 67ba79b56e5e298098c109a24f46d792a7b87c4a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 f445758348b4..63c20f398101 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,6 +3532,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..1cfd3c2a71c7
--- /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 <mail@isaacfreund.com>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/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 f7cf1add3bf37e563c65f27b50a07d16951b1a8d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From 76cf972bf20fa2bc41351e937b0eb7dd5255b908 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <mail@isaacfreund.com>"

From f7318d88ae40b0db8e5ec11d9c2c7b4626ccbc54 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 02:07:15 +0100
Subject: [PATCH 6/9] sway: update to 1.8-rc2

---
 srcpkgs/sway/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index bfb862c9aaaf..13e6daa25b65 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,20 +1,21 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.7
+_rc=2
+version=1.8
 revision=1
 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="wlroots-devel pcre2-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"
 maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84
+distfiles="https://github.com/swaywm/sway/archive/refs/tags/${version}-rc${_rc}.tar.gz"
+checksum=edfac0584c421c630fd36fc4567740b8905be522209c233409e25108b9ecf157
 
 post_install() {
 	vlicense LICENSE

From 09572b68fc19dcb507775a0947e28b2030989fc5 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 27 Nov 2022 09:49:51 +0100
Subject: [PATCH 7/9] wayfire: update to 0.7.5, rebuild for wlroots 0.16

---
 srcpkgs/wayfire/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 5fdef2abd639..8419ee024a57 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.5
+revision=1
 _utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac
 _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403
 create_wrksrc=yes
@@ -16,10 +16,10 @@ short_desc="3D wayland compositor"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz
+distfiles="https://github.com/WayfireWM/wayfire/archive/refs/tags/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="ae9a44d3ddcdf97b2dbe2baeeaf880f24f95bfb18e11e1dd5ad7443c26c5e19e
  bbde37e1a8b5ecb322096b32891593c14264800291be8773f7f0708fc110ed2f
  09061c8a4d3d964e8dcfd1a7b97f7dc43d0fc30743b0993585439c6923ce422f"
 

From 9cc5863142264cbb5282e2f0a88b04cb10cbe2d1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 02:09:31 +0100
Subject: [PATCH 8/9] wayfire-plugins-extra: update to 0.7.5, rebuild for
 wayfire 0.7.5

---
 srcpkgs/wayfire-plugins-extra/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template
index a666281e177a..97170bfcdf98 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
+version=0.7.5
+revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayfire-devel glibmm-devel"
@@ -10,8 +10,8 @@ short_desc="Additional plugins for Wayfire"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org/"
-distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/v${version}.tar.gz"
-checksum=e6377e7f2cd6b0a19fe0a256c819f801ee1d963524ed4e4930b702474bc04287
+distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/refs/tags/v${version}.tar.gz"
+checksum=70418f29ecf9e3cb9c5313302ded125048d1493d57e4e5146f30363c5c954840
 
 post_install() {
 	vlicense LICENSE

From fdfe028946b3de47ce3d462ed441a733b209752b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (39 preceding siblings ...)
  2022-12-06 10:29 ` tranzystorek-io
@ 2022-12-06 10:45 ` tranzystorek-io
  2022-12-06 11:01 ` [PR REVIEW] " tranzystorek-io
                   ` (14 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-12-06 10:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

wlroots: update to 0.16, labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 19715 bytes --]

From 7f77e43aad54238cb893785dd0e14291e99d6c74 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <f_l_k@t-online.de>
+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 <f_l_k@t-online.de>
+---
+ 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 <me@johnnynator.dev>"
 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 d66cd61d89d10037039d531c8ed5b9a1acad75ed Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 965eef4df56f..f445758348b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,7 +3532,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..80cc0fedecf0 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
@@ -19,8 +19,8 @@ short_desc="Modular Wayland compositor library"
 maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
-distfiles="${homepage}/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
-checksum=5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
+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 67ba79b56e5e298098c109a24f46d792a7b87c4a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 f445758348b4..63c20f398101 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,6 +3532,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..1cfd3c2a71c7
--- /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 <mail@isaacfreund.com>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/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 f7cf1add3bf37e563c65f27b50a07d16951b1a8d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From 76cf972bf20fa2bc41351e937b0eb7dd5255b908 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <mail@isaacfreund.com>"

From f7318d88ae40b0db8e5ec11d9c2c7b4626ccbc54 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 02:07:15 +0100
Subject: [PATCH 6/9] sway: update to 1.8-rc2

---
 srcpkgs/sway/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index bfb862c9aaaf..13e6daa25b65 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,20 +1,21 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.7
+_rc=2
+version=1.8
 revision=1
 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="wlroots-devel pcre2-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"
 maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84
+distfiles="https://github.com/swaywm/sway/archive/refs/tags/${version}-rc${_rc}.tar.gz"
+checksum=edfac0584c421c630fd36fc4567740b8905be522209c233409e25108b9ecf157
 
 post_install() {
 	vlicense LICENSE

From 09572b68fc19dcb507775a0947e28b2030989fc5 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 27 Nov 2022 09:49:51 +0100
Subject: [PATCH 7/9] wayfire: update to 0.7.5, rebuild for wlroots 0.16

---
 srcpkgs/wayfire/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 5fdef2abd639..8419ee024a57 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.5
+revision=1
 _utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac
 _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403
 create_wrksrc=yes
@@ -16,10 +16,10 @@ short_desc="3D wayland compositor"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz
+distfiles="https://github.com/WayfireWM/wayfire/archive/refs/tags/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="ae9a44d3ddcdf97b2dbe2baeeaf880f24f95bfb18e11e1dd5ad7443c26c5e19e
  bbde37e1a8b5ecb322096b32891593c14264800291be8773f7f0708fc110ed2f
  09061c8a4d3d964e8dcfd1a7b97f7dc43d0fc30743b0993585439c6923ce422f"
 

From 2d66f6c411fd661f878bd516d8745ce612e4dca8 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 02:09:31 +0100
Subject: [PATCH 8/9] wayfire-plugins-extra: update to 0.7.5, rebuild for
 wayfire 0.7.5

---
 .../wayfire-plugins-extra/patches/mag.patch   | 99 -------------------
 srcpkgs/wayfire-plugins-extra/template        |  8 +-
 2 files changed, 4 insertions(+), 103 deletions(-)
 delete mode 100644 srcpkgs/wayfire-plugins-extra/patches/mag.patch

diff --git a/srcpkgs/wayfire-plugins-extra/patches/mag.patch b/srcpkgs/wayfire-plugins-extra/patches/mag.patch
deleted file mode 100644
index 0cb71ad5d86b..000000000000
--- a/srcpkgs/wayfire-plugins-extra/patches/mag.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/src/mag.cpp b/src/mag.cpp
-index 1ed4d73..f03cf7c 100644
---- a/src/mag.cpp
-+++ b/src/mag.cpp
-@@ -35,16 +35,6 @@
- #include "wayfire/opengl.hpp"
- #include <glm/gtc/matrix_transform.hpp>
- 
--extern "C"
--{
--#define static
--#include <wlr/config.h>
--#include <wlr/render/gles2.h>
--#include <wlr/render/wlr_renderer.h>
--#include <wlr/types/wlr_matrix.h>
--#undef static
--}
--
- #include <wayfire/util/log.hpp>
- 
- 
-@@ -171,19 +161,6 @@ class wayfire_magnifier : public wf::plugin_interface_t
- 
-     wf::effect_hook_t post_hook = [=] ()
-     {
--        wlr_dmabuf_attributes dmabuf_attribs;
--
--        /* This plugin only works if this function succeeds. It will not
--         * work with the x11 backend but works with drm, for example. */
--        if (!wlr_output_export_dmabuf(output->handle, &dmabuf_attribs))
--        {
--            LOGE("Failed reading output contents");
--            deactivate();
--            active = false;
--
--            return;
--        }
--
-         auto cursor_position = output->get_cursor_position();
- 
-         auto ortho = output->render->get_target_framebuffer()
-@@ -201,9 +178,6 @@ class wayfire_magnifier : public wf::plugin_interface_t
-         float y = cursor.y;
- 
-         auto og = output->get_relative_geometry();
--        gl_geometry src_geometry = {0, 0, (float)og.width, (float)og.height};
--        auto transform = output->render->get_target_framebuffer().transform;
--        transform = glm::inverse(transform);
- 
-         width  = og.width;
-         height = og.height;
-@@ -220,6 +194,9 @@ class wayfire_magnifier : public wf::plugin_interface_t
-         /* Compute zoom_box, forcing the zoom to stay on the output */
-         gl_geometry zoom_box;
- 
-+        /* Y-invert */
-+        y = 1.0 - y;
-+
-         zoom_box.x1 = x - level;
-         zoom_box.y1 = y - level;
-         zoom_box.x2 = x + level;
-@@ -249,27 +226,25 @@ class wayfire_magnifier : public wf::plugin_interface_t
-             zoom_box.y2  = 1.0;
-         }
- 
-+        zoom_box.x1 *= width - 1;
-+        zoom_box.x2 *= width - 1;
-+        zoom_box.y1 *= height - 1;
-+        zoom_box.y2 *= height - 1;
-+
-         /* Copy zoom_box part of the output to our own texture to be
-          * read by the mag_view_t. */
--        auto wlr_texture = wlr_texture_from_dmabuf(
--            wf::get_core().renderer, &dmabuf_attribs);
--
--        wf::texture_t texture{wlr_texture};
- 
-         OpenGL::render_begin();
-         mag_view->mag_tex.allocate(width, height);
-         mag_view->mag_tex.geometry = og;
-         mag_view->mag_tex.bind();
--
--        OpenGL::render_transformed_texture(texture, src_geometry, zoom_box,
--            transform * mag_view->mag_tex.get_orthographic_projection(),
--            glm::vec4(1.0),
--            OpenGL::TEXTURE_USE_TEX_GEOMETRY);
-+        GL_CALL(glBindFramebuffer(GL_READ_FRAMEBUFFER,
-+            output->render->get_target_framebuffer().fb));
-+        GL_CALL(glBlitFramebuffer(zoom_box.x1, zoom_box.y2, zoom_box.x2, zoom_box.y1,
-+            0, 0, width, height,
-+            GL_COLOR_BUFFER_BIT, GL_LINEAR));
-         OpenGL::render_end();
- 
--        wlr_texture_destroy(wlr_texture);
--        wlr_dmabuf_attributes_finish(&dmabuf_attribs);
--
-         mag_view->damage();
-     };
- 
diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template
index a666281e177a..97170bfcdf98 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
+version=0.7.5
+revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayfire-devel glibmm-devel"
@@ -10,8 +10,8 @@ short_desc="Additional plugins for Wayfire"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org/"
-distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/v${version}.tar.gz"
-checksum=e6377e7f2cd6b0a19fe0a256c819f801ee1d963524ed4e4930b702474bc04287
+distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/refs/tags/v${version}.tar.gz"
+checksum=70418f29ecf9e3cb9c5313302ded125048d1493d57e4e5146f30363c5c954840
 
 post_install() {
 	vlicense LICENSE

From e5caa9a84699bd7cff718b60404f9e12c15b3dd5 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (40 preceding siblings ...)
  2022-12-06 10:45 ` tranzystorek-io
@ 2022-12-06 11:01 ` tranzystorek-io
  2022-12-27 10:22 ` [PR PATCH] [Updated] " tranzystorek-io
                   ` (13 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-12-06 11:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1040822902

Comment:
Good to go as well

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (41 preceding siblings ...)
  2022-12-06 11:01 ` [PR REVIEW] " tranzystorek-io
@ 2022-12-27 10:22 ` tranzystorek-io
  2022-12-27 10:40 ` tranzystorek-io
                   ` (12 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-12-27 10:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

wlroots: update to 0.16, labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 19694 bytes --]

From beaed2c09892b9922850b26607f55f8cc6a136f4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <f_l_k@t-online.de>
+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 <f_l_k@t-online.de>
+---
+ 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 <me@johnnynator.dev>"
 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 c819e75b2b285da232b3619a3765a1fcd38a7839 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..47f76da1b59a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3530,7 +3530,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..80cc0fedecf0 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
@@ -19,8 +19,8 @@ short_desc="Modular Wayland compositor library"
 maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
-distfiles="${homepage}/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
-checksum=5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
+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 549ec881c59c68a177b14642e6afe3e539b33b48 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 47f76da1b59a..1c852ef3fdff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3530,6 +3530,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..1cfd3c2a71c7
--- /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 <mail@isaacfreund.com>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/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 003a52f73153c9a764f5f3b9abac11032ba4dbe4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From a21d61414a56fd1903ec071744807ed2c2e616c7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <mail@isaacfreund.com>"

From d8486b5b414edf00d4f1dc38229289887c4646da Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 02:07:15 +0100
Subject: [PATCH 6/9] sway: update to 1.8

---
 srcpkgs/sway/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index bfb862c9aaaf..2c773df82051 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,20 +1,20 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.7
+version=1.8
 revision=1
 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="wlroots-devel pcre2-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"
 maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84
+distfiles="https://github.com/swaywm/sway/archive/refs/tags/${version}.tar.gz"
+checksum=fae0422bca8f528027f77e3a7bbea2be0498bba2ad3f0d22554ff8827e37f04e
 
 post_install() {
 	vlicense LICENSE

From 1e00a98fbf452d9efe32911401967b6aaa279b72 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 27 Nov 2022 09:49:51 +0100
Subject: [PATCH 7/9] wayfire: update to 0.7.5, rebuild for wlroots 0.16

---
 srcpkgs/wayfire/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 5fdef2abd639..8419ee024a57 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.5
+revision=1
 _utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac
 _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403
 create_wrksrc=yes
@@ -16,10 +16,10 @@ short_desc="3D wayland compositor"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz
+distfiles="https://github.com/WayfireWM/wayfire/archive/refs/tags/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="ae9a44d3ddcdf97b2dbe2baeeaf880f24f95bfb18e11e1dd5ad7443c26c5e19e
  bbde37e1a8b5ecb322096b32891593c14264800291be8773f7f0708fc110ed2f
  09061c8a4d3d964e8dcfd1a7b97f7dc43d0fc30743b0993585439c6923ce422f"
 

From 01b87f1814ba146307efb899defc9aee2d587b21 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 02:09:31 +0100
Subject: [PATCH 8/9] wayfire-plugins-extra: update to 0.7.5, rebuild for
 wayfire 0.7.5

---
 .../wayfire-plugins-extra/patches/mag.patch   | 99 -------------------
 srcpkgs/wayfire-plugins-extra/template        |  8 +-
 2 files changed, 4 insertions(+), 103 deletions(-)
 delete mode 100644 srcpkgs/wayfire-plugins-extra/patches/mag.patch

diff --git a/srcpkgs/wayfire-plugins-extra/patches/mag.patch b/srcpkgs/wayfire-plugins-extra/patches/mag.patch
deleted file mode 100644
index 0cb71ad5d86b..000000000000
--- a/srcpkgs/wayfire-plugins-extra/patches/mag.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/src/mag.cpp b/src/mag.cpp
-index 1ed4d73..f03cf7c 100644
---- a/src/mag.cpp
-+++ b/src/mag.cpp
-@@ -35,16 +35,6 @@
- #include "wayfire/opengl.hpp"
- #include <glm/gtc/matrix_transform.hpp>
- 
--extern "C"
--{
--#define static
--#include <wlr/config.h>
--#include <wlr/render/gles2.h>
--#include <wlr/render/wlr_renderer.h>
--#include <wlr/types/wlr_matrix.h>
--#undef static
--}
--
- #include <wayfire/util/log.hpp>
- 
- 
-@@ -171,19 +161,6 @@ class wayfire_magnifier : public wf::plugin_interface_t
- 
-     wf::effect_hook_t post_hook = [=] ()
-     {
--        wlr_dmabuf_attributes dmabuf_attribs;
--
--        /* This plugin only works if this function succeeds. It will not
--         * work with the x11 backend but works with drm, for example. */
--        if (!wlr_output_export_dmabuf(output->handle, &dmabuf_attribs))
--        {
--            LOGE("Failed reading output contents");
--            deactivate();
--            active = false;
--
--            return;
--        }
--
-         auto cursor_position = output->get_cursor_position();
- 
-         auto ortho = output->render->get_target_framebuffer()
-@@ -201,9 +178,6 @@ class wayfire_magnifier : public wf::plugin_interface_t
-         float y = cursor.y;
- 
-         auto og = output->get_relative_geometry();
--        gl_geometry src_geometry = {0, 0, (float)og.width, (float)og.height};
--        auto transform = output->render->get_target_framebuffer().transform;
--        transform = glm::inverse(transform);
- 
-         width  = og.width;
-         height = og.height;
-@@ -220,6 +194,9 @@ class wayfire_magnifier : public wf::plugin_interface_t
-         /* Compute zoom_box, forcing the zoom to stay on the output */
-         gl_geometry zoom_box;
- 
-+        /* Y-invert */
-+        y = 1.0 - y;
-+
-         zoom_box.x1 = x - level;
-         zoom_box.y1 = y - level;
-         zoom_box.x2 = x + level;
-@@ -249,27 +226,25 @@ class wayfire_magnifier : public wf::plugin_interface_t
-             zoom_box.y2  = 1.0;
-         }
- 
-+        zoom_box.x1 *= width - 1;
-+        zoom_box.x2 *= width - 1;
-+        zoom_box.y1 *= height - 1;
-+        zoom_box.y2 *= height - 1;
-+
-         /* Copy zoom_box part of the output to our own texture to be
-          * read by the mag_view_t. */
--        auto wlr_texture = wlr_texture_from_dmabuf(
--            wf::get_core().renderer, &dmabuf_attribs);
--
--        wf::texture_t texture{wlr_texture};
- 
-         OpenGL::render_begin();
-         mag_view->mag_tex.allocate(width, height);
-         mag_view->mag_tex.geometry = og;
-         mag_view->mag_tex.bind();
--
--        OpenGL::render_transformed_texture(texture, src_geometry, zoom_box,
--            transform * mag_view->mag_tex.get_orthographic_projection(),
--            glm::vec4(1.0),
--            OpenGL::TEXTURE_USE_TEX_GEOMETRY);
-+        GL_CALL(glBindFramebuffer(GL_READ_FRAMEBUFFER,
-+            output->render->get_target_framebuffer().fb));
-+        GL_CALL(glBlitFramebuffer(zoom_box.x1, zoom_box.y2, zoom_box.x2, zoom_box.y1,
-+            0, 0, width, height,
-+            GL_COLOR_BUFFER_BIT, GL_LINEAR));
-         OpenGL::render_end();
- 
--        wlr_texture_destroy(wlr_texture);
--        wlr_dmabuf_attributes_finish(&dmabuf_attribs);
--
-         mag_view->damage();
-     };
- 
diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template
index a666281e177a..97170bfcdf98 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
+version=0.7.5
+revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayfire-devel glibmm-devel"
@@ -10,8 +10,8 @@ short_desc="Additional plugins for Wayfire"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org/"
-distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/v${version}.tar.gz"
-checksum=e6377e7f2cd6b0a19fe0a256c819f801ee1d963524ed4e4930b702474bc04287
+distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/refs/tags/v${version}.tar.gz"
+checksum=70418f29ecf9e3cb9c5313302ded125048d1493d57e4e5146f30363c5c954840
 
 post_install() {
 	vlicense LICENSE

From 0f830a2b46f27cde4b085c2d8a69704d4a9c0bfc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (42 preceding siblings ...)
  2022-12-27 10:22 ` [PR PATCH] [Updated] " tranzystorek-io
@ 2022-12-27 10:40 ` tranzystorek-io
  2022-12-27 10:41 ` [PR REVIEW] " tranzystorek-io
                   ` (11 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-12-27 10:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

wlroots: update to 0.16, labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 20015 bytes --]

From beaed2c09892b9922850b26607f55f8cc6a136f4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <f_l_k@t-online.de>
+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 <f_l_k@t-online.de>
+---
+ 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 <me@johnnynator.dev>"
 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 c819e75b2b285da232b3619a3765a1fcd38a7839 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..47f76da1b59a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3530,7 +3530,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..80cc0fedecf0 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
@@ -19,8 +19,8 @@ short_desc="Modular Wayland compositor library"
 maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
-distfiles="${homepage}/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
-checksum=5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
+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 549ec881c59c68a177b14642e6afe3e539b33b48 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 47f76da1b59a..1c852ef3fdff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3530,6 +3530,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..1cfd3c2a71c7
--- /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 <mail@isaacfreund.com>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/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 003a52f73153c9a764f5f3b9abac11032ba4dbe4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From a21d61414a56fd1903ec071744807ed2c2e616c7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <mail@isaacfreund.com>"

From 610eec612e5aca455eb2bdb5c1c938d818bfd38d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 02:07:15 +0100
Subject: [PATCH 6/9] sway: update to 1.8

---
 srcpkgs/sway/INSTALL  | 5 +++++
 srcpkgs/sway/template | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/sway/INSTALL

diff --git a/srcpkgs/sway/INSTALL b/srcpkgs/sway/INSTALL
new file mode 100644
index 000000000000..0120d14908bc
--- /dev/null
+++ b/srcpkgs/sway/INSTALL
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+post)
+	setcap CAP_SYS_NICE=+ep usr/bin/sway
+	;;
+esac
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index bfb862c9aaaf..2c773df82051 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,20 +1,20 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.7
+version=1.8
 revision=1
 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="wlroots-devel pcre2-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"
 maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84
+distfiles="https://github.com/swaywm/sway/archive/refs/tags/${version}.tar.gz"
+checksum=fae0422bca8f528027f77e3a7bbea2be0498bba2ad3f0d22554ff8827e37f04e
 
 post_install() {
 	vlicense LICENSE

From a62c644aecdac2dd3e9f820e9171faed68213a04 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 27 Nov 2022 09:49:51 +0100
Subject: [PATCH 7/9] wayfire: update to 0.7.5, rebuild for wlroots 0.16

---
 srcpkgs/wayfire/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 5fdef2abd639..8419ee024a57 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.5
+revision=1
 _utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac
 _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403
 create_wrksrc=yes
@@ -16,10 +16,10 @@ short_desc="3D wayland compositor"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz
+distfiles="https://github.com/WayfireWM/wayfire/archive/refs/tags/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="ae9a44d3ddcdf97b2dbe2baeeaf880f24f95bfb18e11e1dd5ad7443c26c5e19e
  bbde37e1a8b5ecb322096b32891593c14264800291be8773f7f0708fc110ed2f
  09061c8a4d3d964e8dcfd1a7b97f7dc43d0fc30743b0993585439c6923ce422f"
 

From 896485bc5b1031f89bb6906506993a8296f813ed Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 02:09:31 +0100
Subject: [PATCH 8/9] wayfire-plugins-extra: update to 0.7.5, rebuild for
 wayfire 0.7.5

---
 .../wayfire-plugins-extra/patches/mag.patch   | 99 -------------------
 srcpkgs/wayfire-plugins-extra/template        |  8 +-
 2 files changed, 4 insertions(+), 103 deletions(-)
 delete mode 100644 srcpkgs/wayfire-plugins-extra/patches/mag.patch

diff --git a/srcpkgs/wayfire-plugins-extra/patches/mag.patch b/srcpkgs/wayfire-plugins-extra/patches/mag.patch
deleted file mode 100644
index 0cb71ad5d86b..000000000000
--- a/srcpkgs/wayfire-plugins-extra/patches/mag.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/src/mag.cpp b/src/mag.cpp
-index 1ed4d73..f03cf7c 100644
---- a/src/mag.cpp
-+++ b/src/mag.cpp
-@@ -35,16 +35,6 @@
- #include "wayfire/opengl.hpp"
- #include <glm/gtc/matrix_transform.hpp>
- 
--extern "C"
--{
--#define static
--#include <wlr/config.h>
--#include <wlr/render/gles2.h>
--#include <wlr/render/wlr_renderer.h>
--#include <wlr/types/wlr_matrix.h>
--#undef static
--}
--
- #include <wayfire/util/log.hpp>
- 
- 
-@@ -171,19 +161,6 @@ class wayfire_magnifier : public wf::plugin_interface_t
- 
-     wf::effect_hook_t post_hook = [=] ()
-     {
--        wlr_dmabuf_attributes dmabuf_attribs;
--
--        /* This plugin only works if this function succeeds. It will not
--         * work with the x11 backend but works with drm, for example. */
--        if (!wlr_output_export_dmabuf(output->handle, &dmabuf_attribs))
--        {
--            LOGE("Failed reading output contents");
--            deactivate();
--            active = false;
--
--            return;
--        }
--
-         auto cursor_position = output->get_cursor_position();
- 
-         auto ortho = output->render->get_target_framebuffer()
-@@ -201,9 +178,6 @@ class wayfire_magnifier : public wf::plugin_interface_t
-         float y = cursor.y;
- 
-         auto og = output->get_relative_geometry();
--        gl_geometry src_geometry = {0, 0, (float)og.width, (float)og.height};
--        auto transform = output->render->get_target_framebuffer().transform;
--        transform = glm::inverse(transform);
- 
-         width  = og.width;
-         height = og.height;
-@@ -220,6 +194,9 @@ class wayfire_magnifier : public wf::plugin_interface_t
-         /* Compute zoom_box, forcing the zoom to stay on the output */
-         gl_geometry zoom_box;
- 
-+        /* Y-invert */
-+        y = 1.0 - y;
-+
-         zoom_box.x1 = x - level;
-         zoom_box.y1 = y - level;
-         zoom_box.x2 = x + level;
-@@ -249,27 +226,25 @@ class wayfire_magnifier : public wf::plugin_interface_t
-             zoom_box.y2  = 1.0;
-         }
- 
-+        zoom_box.x1 *= width - 1;
-+        zoom_box.x2 *= width - 1;
-+        zoom_box.y1 *= height - 1;
-+        zoom_box.y2 *= height - 1;
-+
-         /* Copy zoom_box part of the output to our own texture to be
-          * read by the mag_view_t. */
--        auto wlr_texture = wlr_texture_from_dmabuf(
--            wf::get_core().renderer, &dmabuf_attribs);
--
--        wf::texture_t texture{wlr_texture};
- 
-         OpenGL::render_begin();
-         mag_view->mag_tex.allocate(width, height);
-         mag_view->mag_tex.geometry = og;
-         mag_view->mag_tex.bind();
--
--        OpenGL::render_transformed_texture(texture, src_geometry, zoom_box,
--            transform * mag_view->mag_tex.get_orthographic_projection(),
--            glm::vec4(1.0),
--            OpenGL::TEXTURE_USE_TEX_GEOMETRY);
-+        GL_CALL(glBindFramebuffer(GL_READ_FRAMEBUFFER,
-+            output->render->get_target_framebuffer().fb));
-+        GL_CALL(glBlitFramebuffer(zoom_box.x1, zoom_box.y2, zoom_box.x2, zoom_box.y1,
-+            0, 0, width, height,
-+            GL_COLOR_BUFFER_BIT, GL_LINEAR));
-         OpenGL::render_end();
- 
--        wlr_texture_destroy(wlr_texture);
--        wlr_dmabuf_attributes_finish(&dmabuf_attribs);
--
-         mag_view->damage();
-     };
- 
diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template
index a666281e177a..97170bfcdf98 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
+version=0.7.5
+revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayfire-devel glibmm-devel"
@@ -10,8 +10,8 @@ short_desc="Additional plugins for Wayfire"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org/"
-distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/v${version}.tar.gz"
-checksum=e6377e7f2cd6b0a19fe0a256c819f801ee1d963524ed4e4930b702474bc04287
+distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/refs/tags/v${version}.tar.gz"
+checksum=70418f29ecf9e3cb9c5313302ded125048d1493d57e4e5146f30363c5c954840
 
 post_install() {
 	vlicense LICENSE

From 655573f4b2ddca179b308ba85aa88a56d78df770 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (43 preceding siblings ...)
  2022-12-27 10:40 ` tranzystorek-io
@ 2022-12-27 10:41 ` tranzystorek-io
  2022-12-27 17:32 ` paper42
                   ` (10 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-12-27 10:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 161 bytes --]

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1057598804

Comment:
added

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (44 preceding siblings ...)
  2022-12-27 10:41 ` [PR REVIEW] " tranzystorek-io
@ 2022-12-27 17:32 ` paper42
  2022-12-27 17:33 ` paper42
                   ` (9 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: paper42 @ 2022-12-27 17:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 275 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1057811667

Comment:
in that case, please drop git from hostmakedepends, this is built from a tarball, not a git repository, so it won't work anyway

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (45 preceding siblings ...)
  2022-12-27 17:32 ` paper42
@ 2022-12-27 17:33 ` paper42
  2022-12-27 19:07 ` [PR PATCH] [Updated] " tranzystorek-io
                   ` (8 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: paper42 @ 2022-12-27 17:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1057812273

Comment:
also add libcap-progs to $depends

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (46 preceding siblings ...)
  2022-12-27 17:33 ` paper42
@ 2022-12-27 19:07 ` tranzystorek-io
  2022-12-27 19:08 ` [PR REVIEW] " tranzystorek-io
                   ` (7 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-12-27 19:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1282 bytes --]

There is an updated pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages labwc
https://github.com/void-linux/void-packages/pull/40587

wlroots: update to 0.16, labwc: update to 0.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40587.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-labwc-40587.patch --]
[-- Type: text/x-diff, Size: 20124 bytes --]

From beaed2c09892b9922850b26607f55f8cc6a136f4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <f_l_k@t-online.de>
+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 <f_l_k@t-online.de>
+---
+ 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 <me@johnnynator.dev>"
 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 c819e75b2b285da232b3619a3765a1fcd38a7839 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..47f76da1b59a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3530,7 +3530,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..80cc0fedecf0 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
@@ -19,8 +19,8 @@ short_desc="Modular Wayland compositor library"
 maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
-distfiles="${homepage}/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
-checksum=5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
+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 549ec881c59c68a177b14642e6afe3e539b33b48 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 47f76da1b59a..1c852ef3fdff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3530,6 +3530,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..1cfd3c2a71c7
--- /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 <mail@isaacfreund.com>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
+distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/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 003a52f73153c9a764f5f3b9abac11032ba4dbe4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <ajh@sideband.org>"
 license="BSD-2-Clause"

From a21d61414a56fd1903ec071744807ed2c2e616c7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <mail@isaacfreund.com>"

From 486012bdc54ba75d74cce92d8f09cae2115d46ad Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 02:07:15 +0100
Subject: [PATCH 6/9] sway: update to 1.8

---
 srcpkgs/sway/INSTALL  |  5 +++++
 srcpkgs/sway/template | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/sway/INSTALL

diff --git a/srcpkgs/sway/INSTALL b/srcpkgs/sway/INSTALL
new file mode 100644
index 000000000000..0120d14908bc
--- /dev/null
+++ b/srcpkgs/sway/INSTALL
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+post)
+	setcap CAP_SYS_NICE=+ep usr/bin/sway
+	;;
+esac
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index bfb862c9aaaf..db51ad2a359d 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,20 +1,20 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.7
+version=1.8
 revision=1
 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
+hostmakedepends="pkg-config wayland-devel scdoc"
+makedepends="wlroots-devel pcre2-devel json-c-devel pango-devel cairo-devel
  gdk-pixbuf-devel libevdev-devel"
-depends="swaybg xorg-server-xwayland"
+depends="libcap-progs swaybg xorg-server-xwayland"
 short_desc="Tiling Wayland compositor compatible with i3"
 maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="MIT"
 homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84
+distfiles="https://github.com/swaywm/sway/archive/refs/tags/${version}.tar.gz"
+checksum=fae0422bca8f528027f77e3a7bbea2be0498bba2ad3f0d22554ff8827e37f04e
 
 post_install() {
 	vlicense LICENSE

From 8c3f0dc814d56d478e1ad82969e037f80287869f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 27 Nov 2022 09:49:51 +0100
Subject: [PATCH 7/9] wayfire: update to 0.7.5, rebuild for wlroots 0.16

---
 srcpkgs/wayfire/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 5fdef2abd639..8419ee024a57 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.5
+revision=1
 _utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac
 _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403
 create_wrksrc=yes
@@ -16,10 +16,10 @@ short_desc="3D wayland compositor"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org"
-distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz
+distfiles="https://github.com/WayfireWM/wayfire/archive/refs/tags/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="ae9a44d3ddcdf97b2dbe2baeeaf880f24f95bfb18e11e1dd5ad7443c26c5e19e
  bbde37e1a8b5ecb322096b32891593c14264800291be8773f7f0708fc110ed2f
  09061c8a4d3d964e8dcfd1a7b97f7dc43d0fc30743b0993585439c6923ce422f"
 

From 73103f5f34d6a425754bb2a656b1c9ed45d03328 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 18 Nov 2022 02:09:31 +0100
Subject: [PATCH 8/9] wayfire-plugins-extra: update to 0.7.5, rebuild for
 wayfire 0.7.5

---
 .../wayfire-plugins-extra/patches/mag.patch   | 99 -------------------
 srcpkgs/wayfire-plugins-extra/template        |  8 +-
 2 files changed, 4 insertions(+), 103 deletions(-)
 delete mode 100644 srcpkgs/wayfire-plugins-extra/patches/mag.patch

diff --git a/srcpkgs/wayfire-plugins-extra/patches/mag.patch b/srcpkgs/wayfire-plugins-extra/patches/mag.patch
deleted file mode 100644
index 0cb71ad5d86b..000000000000
--- a/srcpkgs/wayfire-plugins-extra/patches/mag.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/src/mag.cpp b/src/mag.cpp
-index 1ed4d73..f03cf7c 100644
---- a/src/mag.cpp
-+++ b/src/mag.cpp
-@@ -35,16 +35,6 @@
- #include "wayfire/opengl.hpp"
- #include <glm/gtc/matrix_transform.hpp>
- 
--extern "C"
--{
--#define static
--#include <wlr/config.h>
--#include <wlr/render/gles2.h>
--#include <wlr/render/wlr_renderer.h>
--#include <wlr/types/wlr_matrix.h>
--#undef static
--}
--
- #include <wayfire/util/log.hpp>
- 
- 
-@@ -171,19 +161,6 @@ class wayfire_magnifier : public wf::plugin_interface_t
- 
-     wf::effect_hook_t post_hook = [=] ()
-     {
--        wlr_dmabuf_attributes dmabuf_attribs;
--
--        /* This plugin only works if this function succeeds. It will not
--         * work with the x11 backend but works with drm, for example. */
--        if (!wlr_output_export_dmabuf(output->handle, &dmabuf_attribs))
--        {
--            LOGE("Failed reading output contents");
--            deactivate();
--            active = false;
--
--            return;
--        }
--
-         auto cursor_position = output->get_cursor_position();
- 
-         auto ortho = output->render->get_target_framebuffer()
-@@ -201,9 +178,6 @@ class wayfire_magnifier : public wf::plugin_interface_t
-         float y = cursor.y;
- 
-         auto og = output->get_relative_geometry();
--        gl_geometry src_geometry = {0, 0, (float)og.width, (float)og.height};
--        auto transform = output->render->get_target_framebuffer().transform;
--        transform = glm::inverse(transform);
- 
-         width  = og.width;
-         height = og.height;
-@@ -220,6 +194,9 @@ class wayfire_magnifier : public wf::plugin_interface_t
-         /* Compute zoom_box, forcing the zoom to stay on the output */
-         gl_geometry zoom_box;
- 
-+        /* Y-invert */
-+        y = 1.0 - y;
-+
-         zoom_box.x1 = x - level;
-         zoom_box.y1 = y - level;
-         zoom_box.x2 = x + level;
-@@ -249,27 +226,25 @@ class wayfire_magnifier : public wf::plugin_interface_t
-             zoom_box.y2  = 1.0;
-         }
- 
-+        zoom_box.x1 *= width - 1;
-+        zoom_box.x2 *= width - 1;
-+        zoom_box.y1 *= height - 1;
-+        zoom_box.y2 *= height - 1;
-+
-         /* Copy zoom_box part of the output to our own texture to be
-          * read by the mag_view_t. */
--        auto wlr_texture = wlr_texture_from_dmabuf(
--            wf::get_core().renderer, &dmabuf_attribs);
--
--        wf::texture_t texture{wlr_texture};
- 
-         OpenGL::render_begin();
-         mag_view->mag_tex.allocate(width, height);
-         mag_view->mag_tex.geometry = og;
-         mag_view->mag_tex.bind();
--
--        OpenGL::render_transformed_texture(texture, src_geometry, zoom_box,
--            transform * mag_view->mag_tex.get_orthographic_projection(),
--            glm::vec4(1.0),
--            OpenGL::TEXTURE_USE_TEX_GEOMETRY);
-+        GL_CALL(glBindFramebuffer(GL_READ_FRAMEBUFFER,
-+            output->render->get_target_framebuffer().fb));
-+        GL_CALL(glBlitFramebuffer(zoom_box.x1, zoom_box.y2, zoom_box.x2, zoom_box.y1,
-+            0, 0, width, height,
-+            GL_COLOR_BUFFER_BIT, GL_LINEAR));
-         OpenGL::render_end();
- 
--        wlr_texture_destroy(wlr_texture);
--        wlr_dmabuf_attributes_finish(&dmabuf_attribs);
--
-         mag_view->damage();
-     };
- 
diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template
index a666281e177a..97170bfcdf98 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
+version=0.7.5
+revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayfire-devel glibmm-devel"
@@ -10,8 +10,8 @@ short_desc="Additional plugins for Wayfire"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://wayfire.org/"
-distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/v${version}.tar.gz"
-checksum=e6377e7f2cd6b0a19fe0a256c819f801ee1d963524ed4e4930b702474bc04287
+distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/refs/tags/v${version}.tar.gz"
+checksum=70418f29ecf9e3cb9c5313302ded125048d1493d57e4e5146f30363c5c954840
 
 post_install() {
 	vlicense LICENSE

From 88a19f6476eb0b3b83aef63fef5e7fcff7b87c51 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <tranzystorek.io@protonmail.com>"
 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

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (47 preceding siblings ...)
  2022-12-27 19:07 ` [PR PATCH] [Updated] " tranzystorek-io
@ 2022-12-27 19:08 ` tranzystorek-io
  2022-12-27 19:08 ` tranzystorek-io
                   ` (6 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-12-27 19:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1057862449

Comment:
done

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (48 preceding siblings ...)
  2022-12-27 19:08 ` [PR REVIEW] " tranzystorek-io
@ 2022-12-27 19:08 ` tranzystorek-io
  2022-12-27 22:21 ` [PR PATCH] [Merged]: " paper42
                   ` (5 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-12-27 19:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1057862859

Comment:
done

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR PATCH] [Merged]: wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (49 preceding siblings ...)
  2022-12-27 19:08 ` tranzystorek-io
@ 2022-12-27 22:21 ` paper42
  2022-12-29  0:54 ` [PR REVIEW] " mhmdanas
                   ` (4 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: paper42 @ 2022-12-27 22:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1112 bytes --]

There's a merged pull request on the void-packages repository

wlroots: update to 0.16, labwc: update to 0.6.0
https://github.com/void-linux/void-packages/pull/40587

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (50 preceding siblings ...)
  2022-12-27 22:21 ` [PR PATCH] [Merged]: " paper42
@ 2022-12-29  0:54 ` mhmdanas
  2022-12-29  8:39 ` tranzystorek-io
                   ` (3 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: mhmdanas @ 2022-12-29  0:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 411 bytes --]

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1058674090

Comment:
Doing this currently breaks loading custom keymaps from a user directory, so it should probably be removed and added back when https://github.com/swaywm/sway/pull/7326 is included in a future release (also see https://github.com/xkbcommon/libxkbcommon/pull/312).

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (51 preceding siblings ...)
  2022-12-29  0:54 ` [PR REVIEW] " mhmdanas
@ 2022-12-29  8:39 ` tranzystorek-io
  2022-12-29  8:40 ` tranzystorek-io
                   ` (2 subsequent siblings)
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-12-29  8:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 220 bytes --]

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1058815387

Comment:
Since this has been merged in, could you post an issue for this?

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (52 preceding siblings ...)
  2022-12-29  8:39 ` tranzystorek-io
@ 2022-12-29  8:40 ` tranzystorek-io
  2022-12-29 14:48 ` mhmdanas
  2022-12-30  3:18 ` mhmdanas
  55 siblings, 0 replies; 57+ messages in thread
From: tranzystorek-io @ 2022-12-29  8:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 223 bytes --]

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1058815387

Comment:
Since this PR has been merged in, could you post an issue for this?

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (53 preceding siblings ...)
  2022-12-29  8:40 ` tranzystorek-io
@ 2022-12-29 14:48 ` mhmdanas
  2022-12-30  3:18 ` mhmdanas
  55 siblings, 0 replies; 57+ messages in thread
From: mhmdanas @ 2022-12-29 14:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1058993814

Comment:
I'll just open a PR when I get the time. :)

^ permalink raw reply	[flat|nested] 57+ messages in thread

* Re: [PR REVIEW] wlroots: update to 0.16, labwc: update to 0.6.0
  2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
                   ` (54 preceding siblings ...)
  2022-12-29 14:48 ` mhmdanas
@ 2022-12-30  3:18 ` mhmdanas
  55 siblings, 0 replies; 57+ messages in thread
From: mhmdanas @ 2022-12-30  3:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/40587#discussion_r1059226171

Comment:
#41358

^ permalink raw reply	[flat|nested] 57+ messages in thread

end of thread, other threads:[~2022-12-30  3:18 UTC | newest]

Thread overview: 57+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-18  1:15 [PR PATCH] labwc: update to 0.6.0 tranzystorek-io
2022-11-18  1:16 ` tranzystorek-io
2022-11-18  1:30 ` [PR REVIEW] " paper42
2022-11-18  1:40 ` tranzystorek-io
2022-11-18  1:47 ` [PR PATCH] [Updated] " tranzystorek-io
2022-11-18  2:00 ` tranzystorek-io
2022-11-18  2:56 ` cinerea0
2022-11-18  6:19 ` tranzystorek-io
2022-11-18 10:27 ` [PR PATCH] [Updated] " tranzystorek-io
2022-11-18 10:44 ` paper42
2022-11-18 10:54 ` [PR PATCH] [Updated] wlroots: update to 0.16, " tranzystorek-io
2022-11-18 11:08 ` tranzystorek-io
2022-11-18 12:05 ` ifreund
2022-11-18 12:07 ` tranzystorek-io
2022-11-18 12:13 ` paper42
2022-11-26 18:55 ` [PR PATCH] [Updated] " tranzystorek-io
2022-11-27  0:45 ` [PR REVIEW] " paper42
2022-11-27  8:53 ` [PR PATCH] [Updated] " tranzystorek-io
2022-11-27  8:57 ` [PR REVIEW] " tranzystorek-io
2022-11-27 16:35 ` paper42
2022-11-27 16:35 ` paper42
2022-11-27 19:38 ` tranzystorek-io
2022-11-28 17:13 ` [PR PATCH] [Updated] " tranzystorek-io
2022-11-28 17:14 ` tranzystorek-io
2022-11-28 17:14 ` [PR REVIEW] " tranzystorek-io
2022-11-28 17:42 ` paper42
2022-11-28 17:42 ` paper42
2022-11-28 17:42 ` paper42
2022-11-28 17:42 ` paper42
2022-11-28 17:56 ` [PR PATCH] [Updated] " tranzystorek-io
2022-11-28 17:57 ` [PR REVIEW] " tranzystorek-io
2022-11-28 17:57 ` tranzystorek-io
2022-11-28 17:58 ` tranzystorek-io
2022-11-28 18:08 ` [PR PATCH] [Updated] " tranzystorek-io
2022-11-29 18:16 ` skmpz
2022-12-03 12:49 ` [PR REVIEW] " ardadem
2022-12-06  7:16 ` [PR PATCH] [Updated] " tranzystorek-io
2022-12-06  7:31 ` tranzystorek-io
2022-12-06  8:50 ` [PR REVIEW] " paper42
2022-12-06 10:18 ` [PR PATCH] [Updated] " tranzystorek-io
2022-12-06 10:29 ` tranzystorek-io
2022-12-06 10:45 ` tranzystorek-io
2022-12-06 11:01 ` [PR REVIEW] " tranzystorek-io
2022-12-27 10:22 ` [PR PATCH] [Updated] " tranzystorek-io
2022-12-27 10:40 ` tranzystorek-io
2022-12-27 10:41 ` [PR REVIEW] " tranzystorek-io
2022-12-27 17:32 ` paper42
2022-12-27 17:33 ` paper42
2022-12-27 19:07 ` [PR PATCH] [Updated] " tranzystorek-io
2022-12-27 19:08 ` [PR REVIEW] " tranzystorek-io
2022-12-27 19:08 ` tranzystorek-io
2022-12-27 22:21 ` [PR PATCH] [Merged]: " paper42
2022-12-29  0:54 ` [PR REVIEW] " mhmdanas
2022-12-29  8:39 ` tranzystorek-io
2022-12-29  8:40 ` tranzystorek-io
2022-12-29 14:48 ` mhmdanas
2022-12-30  3:18 ` mhmdanas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).