diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 43 |
1 files changed, 16 insertions, 27 deletions
@@ -6,9 +6,9 @@ # Contributor: tinywrkb <tinywrkb@gmail.com> pkgname=sway-im -pkgver=1.8.1 +pkgver=1.9 epoch=1 -pkgrel=2 +pkgrel=1 pkgdesc='Tiling Wayland compositor and replacement for the i3 window manager, with input method popups v2 support' arch=(x86_64) url='https://swaywm.org/' @@ -22,7 +22,7 @@ depends=( 'libpixman-1.so' 'libudev.so' 'libwayland-server.so' - 'libwlroots.so=11' + 'libwlroots.so=12' 'libxcb' 'libxkbcommon.so' 'pango' @@ -57,17 +57,17 @@ source=("https://github.com/swaywm/sway/releases/download/$pkgver/sway-$pkgver.t "https://github.com/swaywm/sway/releases/download/$pkgver/sway-$pkgver.tar.gz.sig" "50-systemd-user.conf" "sway-portals.conf" - "sys_nice_user_xkb_configs.patch" "0001-text_input-Implement-input-method-popups.patch" - "0002-backport-sway-im-to-v1.8.patch") + "0002-chore-fractal-scale-handle.patch" + "0003-chore-left_pt-on-method-popup.patch") install=sway.install -sha512sums=('1504312a199608532e22336c5031e8f4749f5102ab321d13d97a1f93d49c8ec435e9097af729d8f7dfa81e2e96cee7de91cf4c04b6a7b7151ea740a1e43eb086' +sha512sums=('1d2a47bb8b838573a32f3719a7329fd744119c2c7efc5e5a4168b2bacfb09a3901a569177e5e10c129141fafe00e823ab78c04b76b502d23caa7621bbccd5919' 'SKIP' 'd5f9aadbb4bbef067c31d4c8c14dad220eb6f3e559e9157e20e1e3d47faf2f77b9a15e52519c3ffc53dc8a5202cb28757b81a4b3b0cc5dd50a4ddc49e03fe06e' - '091a205bca875b6a78150b5b14ffaca996b7c7c3d6f68910e5891e5409ca070d27b3307e8c4916c1562a998d5bcb94406e961bf376d86e64c8ddf5afe5b41f76' - '156719e93d0213d1b54ce6e3a9b2dcc9246da5689dd2d3281546f9c042cbc69072f99b087e112fe777dcd786d2b9d1be1e1c9200feddffb5e2d16f8dfb27515d' - 'f3a0bf6b48ecb09b229ba286f57c1a43e83848c187816b6784df1a3640c083759e8236bc949c8097044d3af218813757b636226a097e495d993fd682f20ceb96' - 'f5441d4da5c9c43a5f70e56eb00fcec7a56c3f76dbe03cbaab55b7bd1ea82ff8fbae1e1ae3e8dfaf1860db8e76635fc578649e537b609eb914e068cb9c4929d1') + 'b9e708c775825c8124d8e154e523c90b8a32715050ba06f6dbcdd08d109eed484d128ccc8dcd6a49dc9cd51a0c9035779c2706b4d7a139115e85c4f54226b775' + '07343bed09ca1689e647465d38013dc42e5a290bf8bcce57244eaccc7c3c858f04ec5d2786dc3af193a070faa89606598cccba66cd52d4078973afb757d5b72e' + 'dd013a9c6859dc0210aa55a519c1df4c5899e164d7a6c7f86f831dcd37f9b26839f24e7bc2dc066ee7fad38ff91bcae9516a0c3bffebb09c35c8133f0af10bc8' + 'dba122283df29239ff94cac20c74f28937822573474bebf3865096bc073ef366412ccead4d1c46197c93eefc09d2c8af74de782f5be2a462d7911020c7a43d0e') validpgpkeys=('34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48' # Simon Ser '9DDA3B9FA5D58DD5392C78E652CB6609B22DA89A') # Drew DeVault conflicts=('sway') @@ -76,25 +76,19 @@ provides=('sway') prepare() { cd "sway-$pkgver" - # Enable user xkb configs with cap_sys_nice - otherwise user xkb configs will - # break. - # - # This patch was originally at - # https://github.com/swaywm/sway/commit/2f2cdd60def006f6d3cbe318f9edd7d68fcb239a.patch - # but failed to apply correctly to meson.build. We don't need that part of - # the patch so just drop it. - patch -p1 < ../sys_nice_user_xkb_configs.patch - # Set the version information to 'Arch Linux' instead of 'makepkg' sed -i "s/branch \\\'@1@\\\'/Arch Linux/g" meson.build - # sway-im patch: https://github.com/swaywm/sway/pull/7226 + # sway-im patch: + # https://github.com/swaywm/sway/pull/7226#event-11545284120 + # https://github.com/swaywm/sway/commits/0789c12a8edf46fbc1c7024e153f3e8f8f35fe12 + # commit 0789c12a is the lastest commit before wlroots scene graph api patch -Np1 -i ../0001-text_input-Implement-input-method-popups.patch - patch -Np1 -i ../0002-backport-sway-im-to-v1.8.patch + patch -Np1 -i ../0002-chore-fractal-scale-handle.patch + patch -Np1 -i ../0003-chore-left_pt-on-method-popup.patch } build() { - export PKG_CONFIG_PATH='/usr/lib/wlroots0.16/pkgconfig' mkdir -p build arch-meson build "sway-$pkgver" -D sd-bus-provider=libsystemd -D werror=false -D b_ndebug=true ninja -C build @@ -105,11 +99,6 @@ package() { install -Dm644 "sway-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" install -Dm644 50-systemd-user.conf -t "$pkgdir/etc/sway/config.d/" install -Dm644 sway-portals.conf "$pkgdir/usr/share/xdg-desktop-portal/sway-portals.conf" - - for util in autoname-workspaces.py inactive-windows-transparency.py grimshot; do - install -Dm755 "sway-$pkgver/contrib/$util" -t \ - "$pkgdir/usr/share/sway/scripts" - done } # vim: ts=2 sw=2 et |