From 7a2d09eb2f7216e3476ce8da60daaeda0488a63a Mon Sep 17 00:00:00 2001 From: William McKinnon Date: Wed, 17 Jul 2024 22:34:02 -0400 Subject: [PATCH 1/5] fixed packages to work w new wlroots 0.17 --- aur/scenefx/.SRCINFO | 2 +- aur/scenefx/PKGBUILD | 2 +- aur/swayfx/.SRCINFO | 2 +- aur/swayfx/PKGBUILD | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aur/scenefx/.SRCINFO b/aur/scenefx/.SRCINFO index ddb11f1..25e4e84 100644 --- a/aur/scenefx/.SRCINFO +++ b/aur/scenefx/.SRCINFO @@ -10,11 +10,11 @@ pkgbase = scenefx makedepends = meson makedepends = ninja makedepends = wayland-protocols - depends = libwlroots.so depends = libglvnd depends = wayland depends = libdrm depends = libpixman-1.so + depends = wlroots0.17 provides = libscenefx.so conflicts = scenefx conflicts = scenefx-git diff --git a/aur/scenefx/PKGBUILD b/aur/scenefx/PKGBUILD index 303cf6c..ee78228 100644 --- a/aur/scenefx/PKGBUILD +++ b/aur/scenefx/PKGBUILD @@ -9,11 +9,11 @@ pkgdesc="A drop-in replacement for the wlroots scene API that allows wayland com url="https://github.com/wlrfx/scenefx" arch=("x86_64") depends=( - "libwlroots.so" "libglvnd" "wayland" "libdrm" "libpixman-1.so" + "wlroots0.17" ) makedepends=( "git" diff --git a/aur/swayfx/.SRCINFO b/aur/swayfx/.SRCINFO index 0eee725..c2658b5 100644 --- a/aur/swayfx/.SRCINFO +++ b/aur/swayfx/.SRCINFO @@ -18,13 +18,13 @@ pkgbase = swayfx depends = libjson-c.so depends = libudev.so depends = libwayland-server.so - depends = libwlroots.so=12 depends = libxcb depends = libxkbcommon.so depends = pango depends = pcre2 depends = ttf-font depends = libscenefx.so + depends = wlroots0.17 optdepends = alacritty: Terminal emulator used by the default config optdepends = dmenu: Application launcher optdepends = grim: Screenshot utility diff --git a/aur/swayfx/PKGBUILD b/aur/swayfx/PKGBUILD index 65286ee..3f14299 100644 --- a/aur/swayfx/PKGBUILD +++ b/aur/swayfx/PKGBUILD @@ -19,13 +19,13 @@ depends=( "libjson-c.so" "libudev.so" "libwayland-server.so" - "libwlroots.so=12" "libxcb" "libxkbcommon.so" "pango" "pcre2" "ttf-font" "libscenefx.so" + "wlroots0.17" ) optdepends=( "alacritty: Terminal emulator used by the default config" From 79197c2f4dc58f703d27492297ec0d2734e5b996 Mon Sep 17 00:00:00 2001 From: William McKinnon Date: Wed, 17 Jul 2024 22:43:49 -0400 Subject: [PATCH 2/5] fix --- aur/scenefx/.SRCINFO | 5 +++-- aur/scenefx/PKGBUILD | 1 + aur/swayfx/.SRCINFO | 1 + aur/swayfx/PKGBUILD | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/aur/scenefx/.SRCINFO b/aur/scenefx/.SRCINFO index 25e4e84..6709898 100644 --- a/aur/scenefx/.SRCINFO +++ b/aur/scenefx/.SRCINFO @@ -10,10 +10,11 @@ pkgbase = scenefx makedepends = meson makedepends = ninja makedepends = wayland-protocols - depends = libglvnd - depends = wayland depends = libdrm + depends = libglvnd depends = libpixman-1.so + depends = libwlroots.so=12 + depends = wayland depends = wlroots0.17 provides = libscenefx.so conflicts = scenefx diff --git a/aur/scenefx/PKGBUILD b/aur/scenefx/PKGBUILD index ee78228..c54d852 100644 --- a/aur/scenefx/PKGBUILD +++ b/aur/scenefx/PKGBUILD @@ -13,6 +13,7 @@ depends=( "wayland" "libdrm" "libpixman-1.so" + "libwlroots.so=12" "wlroots0.17" ) makedepends=( diff --git a/aur/swayfx/.SRCINFO b/aur/swayfx/.SRCINFO index c2658b5..9049528 100644 --- a/aur/swayfx/.SRCINFO +++ b/aur/swayfx/.SRCINFO @@ -18,6 +18,7 @@ pkgbase = swayfx depends = libjson-c.so depends = libudev.so depends = libwayland-server.so + depends = libwlroots.so=12 depends = libxcb depends = libxkbcommon.so depends = pango diff --git a/aur/swayfx/PKGBUILD b/aur/swayfx/PKGBUILD index 3f14299..c59b3c4 100644 --- a/aur/swayfx/PKGBUILD +++ b/aur/swayfx/PKGBUILD @@ -19,6 +19,7 @@ depends=( "libjson-c.so" "libudev.so" "libwayland-server.so" + "libwlroots.so=12" "libxcb" "libxkbcommon.so" "pango" From 4aabacd82a14a15f45518c74c935a434a588ba8a Mon Sep 17 00:00:00 2001 From: William McKinnon Date: Wed, 17 Jul 2024 22:49:14 -0400 Subject: [PATCH 3/5] fix --- aur/scenefx/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aur/scenefx/PKGBUILD b/aur/scenefx/PKGBUILD index c54d852..52fec49 100644 --- a/aur/scenefx/PKGBUILD +++ b/aur/scenefx/PKGBUILD @@ -9,11 +9,11 @@ pkgdesc="A drop-in replacement for the wlroots scene API that allows wayland com url="https://github.com/wlrfx/scenefx" arch=("x86_64") depends=( - "libglvnd" - "wayland" "libdrm" + "libglvnd" "libpixman-1.so" "libwlroots.so=12" + "wayland" "wlroots0.17" ) makedepends=( From de39ace8438c938dbca7a47a9351b7773571cf7a Mon Sep 17 00:00:00 2001 From: William McKinnon Date: Sun, 21 Jul 2024 15:36:39 -0400 Subject: [PATCH 4/5] fix --- aur/scenefx/.SRCINFO | 1 - aur/scenefx/PKGBUILD | 2 +- aur/swayfx/.SRCINFO | 1 - aur/swayfx/PKGBUILD | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/aur/scenefx/.SRCINFO b/aur/scenefx/.SRCINFO index 6709898..3f997e6 100644 --- a/aur/scenefx/.SRCINFO +++ b/aur/scenefx/.SRCINFO @@ -13,7 +13,6 @@ pkgbase = scenefx depends = libdrm depends = libglvnd depends = libpixman-1.so - depends = libwlroots.so=12 depends = wayland depends = wlroots0.17 provides = libscenefx.so diff --git a/aur/scenefx/PKGBUILD b/aur/scenefx/PKGBUILD index 52fec49..ad771d9 100644 --- a/aur/scenefx/PKGBUILD +++ b/aur/scenefx/PKGBUILD @@ -12,7 +12,6 @@ depends=( "libdrm" "libglvnd" "libpixman-1.so" - "libwlroots.so=12" "wayland" "wlroots0.17" ) @@ -31,6 +30,7 @@ source=("${_pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/$pkgver.tar.gz") sha512sums=("SKIP") build() { + export PKG_CONFIG_PATH='/usr/lib/wlroots0.17/pkgconfig' arch-meson -Dwerror=false "${_pkgname}-${pkgver}" build meson compile -C build } diff --git a/aur/swayfx/.SRCINFO b/aur/swayfx/.SRCINFO index 9049528..c2658b5 100644 --- a/aur/swayfx/.SRCINFO +++ b/aur/swayfx/.SRCINFO @@ -18,7 +18,6 @@ pkgbase = swayfx depends = libjson-c.so depends = libudev.so depends = libwayland-server.so - depends = libwlroots.so=12 depends = libxcb depends = libxkbcommon.so depends = pango diff --git a/aur/swayfx/PKGBUILD b/aur/swayfx/PKGBUILD index c59b3c4..b753e52 100644 --- a/aur/swayfx/PKGBUILD +++ b/aur/swayfx/PKGBUILD @@ -19,7 +19,6 @@ depends=( "libjson-c.so" "libudev.so" "libwayland-server.so" - "libwlroots.so=12" "libxcb" "libxkbcommon.so" "pango" @@ -58,6 +57,7 @@ options=(debug) install=sway.install build() { + export PKG_CONFIG_PATH='/usr/lib/wlroots0.17/pkgconfig' arch-meson \ -Dwerror=false \ -Dsd-bus-provider=libsystemd \ From 721d2d8a6da3827fd8709ee1a302465b657e4d24 Mon Sep 17 00:00:00 2001 From: Erik Reider <35975961+ErikReider@users.noreply.github.com> Date: Tue, 23 Jul 2024 00:47:39 +0200 Subject: [PATCH 5/5] Updated scenefx-git and swayfx-git to use wlroots0.17 --- aur/scenefx-git/.SRCINFO | 2 +- aur/scenefx-git/PKGBUILD | 3 ++- aur/swayfx-git/.SRCINFO | 2 +- aur/swayfx-git/PKGBUILD | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/aur/scenefx-git/.SRCINFO b/aur/scenefx-git/.SRCINFO index bb0831c..cc43be0 100644 --- a/aur/scenefx-git/.SRCINFO +++ b/aur/scenefx-git/.SRCINFO @@ -10,11 +10,11 @@ pkgbase = scenefx-git makedepends = meson makedepends = ninja makedepends = wayland-protocols - depends = libwlroots.so depends = libglvnd depends = wayland depends = libdrm depends = libpixman-1.so + depends = wlroots0.17 provides = libscenefx.so conflicts = scenefx conflicts = scenefx-git diff --git a/aur/scenefx-git/PKGBUILD b/aur/scenefx-git/PKGBUILD index fde5708..b175e09 100644 --- a/aur/scenefx-git/PKGBUILD +++ b/aur/scenefx-git/PKGBUILD @@ -9,11 +9,11 @@ pkgdesc="A drop-in replacement for the wlroots scene API that allows wayland com url="https://github.com/wlrfx/scenefx" arch=("x86_64") depends=( - "libwlroots.so" "libglvnd" "wayland" "libdrm" "libpixman-1.so" + "wlroots0.17" ) makedepends=( "git" @@ -35,6 +35,7 @@ pkgver() { } build() { + export PKG_CONFIG_PATH='/usr/lib/wlroots0.17/pkgconfig' arch-meson -Dwerror=false "$_pkgname" build meson compile -C build } diff --git a/aur/swayfx-git/.SRCINFO b/aur/swayfx-git/.SRCINFO index e32ca37..f4a7dad 100644 --- a/aur/swayfx-git/.SRCINFO +++ b/aur/swayfx-git/.SRCINFO @@ -22,7 +22,7 @@ pkgbase = swayfx-git depends = libpixman-1.so depends = libudev.so depends = libwayland-server.so - depends = libwlroots.so + depends = wlroots0.17 depends = libxcb depends = libxkbcommon.so depends = pango diff --git a/aur/swayfx-git/PKGBUILD b/aur/swayfx-git/PKGBUILD index 9e931ce..affef82 100644 --- a/aur/swayfx-git/PKGBUILD +++ b/aur/swayfx-git/PKGBUILD @@ -16,7 +16,7 @@ depends=( "libpixman-1.so" "libudev.so" "libwayland-server.so" - "libwlroots.so" + "wlroots0.17" "libxcb" "libxkbcommon.so" "pango"