From b5893b43a7731a8d2f92e942bf51c7e818303c76 Mon Sep 17 00:00:00 2001 From: Karliss Date: Fri, 17 Jan 2025 01:42:17 +0200 Subject: [PATCH 1/7] Update qt5 cutter-deps. (testing) --- scripts/fetch_deps.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/fetch_deps.sh b/scripts/fetch_deps.sh index b74fbb877..4dd2bc5a7 100755 --- a/scripts/fetch_deps.sh +++ b/scripts/fetch_deps.sh @@ -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=93636941493a19db8857c89f1f29c588b83ecebf283cc4489642ac50f46fef20 + 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 DEPS_SHA256_linux_x86_64=f63c5af2d9872bc6538a94c839d6ef6645c7630c42cff30f1d9da8eefd9eb040 From 865a73e946de362281178fe0457f72c65b3980f0 Mon Sep 17 00:00:00 2001 From: Karliss Date: Fri, 17 Jan 2025 02:00:52 +0200 Subject: [PATCH 2/7] Use same LLVM version as cutter-deps build. --- .github/actions/build-linux-old/entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/build-linux-old/entrypoint.sh b/.github/actions/build-linux-old/entrypoint.sh index a15249382..cbe774c4e 100755 --- a/.github/actions/build-linux-old/entrypoint.sh +++ b/.github/actions/build-linux-old/entrypoint.sh @@ -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 From 887d42c8cc60124e0890ff951f5815d3ba8d3413 Mon Sep 17 00:00:00 2001 From: Karliss Date: Fri, 17 Jan 2025 02:22:14 +0200 Subject: [PATCH 3/7] Debug python bundling problems. --- .github/actions/build-linux-old/entrypoint.sh | 1 + scripts/appimage_embed_python.sh | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/.github/actions/build-linux-old/entrypoint.sh b/.github/actions/build-linux-old/entrypoint.sh index cbe774c4e..2ed9769cf 100755 --- a/.github/actions/build-linux-old/entrypoint.sh +++ b/.github/actions/build-linux-old/entrypoint.sh @@ -117,6 +117,7 @@ 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 \ diff --git a/scripts/appimage_embed_python.sh b/scripts/appimage_embed_python.sh index 069f777ce..3beceba7b 100755 --- a/scripts/appimage_embed_python.sh +++ b/scripts/appimage_embed_python.sh @@ -7,8 +7,13 @@ if ! [[ $# -eq 2 ]]; then exit 1 fi +pwd +ls python_prefix=$(pkg-config --variable=prefix python3) +echo "pprefix $python_prefix" +ls "$python_prefix" +ls "$python_prefix/bin" python_version=`$python_prefix/bin/python3 --version` python_version=${python_version##* } python_version=python${python_version%.*} From e96959bdcde1eaa1b211237d9d327f25879d7cad Mon Sep 17 00:00:00 2001 From: Karliss Date: Fri, 17 Jan 2025 02:56:04 +0200 Subject: [PATCH 4/7] More debug output. --- scripts/appimage_embed_python.sh | 1 + scripts/fetch_deps.sh | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/scripts/appimage_embed_python.sh b/scripts/appimage_embed_python.sh index 3beceba7b..c1e08382d 100755 --- a/scripts/appimage_embed_python.sh +++ b/scripts/appimage_embed_python.sh @@ -12,6 +12,7 @@ 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` diff --git a/scripts/fetch_deps.sh b/scripts/fetch_deps.sh index 4dd2bc5a7..c28c7efff 100755 --- a/scripts/fetch_deps.sh +++ b/scripts/fetch_deps.sh @@ -60,6 +60,10 @@ 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 From 85bb50b6670b55fca929e9bc1924fa9e0fdff624 Mon Sep 17 00:00:00 2001 From: Karliss Date: Fri, 17 Jan 2025 04:13:36 +0200 Subject: [PATCH 5/7] New cutter-deps build. --- .github/actions/build-linux-old/entrypoint.sh | 1 - scripts/appimage_embed_python.sh | 7 ------- scripts/fetch_deps.sh | 6 +----- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/actions/build-linux-old/entrypoint.sh b/.github/actions/build-linux-old/entrypoint.sh index 2ed9769cf..cbe774c4e 100755 --- a/.github/actions/build-linux-old/entrypoint.sh +++ b/.github/actions/build-linux-old/entrypoint.sh @@ -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 \ diff --git a/scripts/appimage_embed_python.sh b/scripts/appimage_embed_python.sh index c1e08382d..70aa6e2eb 100755 --- a/scripts/appimage_embed_python.sh +++ b/scripts/appimage_embed_python.sh @@ -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%.*} diff --git a/scripts/fetch_deps.sh b/scripts/fetch_deps.sh index c28c7efff..d6d807e36 100755 --- a/scripts/fetch_deps.sh +++ b/scripts/fetch_deps.sh @@ -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 @@ -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 From 02e89ddc31ec16cb3de5fb32fbafcca0b0bb9ccb Mon Sep 17 00:00:00 2001 From: Karliss Date: Fri, 17 Jan 2025 12:06:39 +0200 Subject: [PATCH 6/7] Debug relocate2. --- scripts/fetch_deps.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/fetch_deps.sh b/scripts/fetch_deps.sh index d6d807e36..fade51010 100755 --- a/scripts/fetch_deps.sh +++ b/scripts/fetch_deps.sh @@ -60,6 +60,11 @@ echo "$DEPS_SHA256 $DEPS_FILE" | ${SHA256SUM} -c - || exit 1 tar -xf "$DEPS_FILE" || exit 1 if [ -f relocate.sh ]; then + echo " before relocate" + cat relocate.sh + cat ./python/lib/pkgconfig/* ./relocate.sh || exit 1 + echo " after relocate" + cat ./python/lib/pkgconfig/* fi From 0d7ed46b8efe656e556ecdd68bfd88c1a93e7a2d Mon Sep 17 00:00:00 2001 From: Karliss Date: Fri, 17 Jan 2025 12:14:49 +0200 Subject: [PATCH 7/7] Update deps again. --- scripts/fetch_deps.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/fetch_deps.sh b/scripts/fetch_deps.sh index fade51010..6cd2ced80 100755 --- a/scripts/fetch_deps.sh +++ b/scripts/fetch_deps.sh @@ -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=3e86eb1c13b30b8f3908c6c8f38ca49287ccc110380b0810b534e6ebd7659bec + DEPS_SHA256_linux_x86_64=77ca64ed9565aacb182d7464452eaa8a6e13fdb32f9e852b54c86ba06ba01158 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 @@ -60,11 +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 relocate.sh - cat ./python/lib/pkgconfig/* ./relocate.sh || exit 1 - echo " after relocate" - cat ./python/lib/pkgconfig/* fi