From f542a6676b595814788de1c8683c3ca0380f5827 Mon Sep 17 00:00:00 2001 From: Gilgamesh Athoraya Date: Fri, 12 Jul 2024 14:40:55 +0200 Subject: [PATCH] Merge pull request #1237 from Dyalog/1236_dependencies (#1239) Add dependencies for ubuntu 24.04, fix #1236 --- CI/packagescripts/linux/packageLinux.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CI/packagescripts/linux/packageLinux.sh b/CI/packagescripts/linux/packageLinux.sh index 77c25313..6f9bf7fb 100755 --- a/CI/packagescripts/linux/packageLinux.sh +++ b/CI/packagescripts/linux/packageLinux.sh @@ -146,9 +146,9 @@ createDEB() { -C ${SBOXDIR} \ -d 'libc6 >= 2.17' \ -d 'libnss3 >= 3.26' \ + -d 'libgbm1' \ -d 'libgtk-3-0' \ -d 'libxss1' \ - -d 'libgconf-2-4' \ -d 'libasound2' \ -d 'libx11-xcb1' \ --license "MIT" \ @@ -187,8 +187,8 @@ createRPM() { -C ${SBOXDIR} \ -d 'libc.so.6(GLIBC_2.17)(64bit)' \ -d 'libXss.so.1()(64bit)' \ + -d 'libgbm.so.1()(64bit)' \ -d 'libgtk-3.so.0()(64bit)' \ - -d 'libgconf-2.so.4()(64bit)' \ -d 'libasound.so.2()(64bit)' \ -d 'libnss3.so()(64bit)' \ -d 'libX11-xcb.so.1()(64bit)' \ @@ -242,6 +242,7 @@ for CPUTYPE in x64 armv7l ; do #find "${SBOXDIR}" -name ".git*" | xargs rm -r # for lintian find "${SBOXDIR}" -type f "(" -name ".*" -o -name "*.c" ")" | xargs rm # for rpmlint find "${SBOXDIR}" -xtype l | xargs rm -f # remove dangling symlinks, for rpmlint + chmod 4755 ${SBOXDIR}/opt/ride-${BASE_VERSION}/chrome-sandbox mkdir -p ${SBOXDIR}/usr/share/icons/hicolor/scalable/apps cp "$ICON" ${SBOXDIR}/usr/share/icons/hicolor/scalable/apps/ride${BASE_VERSION_ND}.svg