diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-09-10 20:11:56 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-09-10 20:11:56 +0800 |
| commit | 700331287348ddcc4c7b056537c26b0217182a1a (patch) | |
| tree | fd424e32098b8247861b2e034422514bea4b2942 /indra | |
| parent | a13b37daa590b11d151dd65b7ddd97d3ef85e801 (diff) | |
Make sure file picker works by pulling zenity
on remaining distros, with the assumption the distro is a minimal one
where the XDG portal may not necessarily be installed.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | indra/newview/PKGBUILD.in | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index f73bee07f9..e28297768c 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2448,10 +2448,10 @@ if (LINUX) set(CPACK_DEBIAN_PACKAGE_SECTION net CACHE STRING "Debian package section.") if (${LINUX_DISTRO} MATCHES debian) - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libalut0, libaprutil1t64, libboost-fiber1.83.0, libboost-filesystem1.83.0, libboost-program-options1.83.0, libboost-regex1.83.0, libboost-thread1.83.0, libboost-url1.83.0, libexpat1, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1t64, libnghttp2-14, libnspr4, libnss3, libopenjp2-7, libsdl3-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base" + set(CPACK_DEBIAN_PACKAGE_DEPENDS "libalut0, libaprutil1t64, libboost-fiber1.83.0, libboost-filesystem1.83.0, libboost-program-options1.83.0, libboost-regex1.83.0, libboost-thread1.83.0, libboost-url1.83.0, libexpat1, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1t64, libnghttp2-14, libnspr4, libnss3, libopenjp2-7, libsdl3-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base, zenity" CACHE STRING "Debian package dependencies.") else () - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libalut0, libaprutil1t64, libboost-fiber1.90.0, libboost-filesystem1.90.0, libboost-process1.90.0, libboost-program-options1.90.0, libboost-regex1.90.0, libboost-thread1.90.0, libboost-url1.90.0, libexpat1, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1t64, libnghttp2-14, libnspr4, libnss3, libopenjp2-7, libsdl3-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base" + set(CPACK_DEBIAN_PACKAGE_DEPENDS "libalut0, libaprutil1t64, libboost-fiber1.90.0, libboost-filesystem1.90.0, libboost-process1.90.0, libboost-program-options1.90.0, libboost-regex1.90.0, libboost-thread1.90.0, libboost-url1.90.0, libexpat1, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1t64, libnghttp2-14, libnspr4, libnss3, libopenjp2-7, libsdl3-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base, zenity" CACHE STRING "Debian package dependencies.") endif () elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed)) @@ -2469,10 +2469,10 @@ if (LINUX) set(CPACK_RPM_PACKAGE_DESCRIPTION ${VIEWER_PACKAGE_DESCRIPTION} CACHE STRING "RPM package description.") if (${LINUX_DISTRO} MATCHES fedora) - set(CPACK_RPM_PACKAGE_REQUIRES "freealut, apr-util, boost-fiber, boost-process, boost-program-options, boost-regex, boost-thread, boost-url, cef, expat, hunspell, minizip-ng-compat, libnghttp2, openjpeg, SDL3, vlc-libs, vlc-plugins-base, libvorbis" + set(CPACK_RPM_PACKAGE_REQUIRES "freealut, apr-util, boost-fiber, boost-process, boost-program-options, boost-regex, boost-thread, boost-url, cef, expat, hunspell, minizip-ng-compat, libnghttp2, openjpeg, SDL3, vlc-libs, vlc-plugins-base, libvorbis, zenity" CACHE STRING "RPM package requirements.") else () - set(CPACK_RPM_PACKAGE_REQUIRES "libalut0, libapr-util1-0, libboost_fiber1_91_0, libboost_process1_91_0, libboost_program_options1_91_0, libboost_regex1_91_0, libboost_thread1_91_0, libboost_url1_91_0, libboost_url1_91_0-x86-64-v3, libexpat1, libhunspell-1_7-0, libnghttp2-14, openjpeg2, libpng16-16, libSDL3-0, libvlc5, libvorbis0" + set(CPACK_RPM_PACKAGE_REQUIRES "libalut0, libapr-util1-0, libboost_fiber1_91_0, libboost_process1_91_0, libboost_program_options1_91_0, libboost_regex1_91_0, libboost_thread1_91_0, libboost_url1_91_0, libboost_url1_91_0-x86-64-v3, libexpat1, libhunspell-1_7-0, libnghttp2-14, openjpeg2, libpng16-16, libSDL3-0, libvlc5, libvorbis0, zenity" CACHE STRING "RPM package requirements.") endif () endif () diff --git a/indra/newview/PKGBUILD.in b/indra/newview/PKGBUILD.in index 5c7b7f827a..a4a191881b 100644 --- a/indra/newview/PKGBUILD.in +++ b/indra/newview/PKGBUILD.in @@ -6,7 +6,7 @@ pkgdesc="${VIEWER_PACKAGE_COMMENT}" arch=('${CMAKE_SYSTEM_PROCESSOR}') url="https://${VIEWER_PACKAGE_DOMAIN_NAME}" license=('LGPL-2.1') -depends=(freealut apr-util boost-libs hunspell libnghttp2 openjpeg2 sdl3 vlc libvorbis ${ARCH_DEPS}) +depends=(freealut apr-util boost-libs hunspell libnghttp2 openjpeg2 sdl3 vlc libvorbis zenity ${ARCH_DEPS}) package() { cd "$startdir" |
