mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: ubuntu 24.04 build using libwebkit2gtk-4.1-dev 

JIRA: STUDIO-4377
GITHUB: #2429
Change-Id: Ia153a6d387e8ebc7da19d5ba7bd5012aea8ed93c
(cherry picked from commit ce5ff82781bde579acaeb2d8cae69e9825549983)
This commit is contained in:
Mack 2024-06-27 14:19:57 +08:00 committed by Lane.Wei
parent 60d5124cdc
commit 6cdf257160
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
BuildLinux.sh
View File

@ -101,20 +101,23 @@ then
echo -e "\nFind libgtk-3, installing: libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev cmake git\n" echo -e "\nFind libgtk-3, installing: libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev cmake git\n"
apt install -y libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev cmake git apt install -y libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev cmake git
fi fi
# for ubuntu 22.04: # for ubuntu:
ubu_version="$(cat /etc/issue)" ubu_version="$(cat /etc/issue)"
if [[ $ubu_version == "Ubuntu 22.04"* ]] if [[ $ubu_version == "Ubuntu 22.04"* ]]
then then
apt install -y curl libssl-dev libcurl4-openssl-dev m4 apt install -y curl libssl-dev libcurl4-openssl-dev m4 libwebkit2gtk-4.0-dev
elif [[ $ubu_version == "Ubuntu 24.04"* ]] elif [[ $ubu_version == "Ubuntu 24.04"* ]]
then then
NEW_SOURCE="deb http://gb.archive.ubuntu.com/ubuntu jammy main" # NEW_SOURCE="deb http://gb.archive.ubuntu.com/ubuntu jammy main"
if grep -qF -- "$NEW_SOURCE" /etc/apt/sources.list; then # if grep -qF -- "$NEW_SOURCE" /etc/apt/sources.list; then
echo "source exist: $NEW_SOURCE" # echo "source exist: $NEW_SOURCE"
else # else
echo "$NEW_SOURCE" | sudo tee -a /etc/apt/sources.list > /dev/null # echo "$NEW_SOURCE" | sudo tee -a /etc/apt/sources.list > /dev/null
fi # fi
apt update # apt update
apt install -y libwebkit2gtk-4.1-dev
else
apt install -y libwebkit2gtk-4.0-dev
fi fi
if [[ -n "$BUILD_DEBUG" ]] if [[ -n "$BUILD_DEBUG" ]]
then then
@ -123,7 +126,7 @@ then
fi fi
# Addtional Dev packages for BambuStudio # Addtional Dev packages for BambuStudio
export REQUIRED_DEV_PACKAGES="libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules" export REQUIRED_DEV_PACKAGES="libgstreamerd-3-dev libsecret-1-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules"
# libwebkit2gtk-4.1-dev ?? # libwebkit2gtk-4.1-dev ??
export DEV_PACKAGES_COUNT=$(echo ${REQUIRED_DEV_PACKAGES} | wc -w) export DEV_PACKAGES_COUNT=$(echo ${REQUIRED_DEV_PACKAGES} | wc -w)
if [ $(dpkg --get-selections | grep -E "$(echo ${REQUIRED_DEV_PACKAGES} | tr ' ' '|')" | wc -l) -lt ${DEV_PACKAGES_COUNT} ]; then if [ $(dpkg --get-selections | grep -E "$(echo ${REQUIRED_DEV_PACKAGES} | tr ' ' '|')" | wc -l) -lt ${DEV_PACKAGES_COUNT} ]; then