labwc: update to 0.5.0

and change the urls to the one from the organisation.

3 files changed, 10 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fbf8d0be62b4..944aceffe668 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = labwc
 	pkgdesc = stacking wayland compositor with look and feel from openbox
-	pkgver = 0.4.0
-	pkgrel = 2
-	url = https://github.com/johanmalm/labwc
+	pkgver = 0.5.0
+	pkgrel = 1
+	url = https://github.com/labwc/labwc
 	arch = x86_64
 	license = GPL2
 	makedepends = meson
@@ -14,9 +14,7 @@ pkgbase = labwc
 	depends = wayland-protocols
 	depends = xorg-xwayland
 	optdepends = bemenu: default launcher via Alt+F3
-	source = labwc-0.4.0.tar.gz::https://github.com/johanmalm/labwc/archive/0.4.0.tar.gz
-	source = 0001_wlroots-version.patch
-	b2sums = 737636488fdbd273d5ac2f90d63b3924edd257443ca1d857799ec81f1bcf540819e9d9b0cc06e1eb18a8db1f7c524c54606998aedeec3789529df73779062844
-	b2sums = 3b5ea923ce5eab50caaf9a71de0ca4eb073fc5293fbf62f979a25d158b721d0ca9bae5516a65c6dddf1f89e3771f72228a0287776a256796211294214ae1d796
+	source = labwc-0.5.0.tar.gz::https://github.com/labwc/labwc/archive/0.5.0.tar.gz
+	b2sums = bb7008b60e180fa9f936cb2a09e4ce616e70c2238dceb32e29f4cd8396a2ca2f0f58b43240afd9f4ed95cc371155ee154c20a261f6fbeb3321846870631d7d47
 
 pkgname = labwc
diff --git a/0001_wlroots-version.patch b/0001_wlroots-version.patch
deleted file mode 100644
index 2bb01027e707..000000000000
--- a/0001_wlroots-version.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 6a3536cdd74ec1d73475daec166b14c03ce14a8a
-Author: Michael Weiss <dev.primeos@gmail.com>
-Date:   Fri Feb 4 21:17:05 2022 +0100
-
-    build: Relax the version constraint for wlroots to accept patch releases
-    
-    Patch releases only contain backwards compatible changes (mainly bug
-    fixes) so we want to allow them. This fixes the build with the recently
-    released wlroots 0.15.1 and uses the same version constraints as other
-    projects that depend on wlroots (e.g., Sway).
-
-diff --git a/meson.build b/meson.build
-index f950b8e..1905dda 100644
---- a/meson.build
-+++ b/meson.build
-@@ -37,7 +37,7 @@ if git.found()
- endif
- add_project_arguments('-DLABWC_VERSION=@0@'.format(version), language: 'c')
- 
--wlroots_version = ['=0.15.0']
-+wlroots_version = ['>=0.15.0', '<0.16.0']
- wlroots_proj = subproject(
-   'wlroots',
-   default_options: ['default_library=static', 'examples=false'],
diff --git a/PKGBUILD b/PKGBUILD
index 72b3da3aa3c6..c05b3e069356 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,19 @@
 # Maintainer: Lex Black <autumn-wind@web.de>
 
 pkgname=labwc
-pkgver=0.4.0
-pkgrel=2
+pkgver=0.5.0
+pkgrel=1
 pkgdesc='stacking wayland compositor with look and feel from openbox'
-url="https://github.com/johanmalm/labwc"
+url="https://github.com/labwc/labwc"
 arch=('x86_64')
 license=('GPL2')
 depends=('pango' 'wlroots>=0.15' 'wlroots<0.16' 'wayland' 'wayland-protocols' 'xorg-xwayland')
 makedepends=('meson' 'scdoc')
 optdepends=("bemenu: default launcher via Alt+F3")
-source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/johanmalm/labwc/archive/${pkgver}.tar.gz"
-        0001_wlroots-version.patch)
-b2sums=('737636488fdbd273d5ac2f90d63b3924edd257443ca1d857799ec81f1bcf540819e9d9b0cc06e1eb18a8db1f7c524c54606998aedeec3789529df73779062844'
-        '3b5ea923ce5eab50caaf9a71de0ca4eb073fc5293fbf62f979a25d158b721d0ca9bae5516a65c6dddf1f89e3771f72228a0287776a256796211294214ae1d796')
+source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/labwc/labwc/archive/${pkgver}.tar.gz")
+b2sums=('bb7008b60e180fa9f936cb2a09e4ce616e70c2238dceb32e29f4cd8396a2ca2f0f58b43240afd9f4ed95cc371155ee154c20a261f6fbeb3321846870631d7d47')
 
 
-prepare() {
-  cd "$pkgname-$pkgver"
-  patch -Np1 -i "${srcdir}"/0001_wlroots-version.patch
-}
-
 build() {
   cd "$pkgname-$pkgver"
   arch-meson -Dman-pages=enabled ../build