From 0b22925c2f943624727f1fdc4efb190b47e4b61d Mon Sep 17 00:00:00 2001
From: wheaney <42350981+wheaney@users.noreply.github.com>
Date: Tue, 29 Apr 2025 10:19:04 -0700
Subject: [PATCH 1/3] Merge latest changes into gnome-44-max and gnome-45
 backport branches

---
 gnome/backports/gnome-44-max | 2 +-
 gnome/backports/gnome-45     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnome/backports/gnome-44-max b/gnome/backports/gnome-44-max
index 69840c6..3ca03b3 160000
--- a/gnome/backports/gnome-44-max
+++ b/gnome/backports/gnome-44-max
@@ -1 +1 @@
-Subproject commit 69840c63fbaa64bac20f6d8f92288ee5cd4b0525
+Subproject commit 3ca03b3747a93b63a7604a83ad34bf9834344854
diff --git a/gnome/backports/gnome-45 b/gnome/backports/gnome-45
index 6ce35b9..91bcd82 160000
--- a/gnome/backports/gnome-45
+++ b/gnome/backports/gnome-45
@@ -1 +1 @@
-Subproject commit 6ce35b949a029034e15460a02edcc22e6029c279
+Subproject commit 91bcd82fc44a3bc44ec8e490b152fd77980c8e7b

From 0415a14ec81ee663d30ad47afdbad5f735707bdc Mon Sep 17 00:00:00 2001
From: wheaney <42350981+wheaney@users.noreply.github.com>
Date: Tue, 29 Apr 2025 10:43:40 -0700
Subject: [PATCH 2/3] Pull latest driver commit

---
 modules/XRLinuxDriver | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/XRLinuxDriver b/modules/XRLinuxDriver
index f614e6e..0d8e20d 160000
--- a/modules/XRLinuxDriver
+++ b/modules/XRLinuxDriver
@@ -1 +1 @@
-Subproject commit f614e6eae93ebfe1f6e690b8170f3f06bbd25413
+Subproject commit 0d8e20d62bdfbf1edcce4927761b25aa234fcd75

From bc2edc8d1cb024c93fd7a06692d60893a7aa48c6 Mon Sep 17 00:00:00 2001
From: wheaney <42350981+wheaney@users.noreply.github.com>
Date: Tue, 29 Apr 2025 11:27:24 -0700
Subject: [PATCH 3/3] Fix breakages in the breezydesktop and virtualdisplay bin
 files

---
 ui/src/breezydesktop.in  | 14 +++++++-------
 ui/src/virtualdisplay.in | 13 ++++++-------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/ui/src/breezydesktop.in b/ui/src/breezydesktop.in
index b23c408..f7446da 100755
--- a/ui/src/breezydesktop.in
+++ b/ui/src/breezydesktop.in
@@ -22,7 +22,13 @@
 import os
 import sys
 
-lib_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lib')
+xdg_data_home = os.getenv('XDG_DATA_HOME', os.path.join(os.path.expanduser('~'), '.local', 'share'))
+appdir = os.getenv('APPDIR', xdg_data_home) 
+locale_dir = os.path.join(appdir, 'locale')
+pkgdatadir = os.path.join(appdir, 'breezydesktop')
+sys.path.insert(1, pkgdatadir)
+
+lib_dir = os.path.join(pkgdatadir, 'breezydesktop', 'lib')
 sys.path.insert(0, lib_dir)
 
 import signal
@@ -31,12 +37,6 @@ import gettext
 
 VERSION = '@VERSION@'
 
-xdg_data_home = os.getenv('XDG_DATA_HOME', os.path.join(os.path.expanduser('~'), '.local', 'share'))
-appdir = os.getenv('APPDIR', xdg_data_home) 
-locale_dir = os.path.join(appdir, 'locale')
-pkgdatadir = os.path.join(appdir, 'breezydesktop')
-sys.path.insert(1, pkgdatadir)
-
 signal.signal(signal.SIGINT, signal.SIG_DFL)
 locale.textdomain('breezydesktop')
 locale.setlocale(locale.LC_ALL, locale.getlocale())
diff --git a/ui/src/virtualdisplay.in b/ui/src/virtualdisplay.in
index 882b148..7630de6 100755
--- a/ui/src/virtualdisplay.in
+++ b/ui/src/virtualdisplay.in
@@ -23,7 +23,12 @@ import logging
 import os
 import sys
 
-lib_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lib')
+xdg_data_home = os.getenv('XDG_DATA_HOME', os.path.join(os.path.expanduser('~'), '.local', 'share'))
+appdir = os.getenv('APPDIR', xdg_data_home) 
+pkgdatadir = os.path.join(appdir, 'breezydesktop')
+sys.path.insert(1, pkgdatadir)
+
+lib_dir = os.path.join(pkgdatadir, 'breezydesktop', 'lib')
 sys.path.insert(0, lib_dir)
 
 from logging.handlers import TimedRotatingFileHandler
@@ -52,12 +57,6 @@ import time
 
 VERSION = '@VERSION@'
 
-xdg_data_home = os.getenv('XDG_DATA_HOME', os.path.join(os.path.expanduser('~'), '.local', 'share'))
-appdir = os.getenv('APPDIR', xdg_data_home) 
-locale_dir = os.path.join(appdir, 'locale')
-pkgdatadir = os.path.join(appdir, 'breezydesktop')
-sys.path.insert(1, pkgdatadir)
-
 import gi
 
 gi.require_version('GLib', '2.0')