Skip to content

Commit

Permalink
New cutter-deps build.
Browse files Browse the repository at this point in the history
  • Loading branch information
karliss committed Jan 17, 2025
1 parent e96959b commit 85bb50b
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 13 deletions.
1 change: 0 additions & 1 deletion .github/actions/build-linux-old/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ then
locale -a
export LANG="C.UTF-8"
export LC_ALL="C.UTF-8"
echo "python prefix!!!!!!! ($CUTTER_DEPS_PYTHON_PREFIX)"
cmake \
-G Ninja \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
7 changes: 0 additions & 7 deletions scripts/appimage_embed_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,7 @@ if ! [[ $# -eq 2 ]]; then
exit 1
fi

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

echo "pprefix $python_prefix"
ls /github/workspace/cutter-deps/
ls "$python_prefix"
ls "$python_prefix/bin"
python_version=`$python_prefix/bin/python3 --version`
python_version=${python_version##* }
python_version=python${python_version%.*}
Expand Down
6 changes: 1 addition & 5 deletions scripts/fetch_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ DEPS_BASE_URL=https://github.com/rizinorg/cutter-deps/releases/download/v16

if [ "$CUTTER_QT" == "5" ]; then
DEPS_FILE_linux_x86_64=cutter-deps-q5-linux-x86_64.tar.gz
DEPS_SHA256_linux_x86_64=93636941493a19db8857c89f1f29c588b83ecebf283cc4489642ac50f46fef20
DEPS_SHA256_linux_x86_64=3e86eb1c13b30b8f3908c6c8f38ca49287ccc110380b0810b534e6ebd7659bec
DEPS_BASE_URL=https://github.com/karliss/cutter-deps/releases/download/qt6-test
else
DEPS_FILE_linux_x86_64=cutter-deps-linux-x86_64.tar.gz
Expand Down Expand Up @@ -60,10 +60,6 @@ echo "$DEPS_SHA256 $DEPS_FILE" | ${SHA256SUM} -c - || exit 1
tar -xf "$DEPS_FILE" || exit 1

if [ -f relocate.sh ]; then
echo "-----------before relocate"
cat ./python/lib/pkgconfig/* || true
./relocate.sh || exit 1
echo "-----------after relocate"
cat ./python/lib/pkgconfig/* || true
fi

0 comments on commit 85bb50b

Please sign in to comment.