diff --git a/Golden_Repo/x/xpra/xpra-4.3.2-GCCcore-11.2.0.eb b/Golden_Repo/x/xpra/xpra-4.3.2-GCCcore-11.2.0.eb index b3051bd0f860936e34bba6bb7021b82c4bcee5ea..b7ec9ecfb7a2aea98b213ed2c3927bdf2f55f372 100644 --- a/Golden_Repo/x/xpra/xpra-4.3.2-GCCcore-11.2.0.eb +++ b/Golden_Repo/x/xpra/xpra-4.3.2-GCCcore-11.2.0.eb @@ -93,12 +93,12 @@ exts_list = [ ('source_tmpl', 'v%(version)s.tar.gz'), ('patches', [ 'xpra-4.0.4-use_Xorg_on_PATH_first.patch', - 'xpra-add-XPRA_SYSCONF_DIR.patch', + 'xpra-iconsearch-XDG_DATA_DIRS.patch', ]), ('checksums', [ ('sha256', '1e548b8d20c243fba40692abb0aa2759e3bd3f2d3b6b51a160f82746cdf1d782'), ('sha256', '83053938421de4dfd4ff8cd5430414180e9f33d5c59b4f1c1428095db6b1fa71'), - ('sha256', 'cdef1de0b941b25cfdfdac11f36b6548febcbd76116761a05f3db3839c33d059'), + ('sha256', '7bb677302308dacdc55f9a862b6eee43f0a8d2b4524a8dec6d80bcdf3982d6af'), ]), ('use_pip', False), ('buildopts', '--without-strict --with-nvenc --with-nvjpeg --with-Xdummy'), @@ -110,7 +110,7 @@ exts_list = [ ('patches', ['xprahtml-4.5.2-encryptionfix.patch']), ('checksums', [ ('sha256', '7f4ccea864fdfb8d6c71a77100fcb2ad07af0773eaafc528ec19ff8187d9bfdb'), - ('sha256', '252ce94ac3079c0d4db7a10862fe690ef0dd46ccdf36780bc917b5ff49205eb0'), + ('sha256', 'be0b430f7e6970eb35912c5c2cc7fb9f2073f94485c12776d06752cf8c0f6023'), ]), ('use_pip', False), ('skipsteps', ['configure', 'build', 'install']), # install in postinstallcmds @@ -156,7 +156,7 @@ postinstallcmds = [ ] modextravars = { - 'XPRA_SYSCONF_DIR' : '%(installdir)s/etc/xpra', + 'XPRA_SYSTEM_CONF_DIRS' : '%(installdir)s/etc/xpra', } modextrapaths = { 'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages'], diff --git a/Golden_Repo/x/xpra/xpra-add-XPRA_SYSCONF_DIR.patch b/Golden_Repo/x/xpra/xpra-iconsearch-XDG_DATA_DIRS.patch similarity index 59% rename from Golden_Repo/x/xpra/xpra-add-XPRA_SYSCONF_DIR.patch rename to Golden_Repo/x/xpra/xpra-iconsearch-XDG_DATA_DIRS.patch index a8d11897c6fc88307956c0e022cd425d3a894d70..f5afb0bbd1c9d32b75e92354286d7a87dd04343d 100644 --- a/Golden_Repo/x/xpra/xpra-add-XPRA_SYSCONF_DIR.patch +++ b/Golden_Repo/x/xpra/xpra-iconsearch-XDG_DATA_DIRS.patch @@ -21,18 +21,3 @@ diff -Naur xpra.orig/xpra/platform/xposix/menu_helper.py xpra/xpra/platform/xpos for f in os.listdir(d): if not f.endswith(".desktop"): continue -diff -Naur xpra.orig/xpra/platform/xposix/paths.py xpra/xpra/platform/xposix/paths.py ---- a/xpra.orig/xpra/platform/xposix/paths.py 2022-03-30 23:59:37.275482000 +0200 -+++ a/xpra/xpra/platform/xposix/paths.py 2022-03-31 00:00:57.851713000 +0200 -@@ -80,7 +80,10 @@ - - - def do_get_system_conf_dirs(): -- dirs = ["/etc/xpra", "/usr/local/etc/xpra"] -+ if os.environ.get("XPRA_SYSCONF_DIR") is not None: -+ dirs = [os.environ.get("XPRA_SYSCONF_DIR")] -+ else: -+ dirs = ["/etc/xpra", "/usr/local/etc/xpra"] - for d in os.environ.get("XDG_CONFIG_DIRS", "/etc/xdg").split(":"): - dirs.append(os.path.join(d, "xpra")) - #hope the prefix is something like "/usr/local" or "$HOME/.local":