fix(epic): provide desktop GLib data paths

This commit is contained in:
maxjivi05 committed 2026-11-10 07:32:16 -05:00
1 parent 7309e2f63d
commit bb1996c715
2 files changed
+11 -4

No files matched your search

@@ -75,8 +75,8 @@ APP_BIN = "usr/bin/EpicGamesLauncher"
DEB_ICON = "usr/share/icons/hicolor/256x256@2/apps/EpicGamesLauncher.png"
ICON = "epic-games-launcher.png"
DESKTOP = "desktop"
DESKTOP_KEEP = "usr/lib/x86_64-linux-gnu/"
DESKTOP_LIB = DESKTOP + "/" + DESKTOP_KEEP.rstrip("/")
DESKTOP_KEEP = ("usr/lib/x86_64-linux-gnu/", "usr/share/glib-2.0/schemas/")
DESKTOP_LIB = DESKTOP + "/usr/lib/x86_64-linux-gnu"
WEBKIT_DIR = "webkit2gtk-4.1"
WEBKIT_LIB = "libwebkit2gtk-4.1.so.0"
SKIPPED = ("lib/i386-linux-gnu", "lib32", "libx32", "i686-pc-linux-gnu", "share/doc", "include")
@@ -400,7 +400,7 @@ def extract_app(image, dest, desktop=()):
for package in desktop:
if not is_deb(package):
raise Failure("desktop-format")
extract_deb(package, layer, lambda name: name.startswith(DESKTOP_KEEP))
extract_deb(package, layer, lambda name: any(name.startswith(prefix) for prefix in DESKTOP_KEEP))
icon = os.path.join(staging, DEB_ICON)
if os.path.isfile(icon):
shutil.copyfile(icon, os.path.join(staging, ICON))
@@ -818,6 +818,9 @@ def client_environment(base, fex, files, display, bus, broker, a11y=None, hidden
env["PATH"] = SHIMS + ":/usr/bin:/bin"
if libs:
env["LD_LIBRARY_PATH"] = libs
data = os.path.normpath(os.path.join(os.path.dirname(libs), "..", "share"))
env["XDG_DATA_DIRS"] = data + ":/usr/local/share:/usr/share"
env["GSETTINGS_SCHEMA_DIR"] = os.path.join(data, "glib-2.0", "schemas")
env["DISPLAY"] = display
env["DBUS_SESSION_BUS_ADDRESS"] = bus
env[BROKER_ENV] = broker
+5 -1
View File
@@ -234,6 +234,7 @@ class LauncherDebTest(EpicTestCase):
("./usr/lib/x86_64-linux-gnu/libwebkit2gtk-4.1.so.0", {"link": "libwebkit2gtk-4.1.so.0.19.1"}),
("./usr/lib/x86_64-linux-gnu/webkit2gtk-4.1/WebKitNetworkProcess", {"data": b"net", "mode": 0o755}),
("./usr/lib/x86_64-linux-gnu/webkit2gtk-4.1/injected-bundle/libwebkit2gtkinjectedbundle.so", {"data": b"bundle"}),
("./usr/share/glib-2.0/schemas/org.gnome.GWeather4.gschema.xml", {"data": b"schema"}),
("./usr/share/doc/libwebkit2gtk-4.1-0/copyright", {"data": b"c"}),
("./usr/share/locale/fr/LC_MESSAGES/WebKitGTK-4.1.mo", {"data": b"fr"}),
], "xz")
@@ -249,7 +250,8 @@ class LauncherDebTest(EpicTestCase):
libs = dest / "desktop/usr/lib/x86_64-linux-gnu"
self.assertEqual(b"webkit", (libs / "libwebkit2gtk-4.1.so.0").read_bytes())
self.assertEqual(b"net", (libs / "webkit2gtk-4.1/WebKitNetworkProcess").read_bytes())
self.assertFalse((dest / "desktop/usr/share").exists())
self.assertEqual(b"schema", (dest / "desktop/usr/share/glib-2.0/schemas/org.gnome.GWeather4.gschema.xml").read_bytes())
self.assertFalse((dest / "desktop/usr/share/doc").exists())
self.assertFalse((self.state / "app/escape").exists())
self.assertFalse((self.state / "app/0.113.0+g1.staging").exists())
self.assertTrue(G["app_complete"](str(dest)))
@@ -315,6 +317,8 @@ class LauncherDebTest(EpicTestCase):
layered = G["client_environment"]({}, None, None, ":0", "bus", "broker", libs="/app/desktop/usr/lib/x86_64-linux-gnu")
self.assertNotIn("LD_LIBRARY_PATH", plain)
self.assertEqual("/app/desktop/usr/lib/x86_64-linux-gnu", layered["LD_LIBRARY_PATH"])
self.assertEqual("/app/desktop/usr/share:/usr/local/share:/usr/share", layered["XDG_DATA_DIRS"])
self.assertEqual("/app/desktop/usr/share/glib-2.0/schemas", layered["GSETTINGS_SCHEMA_DIR"])
def test_every_desktop_package_reaches_the_install(self):
options, rest = G["parse_options"](["--app", "a.deb", "--desktop", "one.deb", "--desktop", "two.deb", "x"], lists=("desktop",))