diff --git a/common/shlibs b/common/shlibs index 6d083594e55a51..c6ffdae5f9d013 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3621,8 +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.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/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 " -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 274ae6da00387d..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" @@ -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 @@ -813,6 +814,10 @@ 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 xcdroast<=1.19_1 xdebug8.0<=3.2.1_1 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 " -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" - } -} 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 " -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" - } -}