[lilac] updated to r2722.e4e653ad-1

3 files changed, 118 insertions, 108 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07f05a8e16b7..650e1510f5b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = hyprland-nvidia-hidpi-git
 	pkgdesc = A dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks. (NVIDIA + HiDPI patch)
-	pkgver = r2551.c4440993
+	pkgver = r2722.e4e653ad
 	pkgrel = 1
 	url = https://github.com/hyprwm/Hyprland
 	arch = any
@@ -41,8 +41,8 @@ pkgbase = hyprland-nvidia-hidpi-git
 	depends = seatd
 	depends = vulkan-icd-loader
 	depends = vulkan-validation-layers
-	depends = xorg-xwayland-hidpi-xprop
-	depends = libdisplay-info
+	depends = xorg-xwayland-lily
+	depends = libdisplay-info-git
 	provides = hyprland
 	conflicts = hyprland
 	options = !makeflags
@@ -59,7 +59,7 @@ pkgbase = hyprland-nvidia-hidpi-git
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 304aaf12cbd7dc198bf7e418d729b297ea61186d27c035e4a63a337399fcec76
+	sha256sums = 497afb5e99cb069ed96a3c4a735ad23afe0d012ca845067aae3176e45e267ba5
 	sha256sums = e7cf16e39db2bde4dbc9d7ec3b4753f7643b1bf198a3179e6802a9c603437fe9
 	sha256sums = 522b19656d7c1627ec615b6720182590570560e346c1670f9df002015707b340
 
diff --git a/PKGBUILD b/PKGBUILD
index be101db04fcb..c33ed0ab02d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,117 +1,116 @@
-# Maintainer: tohmais <callum.wishart@protonmail.com>
-# Maintainer: hafeoz <hafeoz@kolabnow.com>
+# Maintainer: Integral <integral@murena.io>
 
-_pkgname="hyprland"
+_pkgname=hyprland
 pkgname="${_pkgname}-nvidia-hidpi-git"
-pkgver=r2551.c4440993
+pkgver=r2722.e4e653ad
 pkgrel=1
 pkgdesc="A dynamic tiling Wayland compositor based on wlroots that doesn't sacrifice on its looks. (NVIDIA + HiDPI patch)"
 arch=(any)
 url="https://github.com/hyprwm/Hyprland"
 license=('BSD')
 depends=(
-    libxcb
-    xcb-proto
-    xcb-util
-    xcb-util-keysyms
-    libxfixes
-    libx11
-    libxcomposite
-    xorg-xinput
-    libxrender
-    pixman
-    wayland-protocols
-    cairo
-    pango
-    polkit
-    glslang
-    libinput
-    libxcb
-    libxkbcommon
-    opengl-driver
-    pixman
-    wayland
-    xcb-util-errors
-    xcb-util-renderutil
-    xcb-util-wm
-    seatd
-    vulkan-icd-loader
-    vulkan-validation-layers
-    xorg-xwayland-hidpi-xprop
-    libdisplay-info)
+	libxcb
+	xcb-proto
+	xcb-util
+	xcb-util-keysyms
+	libxfixes
+	libx11
+	libxcomposite
+	xorg-xinput
+	libxrender
+	pixman
+	wayland-protocols
+	cairo
+	pango
+	polkit
+	glslang
+	libinput
+	libxcb
+	libxkbcommon
+	opengl-driver
+	pixman
+	wayland
+	xcb-util-errors
+	xcb-util-renderutil
+	xcb-util-wm
+	seatd
+	vulkan-icd-loader
+	vulkan-validation-layers
+	xorg-xwayland-lily
+	libdisplay-info-git)
 makedepends=(
-    git
-    cmake
-    ninja
-    gcc
-    gdb
-    meson
-    vulkan-headers
-    wayland-protocols
-    xorgproto)
+	git
+	cmake
+	ninja
+	gcc
+	gdb
+	meson
+	vulkan-headers
+	wayland-protocols
+	xorgproto)
 source=("${_pkgname}::git+https://github.com/hyprwm/Hyprland.git"
-    "git+https://gitlab.freedesktop.org/wlroots/wlroots.git"
-    "git+https://github.com/hyprwm/hyprland-protocols.git"
-    "git+https://github.com/canihavesomecoffee/udis86.git"
-    "xwayland-support-HiDPI-scale.patch"
-    "fix-configure_notify-event.patch"
-    "nvidia.patch")
+	"git+https://gitlab.freedesktop.org/wlroots/wlroots.git"
+	"git+https://github.com/hyprwm/hyprland-protocols.git"
+	"git+https://github.com/canihavesomecoffee/udis86.git"
+	"xwayland-support-HiDPI-scale.patch"
+	"fix-configure_notify-event.patch"
+	"nvidia.patch")
 conflicts=("${_pkgname}")
 provides=(hyprland)
 sha256sums=('SKIP'
-    'SKIP'
-    'SKIP'
-    'SKIP'
-    '304aaf12cbd7dc198bf7e418d729b297ea61186d27c035e4a63a337399fcec76'
-    'e7cf16e39db2bde4dbc9d7ec3b4753f7643b1bf198a3179e6802a9c603437fe9'
-    '522b19656d7c1627ec615b6720182590570560e346c1670f9df002015707b340')
+	'SKIP'
+	'SKIP'
+	'SKIP'
+	'497afb5e99cb069ed96a3c4a735ad23afe0d012ca845067aae3176e45e267ba5'
+	'e7cf16e39db2bde4dbc9d7ec3b4753f7643b1bf198a3179e6802a9c603437fe9'
+	'522b19656d7c1627ec615b6720182590570560e346c1670f9df002015707b340')
 options=(!makeflags !buildflags !strip)
 
 pkgver() {
-    cd "$_pkgname"
-    (
-        set -o pipefail
-        git describe --long 2> /dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-            printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-    )
+	cd "$_pkgname"
+	(
+		set -o pipefail
+		git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+			printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	)
 }
 
 prepare() {
-    cd "${srcdir}/${_pkgname}"
-    rm -rf subprojects/wlroots subprojects/hyprland-protocols
-    git submodule init
-    git config submodule.wlroots.url "${srcdir}"/wlroots
-    git config submodule.subprojects/hyprland-protocols.url "${srcdir}"/hyprland-protocols
-    git config submodule.subprojects/udis86.url "${srcdir}"/udis86
-    git -c protocol.file.allow=always submodule update subprojects/wlroots
-    git -c protocol.file.allow=always submodule update subprojects/hyprland-protocols
-    git -c protocol.file.allow=always submodule update subprojects/udis86
-    cd subprojects/wlroots
-    git revert -n 18595000f3a21502fd60bf213122859cc348f9af
+	cd "${srcdir}/${_pkgname}"
+	rm -rf subprojects/wlroots subprojects/hyprland-protocols
+	git submodule init
+	git config submodule.wlroots.url "${srcdir}"/wlroots
+	git config submodule.subprojects/hyprland-protocols.url "${srcdir}"/hyprland-protocols
+	git config submodule.subprojects/udis86.url "${srcdir}"/udis86
+	git -c protocol.file.allow=always submodule update subprojects/wlroots
+	git -c protocol.file.allow=always submodule update subprojects/hyprland-protocols
+	git -c protocol.file.allow=always submodule update subprojects/udis86
+	cd subprojects/wlroots
+	git revert -n 18595000f3a21502fd60bf213122859cc348f9af
 	patch --forward --strip=1 --input="${srcdir}"/xwayland-support-HiDPI-scale.patch
 	patch --forward --strip=1 --input="${srcdir}"/fix-configure_notify-event.patch
-    patch --forward --strip=0 --input="${srcdir}"/nvidia.patch
+	patch --forward --strip=0 --input="${srcdir}"/nvidia.patch
 }
 
 build() {
-    cd "${srcdir}/${_pkgname}"
-    make fixwlr
-    cd "./subprojects/wlroots/" && meson build/ --prefix="${srcdir}/tmpwlr" --buildtype=release && ninja -C build/ && mkdir -p "${srcdir}/tmpwlr" && ninja -C build/ install && cd ../../
-    cd "./subprojects/udis86/" && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -H./ -B./build -G Ninja && cmake --build ./build --config Release --target all -j$(shell nproc) && cd ../../
-    make protocols
-    make release
-    cd ./hyprctl && make all && cd ..
+	cd "${srcdir}/${_pkgname}"
+	make fixwlr
+	cd "./subprojects/wlroots/" && meson build/ --prefix="${srcdir}/tmpwlr" --buildtype=release && ninja -C build/ && mkdir -p "${srcdir}/tmpwlr" && ninja -C build/ install && cd ../../
+	cd "./subprojects/udis86/" && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -H./ -B./build -G Ninja && cmake --build ./build --config Release --target all -j$(shell nproc) && cd ../../
+	make protocols
+	make release
+	cd ./hyprctl && make all && cd ..
 }
 
 package() {
-    cd "${srcdir}/${_pkgname}"
-    mkdir -p "${pkgdir}/usr/share/wayland-sessions"
-    mkdir -p "${pkgdir}/usr/share/hyprland"
-    install -Dm755 build/Hyprland -t "${pkgdir}/usr/bin"
-    install -Dm755 hyprctl/hyprctl -t "${pkgdir}/usr/bin"
-    install -Dm644 assets/*.png -t "${pkgdir}/usr/share/hyprland"
-    install -Dm644 example/hyprland.desktop -t "${pkgdir}/usr/share/wayland-sessions"
-    install -Dm644 example/hyprland.conf -t "${pkgdir}/usr/share/hyprland"
-    install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${_pkgname}"
-    install -Dm755 ../tmpwlr/lib/libwlroots.so.* -t "${pkgdir}/usr/lib"
+	cd "${srcdir}/${_pkgname}"
+	mkdir -p "${pkgdir}/usr/share/wayland-sessions"
+	mkdir -p "${pkgdir}/usr/share/hyprland"
+	install -Dm755 build/Hyprland -t "${pkgdir}/usr/bin"
+	install -Dm755 hyprctl/hyprctl -t "${pkgdir}/usr/bin"
+	install -Dm644 assets/*.png -t "${pkgdir}/usr/share/hyprland"
+	install -Dm644 example/hyprland.desktop -t "${pkgdir}/usr/share/wayland-sessions"
+	install -Dm644 example/hyprland.conf -t "${pkgdir}/usr/share/hyprland"
+	install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${_pkgname}"
+	install -Dm755 ../tmpwlr/lib/libwlroots.so.* -t "${pkgdir}/usr/lib"
 }
diff --git a/xwayland-support-HiDPI-scale.patch b/xwayland-support-HiDPI-scale.patch
index a9e86fb3ac31..fcedac0abff7 100644
--- a/xwayland-support-HiDPI-scale.patch
+++ b/xwayland-support-HiDPI-scale.patch
@@ -1,4 +1,4 @@
-From 48f97d24d4b7f9d5fd0d4accdbaa009b365bd61b Mon Sep 17 00:00:00 2001
+From fb2082439381722af1c2427d63eb2c505dbb5d00 Mon Sep 17 00:00:00 2001
 From: lilydjwg <lilydjwg@gmail.com>
 Date: Wed, 17 Nov 2021 19:34:58 +0800
 Subject: [PATCH] xwayland: support HiDPI scale
@@ -6,11 +6,11 @@ Subject: [PATCH] xwayland: support HiDPI scale
 This supports the xorg-xwayland patch at https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/733
 ---
  include/xwayland/xwm.h |  2 ++
- xwayland/xwm.c         | 51 +++++++++++++++++++++++++++++++-----------
- 2 files changed, 40 insertions(+), 13 deletions(-)
+ xwayland/xwm.c         | 53 +++++++++++++++++++++++++++++++-----------
+ 2 files changed, 41 insertions(+), 14 deletions(-)
 
 diff --git a/include/xwayland/xwm.h b/include/xwayland/xwm.h
-index c69504e8..1a332b6c 100644
+index 3d5405221..33ff1478b 100644
 --- a/include/xwayland/xwm.h
 +++ b/include/xwayland/xwm.h
 @@ -88,6 +88,7 @@ enum atom_name {
@@ -21,7 +21,7 @@ index c69504e8..1a332b6c 100644
  	ATOM_LAST // keep last
  };
  
-@@ -98,6 +99,7 @@ struct wlr_xwm {
+@@ -96,6 +97,7 @@ struct wlr_xwm {
  	struct wl_event_source *event_source;
  	struct wlr_seat *seat;
  	uint32_t ping_timeout;
@@ -30,7 +30,7 @@ index c69504e8..1a332b6c 100644
  	xcb_atom_t atoms[ATOM_LAST];
  	xcb_connection_t *xcb_conn;
 diff --git a/xwayland/xwm.c b/xwayland/xwm.c
-index 5a36dc21..8449977e 100644
+index 5f857f24f..f085ae7ab 100644
 --- a/xwayland/xwm.c
 +++ b/xwayland/xwm.c
 @@ -19,6 +19,14 @@
@@ -45,10 +45,10 @@ index 5a36dc21..8449977e 100644
 +	return (val + xwm->scale/2) / xwm->scale;
 +}
 +
- const char *const atom_map[ATOM_LAST] = {
+ static const char *const atom_map[ATOM_LAST] = {
  	[WL_SURFACE_ID] = "WL_SURFACE_ID",
  	[WL_SURFACE_SERIAL] = "WL_SURFACE_SERIAL",
-@@ -90,6 +98,7 @@ const char *const atom_map[ATOM_LAST] = {
+@@ -90,6 +98,7 @@ static const char *const atom_map[ATOM_LAST] = {
  	[DND_ACTION_PRIVATE] = "XdndActionPrivate",
  	[NET_CLIENT_LIST] = "_NET_CLIENT_LIST",
  	[NET_CLIENT_LIST_STACKING] = "_NET_CLIENT_LIST_STACKING",
@@ -56,7 +56,7 @@ index 5a36dc21..8449977e 100644
  };
  
  #define STARTUP_INFO_REMOVE_PREFIX "remove: ID="
-@@ -968,8 +977,8 @@ static void xwm_handle_create_notify(struct wlr_xwm *xwm,
+@@ -965,8 +974,8 @@ static void xwm_handle_create_notify(struct wlr_xwm *xwm,
  		return;
  	}
  
@@ -67,7 +67,7 @@ index 5a36dc21..8449977e 100644
  }
  
  static void xwm_handle_destroy_notify(struct wlr_xwm *xwm,
-@@ -1000,10 +1009,10 @@ static void xwm_handle_configure_request(struct wlr_xwm *xwm,
+@@ -997,10 +1006,10 @@ static void xwm_handle_configure_request(struct wlr_xwm *xwm,
  
  	struct wlr_xwayland_surface_configure_event wlr_event = {
  		.surface = surface,
@@ -82,7 +82,7 @@ index 5a36dc21..8449977e 100644
  		.mask = mask,
  	};
  
-@@ -1018,14 +1027,14 @@ static void xwm_handle_configure_notify(struct wlr_xwm *xwm,
+@@ -1015,14 +1024,14 @@ static void xwm_handle_configure_notify(struct wlr_xwm *xwm,
  	}
  
  	bool geometry_changed =
@@ -103,7 +103,7 @@ index 5a36dc21..8449977e 100644
  	}
  
  	if (xsurface->override_redirect != ev->override_redirect) {
-@@ -1135,7 +1144,22 @@ static void xwm_handle_unmap_notify(struct wlr_xwm *xwm,
+@@ -1132,7 +1141,22 @@ static void xwm_handle_unmap_notify(struct wlr_xwm *xwm,
  static void xwm_handle_property_notify(struct wlr_xwm *xwm,
  		xcb_property_notify_event_t *ev) {
  	struct wlr_xwayland_surface *xsurface = lookup_surface(xwm, ev->window);
@@ -126,7 +126,18 @@ index 5a36dc21..8449977e 100644
  		return;
  	}
  
-@@ -1772,7 +1796,7 @@ void wlr_xwayland_surface_configure(struct wlr_xwayland_surface *xsurface,
+@@ -1759,17 +1783,17 @@ void wlr_xwayland_surface_configure(struct wlr_xwayland_surface *xsurface,
+ 		int16_t x, int16_t y, uint16_t width, uint16_t height) {
+ 	int old_w = xsurface->width;
+ 	int old_h = xsurface->height;
++	struct wlr_xwm *xwm = xsurface->xwm;
+ 
+ 	xsurface->x = x;
+ 	xsurface->y = y;
+ 	xsurface->width = width;
+ 	xsurface->height = height;
+ 
+-	struct wlr_xwm *xwm = xsurface->xwm;
  	uint32_t mask = XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y |
  		XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT |
  		XCB_CONFIG_WINDOW_BORDER_WIDTH;
@@ -135,7 +146,7 @@ index 5a36dc21..8449977e 100644
  	xcb_configure_window(xwm->xcb_conn, xsurface->window_id, mask, values);
  
  	// If the window size did not change, then we cannot rely on
-@@ -2125,6 +2149,7 @@ struct wlr_xwm *xwm_create(struct wlr_xwayland *xwayland, int wm_fd) {
+@@ -2122,6 +2146,7 @@ struct wlr_xwm *xwm_create(struct wlr_xwayland *xwayland, int wm_fd) {
  	wl_list_init(&xwm->pending_startup_ids);
  	xwm->ping_timeout = 10000;
  
@@ -144,5 +155,5 @@ index 5a36dc21..8449977e 100644
  
  	int rc = xcb_connection_has_error(xwm->xcb_conn);
 -- 
-2.39.2
+GitLab