diff --git a/meson/PKGBUILD b/meson/PKGBUILD index 5f3dc4f..123b7c6 100644 --- a/meson/PKGBUILD +++ b/meson/PKGBUILD @@ -6,8 +6,8 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=meson -pkgver=1.3.0 -pkgrel=02 +pkgver=1.3.1 +pkgrel=01 pkgdesc='High productivity build system' url='https://mesonbuild.com/' depends=(ninja python python-typing_extensions) @@ -96,10 +96,10 @@ license=('Apache') validpgpkeys=('19E2D6D9B46D8DAA6288F877C24E631BABB1FE70') # Jussi Pakkanen -sha256sums=(4ba253ef60e454e23234696119cbafa082a0aead0bd3bbf6991295054795f5dc # meson-1.3.0.tar.gz - f1ba5f907ed7a9efdd80c4dff162287c294d7c782babf8d86a7d7a8967540227 # meson-1.3.0.tar.gz.asc - fb7f65ebc653a7b017fe53c66231ac4a0579db9f4082a32a5a349df8b7485fb7 # meson-reference-1.3.0.3 - af6e38ec433acefc5f97064de5837429ed00451ae82eef2edd7494da491a6217 # meson-reference-1.3.0.json +sha256sums=(6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7 # meson-1.3.1.tar.gz + 573ffb2ff8a6a31c71a990eb56ffab7b78c3e5211a2f1c86d2ecc75519de47cd # meson-1.3.1.tar.gz.asc + a580b86386746fcdf926746732e09ae8ccdd7ce7cf75edb8997e6b9b37b75c49 # meson-reference-1.3.1.3 + 8e2fc61ff34cd7a8f533c70a1149824ac614c55ba92d0295bf7ca7a213cb903a # meson-reference-1.3.1.json 864f959d66d912594cf1f61d1f3de85b1926bbe95aed7cf8c3dded7a36a0c6a4 # 0001-Skip-broken-tests.patch 12e95ae06180a145bcde8a404b748bc476819b5c6fabb7d28c430a113ec93988 # 0002-Use-C-17-for-protobuf-tests.patch 47e6b7d18f2fbde2edd5674c812b9d4a279feb6d7f947310736c39cde28f8831 # cross-lib32 @@ -107,6 +107,4 @@ sha256sums=(4ba253ef60e454e23234696119cbafa082a0aead0bd3bbf6991295054795f5dc # 09d57353b4694950e37a3a069ede3961b0aa0a3184771cf4382f10b02984c1d8 # arch-meson b2aeae2787cf8f3ffb8778ee7f1a434895b1512bc0bdb33528c4cb2aeb067904) # jobo-meson -## 76a6aade2c15e3ee77d22943c7391fcd70f70eda6b5d48dad32368e75f400d1e meson-1.3.0-02-x86_64.pkg.tar.lz - -## +## 47700a1bdbbeef8f9cf72fdc0e95ad715015b022f3bf5f8cfbaaa6457e44cef7 meson-1.3.1-01-x86_64.pkg.tar.lz diff --git a/meson/PKGBUILD-arch b/meson/PKGBUILD-arch index 59ed97c..0dad8b7 100644 --- a/meson/PKGBUILD-arch +++ b/meson/PKGBUILD-arch @@ -3,8 +3,8 @@ # Contributor: Anatol Pomozov pkgname=meson -pkgver=1.3.0 -pkgrel=2 +pkgver=1.3.1 +pkgrel=1 pkgdesc="High productivity build system" url="https://mesonbuild.com/" arch=(any) @@ -76,10 +76,10 @@ source=( 0001-Skip-broken-tests.patch 0002-Use-C-17-for-protobuf-tests.patch ) -b2sums=('cb9ac8e00fe924df67166938687584a9de35e784e1e52bff281649d787695d37e3044ea3d6d5869181fe1e9676b5136548293dbd5cdbd091a6de0c449b8932f5' +b2sums=('64d53eddc8cb321a4e2dabaa4b7499798a7b68764b1a7a5182bfa21d081dc07105acab616119b88ff610e5d75504f03d1c0aefee3602ddf538fc491ff3d0204a' 'SKIP' - '553cdd8e165593a50570777f0e862a8e20d15dc5b7262c32ca8c86c54c8f2ee1b759be3439e9eec5917c88b3275d755b4f072e979dab400edf18908cb9fbf68e' - 'f50c3569c6330e8671c402953247fb456505dd75555c8fbf1487bd43881dcdc766d88348814a6c2bb631c571ad4c4efabb271b5a1e7f01748ae2d9a332b39330' + '95eff6139275ddc826395192e2e7043d665641260454aeda06dca7e573d34b348c2a935ac1603d8d838f480fe6b57ba2ece51fa90760ab3014e15c70f6d130ea' + '82f234701f578f5c85d527a95e6026b5d219fde9b212bead51615f38b43c8b0d129a700e792099778802f5b511250a2b56b5074e55709f4aa1ace64ef8949ff8' '211cee61f117fd1d582d7a613a8634f044e9e307791c4154c6da72bccd5f06856801b14bcb26157ee682b5935c48ffd2098a5fabab2232726d7758cf091c07f7' '9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081' '7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e' diff --git a/qt6-base/PKGBUILD b/qt6-base/PKGBUILD index 512b7b1..5a36dc2 100644 --- a/qt6-base/PKGBUILD +++ b/qt6-base/PKGBUILD @@ -8,7 +8,7 @@ pkgname=qt6-base _qtver=6.6.1 pkgver=${_qtver/-/} -pkgrel=02 +pkgrel=03 url='https://www.qt.io' pkgdesc='A cross-platform application and UI framework w/o systemd' depends=(brotli dbus double-conversion fontconfig freetype2 gcc-libs @@ -97,5 +97,5 @@ sha256sums=(450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7 # 5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qt6-base-cflags.patch 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094) # qt6-base-nostrip.patch -## 6961731b50de116f3374ce8323ffd804d73b1877a30e7033d03c1ec4caeecc86 qt6-base-6.6.1-02-x86_64.pkg.tar.lz +## e3a866fb28d7dd8fe7ffd42eb3482b6873b91f7fa332656988dd401216313742 qt6-base-6.6.1-03-x86_64.pkg.tar.lz diff --git a/qt6-base/PKGBUILD-arch b/qt6-base/PKGBUILD-arch index ca9019d..9ea1e19 100644 --- a/qt6-base/PKGBUILD-arch +++ b/qt6-base/PKGBUILD-arch @@ -5,7 +5,7 @@ pkgname=qt6-base _qtver=6.6.1 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=3 arch=(x86_64) url='https://www.qt.io' license=(GPL3 LGPL3 FDL custom) diff --git a/wlroots/PKGBUILD b/wlroots/PKGBUILD index fe4a4b3..6117d6d 100644 --- a/wlroots/PKGBUILD +++ b/wlroots/PKGBUILD @@ -6,8 +6,8 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=wlroots -pkgver=0.17.0 -pkgrel=03 +pkgver=0.17.1 +pkgrel=01 pkgdesc='Modular Wayland compositor library' url='https://gitlab.freedesktop.org/wlroots/wlroots' depends=( @@ -34,7 +34,15 @@ optdepends=('xorg-xwayland: Xwayland support') provides=('libwlroots.so') # options=(debug) source=("$pkgname-$pkgver.tar.gz::https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz" - "https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz.sig") + "https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz.sig" + "Revert-layer-shell-error-on-0-dimension-without-anch.patch") + +prepare() { + cd "${pkgname}-${pkgver}" + # Allow a minor protocol violation until phosh is fixed without this patch + # phosh crashes on launch. + patch -Np1 -i "${srcdir}/Revert-layer-shell-error-on-0-dimension-without-anch.patch" +} build() { arch-meson "$pkgname-$pkgver" build @@ -56,8 +64,9 @@ validpgpkeys=('34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48' # Simon Ser '9DDA3B9FA5D58DD5392C78E652CB6609B22DA89A' # Drew DeVault '4100929B33EEB0FD1DB852797BC79407090047CA') # Sway signing key -sha256sums=(9da3475a6834a6a9a8fd93de84f4ef91f9ee48ff70c305aa9522bf0db9e61128 # wlroots-0.17.0.tar.gz - e8e5404ea71112ce4436f472bd346ebe3c0aab71d30cba13bb60d4dfe267318b) # wlroots-0.17.0.tar.gz.sig +sha256sums=(d58d68e3f90d92de4d49fa43b4d75dc78f8af1d920d090729331cefbdfcf361b # wlroots-0.17.1.tar.gz + 518e10decf47919f6a1b8f5795bd17b54786be2099cf9264fb63eea13b6f9f34 # wlroots-0.17.1.tar.gz.sig + 1c05f0500a96a3721317d01619aa42d8ad696905a378249e8405968c4e16a065) # Revert-layer-shell-error-on-0-dimension-without-anch.patch -## ddba49257030bcd9a911a0cfa23f2c10895c5798dcb2baec92673defc3f27856 wlroots-0.17.0-03-x86_64.pkg.tar.lz +## 03b7e6ca317e7835375672d9a0c3f4c19d43a2205448e477505755cd88ec260a wlroots-0.17.1-01-x86_64.pkg.tar.lz diff --git a/wlroots/PKGBUILD-arch b/wlroots/PKGBUILD-arch index 8956381..225d266 100644 --- a/wlroots/PKGBUILD-arch +++ b/wlroots/PKGBUILD-arch @@ -3,7 +3,7 @@ # Contributor: Omar Pakker pkgname=wlroots -pkgver=0.17.0 +pkgver=0.17.1 pkgrel=1 license=('MIT') pkgdesc='Modular Wayland compositor library' @@ -47,15 +47,24 @@ options=( source=( "$pkgname-$pkgver.tar.gz::https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz" "https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz.sig" + "Revert-layer-shell-error-on-0-dimension-without-anch.patch" ) -sha256sums=('9da3475a6834a6a9a8fd93de84f4ef91f9ee48ff70c305aa9522bf0db9e61128' - 'SKIP') +sha256sums=('d58d68e3f90d92de4d49fa43b4d75dc78f8af1d920d090729331cefbdfcf361b' + 'SKIP' + '1c05f0500a96a3721317d01619aa42d8ad696905a378249e8405968c4e16a065') validpgpkeys=( '34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48' # Simon Ser '9DDA3B9FA5D58DD5392C78E652CB6609B22DA89A' # Drew DeVault '4100929B33EEB0FD1DB852797BC79407090047CA' # Sway signing key ) +prepare() { + cd "${pkgname}-${pkgver}" + # Allow a minor protocol violation until phosh is fixed without this patch + # phosh crashes on launch. + patch -Np1 -i "${srcdir}/Revert-layer-shell-error-on-0-dimension-without-anch.patch" +} + build() { arch-meson "$pkgname-$pkgver" build ninja -C build @@ -65,4 +74,3 @@ package() { DESTDIR="$pkgdir" ninja -C build install install -Dm644 "$pkgname-$pkgver/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname/" } -## 0a099642614dfa7a8141e584d3a65dc477ab76e14308685cc394986209ad17a4 # PKGBUILD diff --git a/wlroots/Revert-layer-shell-error-on-0-dimension-without-anch.patch b/wlroots/Revert-layer-shell-error-on-0-dimension-without-anch.patch new file mode 100644 index 0000000..edda95e --- /dev/null +++ b/wlroots/Revert-layer-shell-error-on-0-dimension-without-anch.patch @@ -0,0 +1,36 @@ +From 4ec4c290b04c5c87ffb7b64e590477e3a58f8547 Mon Sep 17 00:00:00 2001 +Message-ID: <4ec4c290b04c5c87ffb7b64e590477e3a58f8547.1700567169.git.agx@sigxcpu.org> +From: =?UTF-8?q?Guido=20G=C3=BCnther?= +Date: Fri, 1 Jan 2021 13:58:55 +0100 +Subject: [PATCH] Revert "layer-shell: error on 0 dimension without anchors" + +This reverts commit 8dec751a6d84335fb04288b8efab6dd5c90288d3. + +Revert this until phosh has a fixed release. +--- + types/wlr_layer_shell_v1.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/types/wlr_layer_shell_v1.c b/types/wlr_layer_shell_v1.c +index 37256db6..2c722a79 100644 +--- a/types/wlr_layer_shell_v1.c ++++ b/types/wlr_layer_shell_v1.c +@@ -335,6 +335,7 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) { + return; + } + ++#if 0 + const uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | + ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; + if (surface->pending.desired_width == 0 && +@@ -354,6 +355,7 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) { + "height 0 requested without setting top and bottom anchors"); + return; + } ++#endif + + if (surface->surface->unmap_commit) { + layer_surface_reset(surface); +-- +2.42.0 +