diff --git a/xorg-xwayland/PKGBUILD b/xorg-xwayland/PKGBUILD index 4cec553..2b46bb7 100644 --- a/xorg-xwayland/PKGBUILD +++ b/xorg-xwayland/PKGBUILD @@ -6,19 +6,19 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=xorg-xwayland -pkgver=22.1.8 +pkgver=23.1.0 pkgrel=01 groups=('xorg') url="https://xorg.freedesktop.org" pkgdesc="run X clients under wayland" +provides=('xorg-server-xwayland') depends=('nettle' 'libepoxy' 'libxfont2' 'pixman' 'xorg-server-common' 'libxcvt' 'mesa') makedepends=('meson' 'xorgproto' 'xtrans' 'libxkbfile' 'dbus' 'xorg-font-util' 'wayland' 'wayland-protocols' 'libdrm' 'mesa-libgl' - 'egl-wayland' -) + 'egl-wayland') source=(https://xorg.freedesktop.org/archive/individual/xserver/xwayland-$pkgver.tar.xz{,.sig}) provides=('xorg-server-xwayland') conflicts=('xorg-server-xwayland') @@ -43,10 +43,11 @@ build() { package() { - # bin + manpage + .pc file - install -m755 -Dt "${pkgdir}"/usr/bin build/hw/xwayland/Xwayland - install -m644 -Dt "${pkgdir}"/usr/share/man/man1 build/hw/xwayland/Xwayland.1 - install -m644 -Dt "${pkgdir}"/usr/lib/pkgconfig build/hw/xwayland/xwayland.pc + DESTDIR="${pkgdir}" ninja -C build install + # xorg-server-common file /usr/lib/xorg/protocol.txt + rm "${pkgdir}"/usr/lib/xorg/protocol.txt + rmdir "${pkgdir}"/usr/lib/xorg + rm "${pkgdir}"/usr/share/man/man1/Xserver.1 # license install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xwayland-$pkgver/COPYING @@ -62,12 +63,8 @@ license=('custom') #validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) validpgpkeys=('67DC86F2623FC5FD4BB5225D14706DBE1E4B4540') # "Olivier Fourdan " -sha256sums=(d11eeee73290b88ea8da42a7d9350dedfaba856ce4ae44e58c045ad9ecaa2f73 # xwayland-22.1.8.tar.xz - 1fb4227282c465ac4ec68886de20203eac67ca15ebd24cb9ccd31e70cef1e78e) # xwayland-22.1.8.tar.xz.sig - -sha512sums=('f52c6f99d8ef7605bc1c651d5ee5e306c12af30649a2d712b1c4c3cf4c7c80246ae24bd9ac39461d47aafc78f5d659446a459cd6259e05ef3128b204981d114a' - 'SKIP') - -## f2213aeffcf79a0a9c382b315343331a1eb3d3b4dea26961c0838f3c238bf719 xorg-xwayland-22.1.8-01-x86_64.pkg.tar.lz +sha256sums=(40e0a0c050446ac558ec0f54be4930ffef6be63c6ea980fb654f264ef065af9e # xwayland-23.1.0.tar.xz + b4b01bfe1e078c6b8669ae84c19a938df9b0ae88855083fd22a1bef7542e26f4) # xwayland-23.1.0.tar.xz.sig +## d4820a5500c33c813288698fa367bb3dc99148389974285a0508a5d9f7df4b5c xorg-xwayland-23.1.0-01-x86_64.pkg.tar.lz diff --git a/xorg-xwayland/PKGBUILD-arch b/xorg-xwayland/PKGBUILD-arch index 1179783..e00d51c 100644 --- a/xorg-xwayland/PKGBUILD-arch +++ b/xorg-xwayland/PKGBUILD-arch @@ -1,7 +1,7 @@ # Maintainer: AndyRTR pkgname=xorg-xwayland -pkgver=22.1.8 +pkgver=23.1.0 pkgrel=1 arch=('x86_64') license=('custom') @@ -18,7 +18,7 @@ makedepends=('meson' 'xorgproto' 'xtrans' 'libxkbfile' 'dbus' 'egl-wayland' ) source=(https://xorg.freedesktop.org/archive/individual/xserver/xwayland-$pkgver.tar.xz{,.sig}) -sha512sums=('f52c6f99d8ef7605bc1c651d5ee5e306c12af30649a2d712b1c4c3cf4c7c80246ae24bd9ac39461d47aafc78f5d659446a459cd6259e05ef3128b204981d114a' +sha512sums=('984213a193b903e6023ecb3144a15f483dc3e9ec7cb02c36d8e67c6859b501b8b3e5a6e1ade9cb245450ad93002322f392b81d9286377ac34350cc3ea1f9679f' 'SKIP') provides=('xorg-server-xwayland') conflicts=('xorg-server-xwayland') @@ -47,10 +47,11 @@ build() { package() { - # bin + manpage + .pc file - install -m755 -Dt "${pkgdir}"/usr/bin build/hw/xwayland/Xwayland - install -m644 -Dt "${pkgdir}"/usr/share/man/man1 build/hw/xwayland/Xwayland.1 - install -m644 -Dt "${pkgdir}"/usr/lib/pkgconfig build/hw/xwayland/xwayland.pc + DESTDIR="${pkgdir}" ninja -C build install + # xorg-server-common file /usr/lib/xorg/protocol.txt + rm "${pkgdir}"/usr/lib/xorg/protocol.txt + rmdir "${pkgdir}"/usr/lib/xorg + rm "${pkgdir}"/usr/share/man/man1/Xserver.1 # license install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xwayland-$pkgver/COPYING