fixed packages to work w new wlroots 0.17 (#11)

* fixed packages to work w new wlroots 0.17 * fix * fix * fix * Updated scenefx-git and swayfx-git to use wlroots0.17 --------- Co-authored-by: Erik Reider <[email protected]>
wlrfx · Jul 22, 2024 · a0d7fdb · a0d7fdb
1 parent 2a6ea25
commit a0d7fdb
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git 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
@@ -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/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 = libglvnd
  depends = libpixman-1.so
+ depends = wayland
+ depends = wlroots0.17
  provides = libscenefx.so
  conflicts = scenefx
  conflicts = scenefx-git

diff --git 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"
+ "libglvnd"
  "libpixman-1.so"
+ "wayland"
+ "wlroots0.17"
 )
 makedepends=(
  "git"
@@ -30,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-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
@@ -16,7 +16,7 @@ depends=(
  "libpixman-1.so"
  "libudev.so"
  "libwayland-server.so"
- "libwlroots.so"
+ "wlroots0.17"
  "libxcb"
  "libxkbcommon.so"
  "pango"

diff --git 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
@@ -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"
@@ -57,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 \