Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update qt5 cutter-deps for linux #3404

Merged
merged 9 commits into from
Jan 28, 2025
Merged

Update qt5 cutter-deps for linux #3404

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b5893b4
Update qt5 cutter-deps. (testing)
karliss Jan 16, 2025
865a73e
Use same LLVM version as cutter-deps build.
karliss Jan 17, 2025
887d42c
Debug python bundling problems.
karliss Jan 17, 2025
e96959b
More debug output.
karliss Jan 17, 2025
85bb50b
New cutter-deps build.
karliss Jan 17, 2025
02e89dd
Debug relocate2.
karliss Jan 17, 2025
0d7ed46
Update deps again.
karliss Jan 17, 2025
4049661
Update URL.
karliss Jan 27, 2025
9cc18d5
Revert unintentional changes.
karliss Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/actions/build-linux-old/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ if [ "$image" = "ubuntu:18.04" ]; then
libglu1-mesa-dev \
freeglut3-dev \
mesa-common-dev \
libclang-8-dev \
llvm-8
ln -s /usr/bin/llvm-config-8 /usr/bin/llvm-config
libclang-10-dev \
llvm-10
ln -s /usr/bin/llvm-config-10 /usr/bin/llvm-config
fi
if [ "$image" = "ubuntu:18.04" ] || [ "$image" = "ubuntu:20.04" ]; then
# install additional packages needed for appimage
Expand Down
1 change: 0 additions & 1 deletion scripts/appimage_embed_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ if ! [[ $# -eq 2 ]]; then
fi

python_prefix=$(pkg-config --variable=prefix python3)

karliss marked this conversation as resolved.
Show resolved Hide resolved
python_version=`$python_prefix/bin/python3 --version`
python_version=${python_version##* }
python_version=python${python_version%.*}
Expand Down
6 changes: 3 additions & 3 deletions scripts/fetch_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ mkdir -p cutter-deps && cd cutter-deps
DEPS_BASE_URL=https://github.com/rizinorg/cutter-deps/releases/download/v16

if [ "$CUTTER_QT" == "5" ]; then
DEPS_FILE_linux_x86_64=cutter-deps-linux-x86_64.tar.gz
DEPS_SHA256_linux_x86_64=0721c85548bbcf31f6911cdb2227e5efb4a20c34262672d4cd2193db166b2f8c
DEPS_BASE_URL=https://github.com/rizinorg/cutter-deps/releases/download/v15
DEPS_FILE_linux_x86_64=cutter-deps-q5-linux-x86_64.tar.gz
DEPS_SHA256_linux_x86_64=ab3099fe699db100f2d00e1b70cdf77dec6b8fdd9cd1709c96e123a15fb62571
DEPS_BASE_URL=https://github.com/rizinorg/cutter-deps/releases/download/qt5-v17
else
DEPS_FILE_linux_x86_64=cutter-deps-linux-x86_64.tar.gz
DEPS_SHA256_linux_x86_64=f63c5af2d9872bc6538a94c839d6ef6645c7630c42cff30f1d9da8eefd9eb040
Expand Down
Loading