[PR PATCH] wlroots{0.15,0.16}: remove package

[PR PATCH] wlroots{0.15,0.16}: remove package

[tranzystorekk]

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

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

https://github.com/tranzystorekk/void-packages remove-old-wlr
https://github.com/void-linux/void-packages/pull/52809

wlroots{0.15,0.16}: remove package
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: N/A

cc @yoshiyoshyosh `hikari` is the last package holding back wlroots0.15 removal, do you have any objections as maintainer?

<!--
#### 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/52809.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-old-wlr-52809.patch --]
[-- Type: text/x-diff, Size: 11274 bytes --]

From 72994eb2a30c3ff9b83c407f1235bac0a5cb4d83 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Mon, 28 Oct 2024 11:13:41 +0100
Subject: [PATCH 1/4] wlroots0.16: remove package

---
 common/shlibs                     |  1 -
 srcpkgs/removed-packages/template |  2 ++
 srcpkgs/wlroots0.16-devel         |  1 -
 srcpkgs/wlroots0.16/template      | 39 -------------------------------
 4 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 120000 srcpkgs/wlroots0.16-devel
 delete mode 100644 srcpkgs/wlroots0.16/template

diff --git a/common/shlibs b/common/shlibs
index 6d083594e55a51..ebcfcc9657871a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3622,7 +3622,6 @@ 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.10 wlroots0.15-0.15.1_1
-libwlroots.so.11 wlroots0.16-0.16.0_1
 libwlroots.so.12 wlroots0.17-0.17.0_1
 libwlroots-0.18.so wlroots0.18-0.18.0_1
 libbaseencode.so.1 libbaseencode-1.0.9_1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 274ae6da00387d..6aae4e4b2e280b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -813,6 +813,8 @@ replaces="
  wireshark-gtk<=3.0.7_1
  wlroots0.14-devel<=0.14.1_1
  wlroots0.14<=0.14.1_1
+ wlroots0.16-devel<=0.16.2_3
+ wlroots0.16<=0.16.2_3
  wmii<=3.9.2_8
  xcdroast<=1.19_1
  xdebug8.0<=3.2.1_1
diff --git a/srcpkgs/wlroots0.16-devel b/srcpkgs/wlroots0.16-devel
deleted file mode 120000
index 8fe7760ebc0f02..00000000000000
--- a/srcpkgs/wlroots0.16-devel
+++ /dev/null
@@ -1 +0,0 @@
-wlroots0.16
\ No newline at end of file
diff --git a/srcpkgs/wlroots0.16/template b/srcpkgs/wlroots0.16/template
deleted file mode 100644
index 4a244665d7b670..00000000000000
--- a/srcpkgs/wlroots0.16/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'wlroots0.16'
-pkgname=wlroots0.16
-version=0.16.2
-revision=3
-build_style=meson
-# Follow upstream packaging recommendations:
-# https://gitlab.freedesktop.org/wlroots/wlroots/-/wikis/Packaging-recommendations
-configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false
- -Db_ndebug=false"
-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-devel 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 ${pkgname#wlroots}"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
-distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
-checksum=83e9a11605f23d4bf781ab1947089483d9ec3f7e9ba65398e0609593b77d44aa
-
-post_install() {
-	vlicense LICENSE
-}
-
-wlroots0.16-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
-	provides="virtual-wlroots-devel-${version}_${revision}"
-	conflicts="wlroots0.15-devel wlroots0.14-devel virtual-wlroots-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}

From c244f0309db109853a96cf23e1d3a5f606bd095f Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Mon, 28 Oct 2024 11:46:34 +0100
Subject: [PATCH 2/4] hikari: remove package

---
 .../patches/restack_xwayland_windows.patch    | 10 -----
 srcpkgs/hikari/template                       | 40 -------------------
 srcpkgs/removed-packages/template             |  1 +
 3 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 srcpkgs/hikari/patches/restack_xwayland_windows.patch
 delete mode 100644 srcpkgs/hikari/template

diff --git a/srcpkgs/hikari/patches/restack_xwayland_windows.patch b/srcpkgs/hikari/patches/restack_xwayland_windows.patch
deleted file mode 100644
index 91fc5f47faef9a..00000000000000
--- a/srcpkgs/hikari/patches/restack_xwayland_windows.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/xwayland_view.c	2023-10-02 23:25:53.794255011 -0400
-+++ b/src/xwayland_view.c	2023-10-02 23:26:17.173265450 -0400
-@@ -304,6 +304,7 @@
-   struct wlr_xwayland_surface *xwayland_surface = xwayland_view->surface;
- 
-   wlr_xwayland_surface_activate(xwayland_surface, active);
-+  wlr_xwayland_surface_restack(xwayland_surface, NULL, XCB_STACK_MODE_ABOVE);
-   wlr_xwayland_set_seat(hikari_server.xwayland, hikari_server.seat);
- }
- 
diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
deleted file mode 100644
index 5ccc9a293fdddc..00000000000000
--- a/srcpkgs/hikari/template
+++ /dev/null
@@ -1,40 +0,0 @@
-# Template file for 'hikari'
-pkgname=hikari
-version=2.3.3
-revision=3
-build_style=gnu-makefile
-make_cmd=bmake
-make_use_env=yes
-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="wlroots0.15-devel pango-devel cairo-devel pam-devel glib-devel libucl-devel"
-short_desc="Stacking Wayland compositor with tiling features"
-maintainer="yosh <yosh-git@riseup.net>"
-license="BSD-2-Clause"
-homepage="https://hikari.acmelabs.space"
-changelog="https://hub.darcs.net/raichoo/hikari/browse/CHANGELOG.md"
-distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz"
-checksum=40736ff326e11a51128c1739051a692ad2c79173fc4b695c8be5ec7a614b4de2
-conf_files="/etc/pam.d/hikari-unlocker /etc/hikari/hikari.conf"
-# bmake's -q flag seems to differ in behavior from gnu make which causes the
-# build style's handling of the check target not existing to fail.
-make_check=no
-
-pre_build() {
-	# The hikari Makefile appends to the CFLAGS and LDFLAGS variables;
-	# bmake ignores these appends altogether when passing variables on the
-	# command line (i.e., when make_use_env is undefined), but it ignores
-	# the values in the environment when make_use_env=yes. The _EXTRA
-	# variables provided in the Makefile allow us to force the right flags.
-	export CFLAGS_EXTRA="${CFLAGS} -Wno-error"
-	export LDFLAGS_EXTRA="${LDFLAGS}"
-
-	# bmake tends to ignore CC in the environment
-	make_build_args+=" CC=$CC"
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6aae4e4b2e280b..d49aa7d571a8a6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -208,6 +208,7 @@ replaces="
  gx<=0.14.3_1
  hangups<=0.4.18_2
  hardinfo<=0.5.1_14
+ hikari<=2.3.3_3
  httperf<=0.9.0_9
  icecat-i18n-ach<=78.6.1_1
  icecat-i18n-af<=78.6.1_1

From 197bf498f175c695be95a5ff9570bba26e9a06e8 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Mon, 28 Oct 2024 11:53:07 +0100
Subject: [PATCH 3/4] wlroots0.15: remove package

---
 common/shlibs                     |  1 -
 srcpkgs/removed-packages/template |  2 ++
 srcpkgs/wlroots0.15-devel         |  1 -
 srcpkgs/wlroots0.15/template      | 39 -------------------------------
 4 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 120000 srcpkgs/wlroots0.15-devel
 delete mode 100644 srcpkgs/wlroots0.15/template

diff --git a/common/shlibs b/common/shlibs
index ebcfcc9657871a..c6ffdae5f9d013 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3621,7 +3621,6 @@ libswitchboard-2.0.so.0 switchboard-2.3.2_1
 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.10 wlroots0.15-0.15.1_1
 libwlroots.so.12 wlroots0.17-0.17.0_1
 libwlroots-0.18.so wlroots0.18-0.18.0_1
 libbaseencode.so.1 libbaseencode-1.0.9_1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index d49aa7d571a8a6..b8deb4825add36 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -814,6 +814,8 @@ replaces="
  wireshark-gtk<=3.0.7_1
  wlroots0.14-devel<=0.14.1_1
  wlroots0.14<=0.14.1_1
+ wlroots0.15-devel<=0.15.1_3
+ wlroots0.15<=0.15.1_3
  wlroots0.16-devel<=0.16.2_3
  wlroots0.16<=0.16.2_3
  wmii<=3.9.2_8
diff --git a/srcpkgs/wlroots0.15-devel b/srcpkgs/wlroots0.15-devel
deleted file mode 120000
index 2e1ce6ccc6241b..00000000000000
--- a/srcpkgs/wlroots0.15-devel
+++ /dev/null
@@ -1 +0,0 @@
-wlroots0.15
\ No newline at end of file
diff --git a/srcpkgs/wlroots0.15/template b/srcpkgs/wlroots0.15/template
deleted file mode 100644
index 18423a3e250cc6..00000000000000
--- a/srcpkgs/wlroots0.15/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'wlroots0.15'
-pkgname=wlroots0.15
-version=0.15.1
-revision=3
-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-devel 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="Orphaned <orphan@voidlinux.org>"
-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}"
-	provides="virtual-wlroots-devel-${version}_${revision}"
-	conflicts="wlroots0.14-devel virtual-wlroots-devel"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}

From e98b744317fbfd79c50af53eab9f25a955277bcd Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Mon, 28 Oct 2024 11:57:27 +0100
Subject: [PATCH 4/4] removed-packages: bump

---
 srcpkgs/removed-packages/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index b8deb4825add36..3b3da1d0ee6785 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20240929
+version=0.1.20241028
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"

Re: wlroots{0.15,0.16}: remove package

[yoshiyoshyosh]

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

New comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/52809#issuecomment-2441957941

Comment:
> cc @yoshiyoshyosh `hikari` is the last package holding back wlroots0.15 removal, do you have any objections as maintainer?

@tranzystorekk I don't have any objections. Several months ago [I was trying to upgrade hikari to wlroots 0.16](https://git.unix.dog/yosh/hikari/src/branch/wlroots-0.16), which seemed to be the biggest roadblock to upgrading it further, but given how xdg-shell stuff caused rendering issues after following all of the changelog changes, and that I am not really interested in knowing half of the wayland protocol just to upgrade the program, /and/ the fact that I am not even using wayland on the machine I had hikari on anymore... yeah. maybe in the future I'll take another stab at it, but for now it's best to remove it

Re: wlroots{0.15,0.16}: remove package

[yoshiyoshyosh]

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

New comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/52809#issuecomment-2441957941

Comment:
> cc @yoshiyoshyosh `hikari` is the last package holding back wlroots0.15 removal, do you have any objections as maintainer?

@tranzystorekk I don't have any objections. Several months ago [I was trying to upgrade hikari to wlroots 0.16](https://git.unix.dog/yosh/hikari/src/branch/wlroots-0.16), which seemed to be the biggest roadblock to upgrading it further, but given how xdg-shell stuff caused rendering issues after following all of the changelog changes, and that I am not really interested in knowing half of the wayland protocol just to upgrade the program, /and/ the fact that I am not even using wayland on the machine I had hikari on anymore... yeah. maybe in the future I'll take another stab at it, but for now it's best to remove it

there seems to be [another fork that tried to do the same thing](https://github.com/antaz/hikari/pull/1) if anyone else is interested as well

Re: [PR PATCH] [Merged]: wlroots{0.15,0.16}: remove package

[tranzystorekk]

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

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

wlroots{0.15,0.16}: remove package
https://github.com/void-linux/void-packages/pull/52809

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

#### Testing the changes
- I tested the changes in this PR: N/A

cc @yoshiyoshyosh `hikari` is the last package holding back wlroots0.15 removal, do you have any objections as maintainer?

<!--
#### 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
-->