From cb9cd84b0e8f988fda136130bcb9e59cab934eaf Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sat, 4 Jul 2026 13:29:25 +0800
Subject: Use packaged Debian 13 FLTK 1.4 for Flatpak

See commit 21ef63545ca07ef625edb742b2b3d1473bf33f13
---
 autobuild.xml        |  2 +-
 indra/cmake/UI.cmake | 27 ++++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index fe9f9d6aaa..7184b72acb 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -52,7 +52,7 @@
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-fltk/releases/download/v1.3.9-r1/fltk-1.3.9.8556992788-linux64-8556992788.tar.zst</string>
+              <string>https://megapahit.net/downloads/fltk-1.4.3-linux64.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux</string>
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index a5e6971248..24dc121533 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -15,10 +15,10 @@ if (LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD)
     return()
   endif()
 
-  if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu))
+  if (USE_FLATPAK OR (${LINUX_DISTRO} MATCHES debian) OR (${LINUX_DISTRO} MATCHES ubuntu))
     include(FindPkgConfig)
-    pkg_check_modules(Cairo REQUIRED cairo)
-    target_include_directories(ll::uilibraries SYSTEM INTERFACE ${Cairo_INCLUDE_DIRS})
+    pkg_check_modules(CAIRO REQUIRED cairo)
+    target_include_directories(ll::uilibraries SYSTEM INTERFACE ${CAIRO_INCLUDE_DIRS})
   endif ()
 
   target_link_libraries( ll::uilibraries INTERFACE
@@ -58,4 +58,25 @@ if (USE_FLATPAK)
 target_include_directories( ll::uilibraries SYSTEM INTERFACE
         ${LIBS_PREBUILT_DIR}/include
         )
+  pkg_check_modules(CAIRO-XLIB REQUIRED cairo-xlib)
+  pkg_check_modules(DBUS-1 REQUIRED dbus-1)
+  pkg_check_modules(LIBDECOR-0 REQUIRED libdecor-0)
+  pkg_check_modules(PANGO REQUIRED pango)
+  pkg_check_modules(PANGOCAIRO REQUIRED pangocairo)
+  pkg_check_modules(WAYLAND-CLIENT REQUIRED wayland-client)
+  pkg_check_modules(WAYLAND-CURSOR REQUIRED wayland-cursor)
+  pkg_check_modules(XKBCOMMON REQUIRED xkbcommon)
+  pkg_check_modules(XKBCOMMON-X11 REQUIRED xkbcommon-x11)
+  target_link_libraries(ll::uilibraries INTERFACE
+        ${CAIRO_LIBRARIES}
+        ${CAIRO-XLIB_LIBRARIES}
+        ${DBUS-1_LIBRARIES}
+        ${LIBDECOR-0_LIBRARIES}
+        ${PANGO_LIBRARIES}
+        ${PANGOCAIRO_LIBRARIES}
+        ${WAYLAND-CLIENT_LIBRARIES}
+        ${WAYLAND-CURSOR_LIBRARIES}
+        ${XKBCOMMON_LIBRARIES}
+        ${XKBCOMMON-X11_LIBRARIES}
+        )
 endif ()
-- 
cgit v1.3