From 8e435dff1614cef20e7ff63d946c1b04c11cea25 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 9 Dec 2021 22:28:11 +0530
Subject: [PATCH] Update the version of Ubuntu the kitty binaries are built on
 to Bionic

The upgrade was needed as I couldn't get Xenial to boot in the QEMU VM.
In any case Bionic is now three years old and comes with GLIBC 2.27
released on 2018-02-01 which will be almost four years old when the next
version of kitty is released.
---
 bypy/linux.conf | 2 +-
 setup.py        | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bypy/linux.conf b/bypy/linux.conf
index a222fbc36..de2900c3a 100644
--- a/bypy/linux.conf
+++ b/bypy/linux.conf
@@ -1,3 +1,3 @@
-image 'https://partner-images.canonical.com/core/xenial/current/ubuntu-xenial-core-cloudimg-{}-root.tar.gz'
+image 'https://cloud-images.ubuntu.com/releases/bionic/release/ubuntu-18.04-server-cloudimg-{}.img'
 
 deps 'bison flex libxcursor-dev libxrandr-dev libxi-dev libxinerama-dev libgl1-mesa-dev libxcb-xkb-dev libfontconfig1-dev libdbus-1-dev'
diff --git a/setup.py b/setup.py
index 98873dc60..0535f5565 100755
--- a/setup.py
+++ b/setup.py
@@ -870,7 +870,10 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's
     for path in args.extra_include_dirs:
         cflags.append(f'-I{path}')
     if bundle_type == 'linux-freeze':
-        ldflags += ['-Wl,-rpath,$ORIGIN/../lib']
+        # --disable-new-dtags prevents -rpath from generating RUNPATH instead of
+        # RPATH entries in the launcher. The ld dynamic linker does not search
+        # RUNPATH locations for transitive dependencies, unlike RPATH.
+        ldflags += ['-Wl,--disable-new-dtags', '-Wl,-rpath,$ORIGIN/../lib']
     os.makedirs(launcher_dir, exist_ok=True)
     dest = os.path.join(launcher_dir, 'kitty')
     src = 'launcher.c'