From 294e1f7e622749ec0171ec7cfc5244c88ec7922f Mon Sep 17 00:00:00 2001 From: "Ward Nakchbandi (Cosmic Fusion)" <83735213+CosmicFusion@users.noreply.github.com> Date: Thu, 5 Oct 2023 20:54:50 +0300 Subject: [PATCH] --- debian/changelog | 6 ++++ debian/patches/series | 3 +- debian/patches/xwayland-cursor-wrap-fix.patch | 34 ------------------- main.sh | 4 +-- release.sh | 4 +-- 5 files changed, 11 insertions(+), 40 deletions(-) delete mode 100644 debian/patches/xwayland-cursor-wrap-fix.patch diff --git a/debian/changelog b/debian/changelog index bcdb516..38d5db0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xwayland (2:23.2.1-100pika1) pikauwu; urgency=medium + + * Update to pikauwu + + -- Ward Nakchbandi Thu, 04 Oct 2022 17:50:00 +0300 + xwayland (2:23.2.0-99pika1.lunar) lunar; urgency=medium * Update to lunar diff --git a/debian/patches/series b/debian/patches/series index 981bd4b..6ac7a3c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -0001-xwayland-patch-fix-vsync.patch -xwayland-cursor-wrap-fix.patch +0001-xwayland-patch-fix-vsync.patch \ No newline at end of file diff --git a/debian/patches/xwayland-cursor-wrap-fix.patch b/debian/patches/xwayland-cursor-wrap-fix.patch deleted file mode 100644 index 1ac7c42..0000000 --- a/debian/patches/xwayland-cursor-wrap-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fdc71a08f059d2466e39968652c3df71cc582b3e Mon Sep 17 00:00:00 2001 -From: GloriousEggroll -Date: Sun, 21 May 2023 03:34:46 -0600 -Subject: [PATCH] xwayland pointer warp fix - ---- - hw/xwayland/xwayland-input.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c -index 34dd3c8..f7fa737 100644 ---- a/hw/xwayland/xwayland-input.c -+++ b/hw/xwayland/xwayland-input.c -@@ -3202,9 +3202,6 @@ xwl_seat_emulate_pointer_warp(struct xwl_seat *xwl_seat, - if (!xwl_seat_can_emulate_pointer_warp(xwl_seat)) - return; - -- if (xwl_seat->x_cursor != NULL) -- return; -- - if (!xwl_seat->pointer_warp_emulator) - xwl_seat_create_pointer_warp_emulator(xwl_seat); - -@@ -3215,6 +3212,8 @@ xwl_seat_emulate_pointer_warp(struct xwl_seat *xwl_seat, - xwl_window, - sprite, - x, y); -+ if (xwl_seat->x_cursor != NULL) -+ xwl_seat_destroy_pointer_warp_emulator(xwl_seat); - } - - static Bool --- -2.40.1 diff --git a/main.sh b/main.sh index a3c01b5..81f066a 100755 --- a/main.sh +++ b/main.sh @@ -1,5 +1,5 @@ # Clone Upstream -git clone https://gitlab.freedesktop.org/xorg/xserver.git ./xwayland -b xwayland-23.2.0 +git clone https://gitlab.freedesktop.org/xorg/xserver.git ./xwayland -b xwayland-23.2.1 cp -rvf ./debian ./xwayland/ cd ./xwayland @@ -8,7 +8,7 @@ apt upgrade -y apt-get build-dep ./ -y # Build package -LOGNAME=root dh_make --createorig -y -l -p xwayland_23.2.0 +LOGNAME=root dh_make --createorig -y -l -p xwayland_23.2.1 dpkg-buildpackage --no-sign # Move the debs to output diff --git a/release.sh b/release.sh index 5c59923..1575255 100755 --- a/release.sh +++ b/release.sh @@ -2,7 +2,7 @@ rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/incoming/ # add debs to repo -ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pika-main /srv/www/incoming/' +ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pikauwu-main /srv/www/incoming/' # publish the repo -ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite lunar filesystem:pikarepo:' +ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite pikauwu filesystem:pikarepo:' \ No newline at end of file