Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 18 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ jobs:
cc-override: '/usr/bin/gcc-12'
cxx-override: '/usr/bin/g++-12'
- name: linux-x86_64 # main Appimage build
image: ubuntu:20.04
python-version: 3.6.x
image: ubuntu:24.04
python-version: 3.12.x
system-deps: false
package: true
tarball: false
- name: tarball
python-version: 3.6.x
image: ubuntu:20.04
python-version: 3.12.x
image: ubuntu:24.04
system-deps: false
package: false
tarball: true
Expand Down Expand Up @@ -126,20 +126,26 @@ jobs:
llvm-8
ln -s /usr/bin/llvm-config-8 /usr/bin/llvm-config
fi
if [ "${{ matrix.image }}" = "ubuntu:18.04" ] || [ "${{ matrix.image }}" = "ubuntu:20.04" ]; then
if [ "${{ matrix.image }}" = "ubuntu:18.04" ] || [ "${{ matrix.image }}" = "ubuntu:24.04" ]; then
# install additional packages needed for appimage
apt-get -y install libxcb1-dev \
libxkbcommon-dev \
libxcb-*-dev \
libegl1
fi
if [ "${{ matrix.image }}" = "ubuntu:20.04" ] && [ "${{ matrix.system-deps }}" = "false" ]; then
if [ "${{ matrix.image }}" = "ubuntu:24.04" ] && [ "${{ matrix.system-deps }}" = "false" ]; then
# install additional packages needed for appimage
apt-get -y install libclang-12-dev \
llvm-12 \
libsm6 \
libwayland-dev \
libgl1-mesa-dev
lsb-release \
wget \
software-properties-common
curl -O https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
./llvm.sh 20
fi
if [ "${{ matrix.image }}" = "ubuntu:18.04" ] && [ "${{ matrix.system-deps }}" = "true" ]; then
apt-get -y install qt5-default \
Expand Down Expand Up @@ -169,7 +175,7 @@ jobs:
python3 --version
which python3
# https://github.com/rizinorg/cutter/runs/7170222817?check_suite_focus=true
python3 -m pip install meson==0.61.5
python3 -m pip install meson # ==0.61.5
- name: Prepare package id
shell: bash
run: |
Expand All @@ -188,6 +194,7 @@ jobs:
then
CUTTER_QT="${{ matrix.qt-major }}" scripts/fetch_deps.sh
. cutter-deps/env.sh
ln -sf "$PWD/cutter-deps/pyside/share/PySide6/"* "$PWD/cutter-deps/pyside/"
export LD_LIBRARY_PATH="`llvm-config --libdir`:$LD_LIBRARY_PATH"
fi
set -e #TODO: move to top once cutter-deps doesn't fail
Expand Down Expand Up @@ -437,6 +444,7 @@ jobs:
brew bundle
brew install pkg-config || brew link --overwrite pkgconf
brew install kadwanev/brew/retry
brew install llvm@20 && brew link llvm@20
- name: py dependencies
run: |
#python3 -m pip install -U pip==21.3.1
Expand All @@ -459,8 +467,9 @@ jobs:
run: |
export MACOSX_DEPLOYMENT_TARGET=10.15
scripts/fetch_deps.sh
install_name_tool -delete_rpath /Users/runner/work/cutter-deps/cutter-deps/qt/lib ./cutter-deps/pyside/lib/libpyside6.cpython-312-darwin.6.7.2.dylib #TODO: do this in cutter-deps
install_name_tool -delete_rpath /Users/runner/work/cutter-deps/cutter-deps/qt/lib ./cutter-deps/pyside/lib/libpyside6.cpython-312-darwin.6.11.dylib #TODO: do this in cutter-deps
source cutter-deps/env.sh
ln -sf "$PWD/cutter-deps/pyside/share/PySide6/"* "$PWD/cutter-deps/pyside/"
set -euo pipefail
export PATH=/usr/local/opt/llvm/bin:$PATH
mkdir build
Expand Down Expand Up @@ -503,6 +512,7 @@ jobs:
run: |
pip install ninja
scripts/fetch_deps.sh
ln -sf "$PWD/cutter-deps/pyside/share/PySide6/"* "$PWD/cutter-deps/pyside/"
choco install winflexbison3
- name: windows cmake
if: contains(matrix.os, 'windows')
Expand Down
10 changes: 5 additions & 5 deletions scripts/fetch_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@ set -e
cd $(dirname "${BASH_SOURCE[0]}")/..
mkdir -p cutter-deps && cd cutter-deps

DEPS_BASE_URL=https://github.com/rizinorg/cutter-deps/releases/download/v16
DEPS_BASE_URL=https://github.com/premades/cutter-deps/releases/download/v2

if [ "$CUTTER_QT" == "5" ]; then
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
DEPS_SHA256_linux_x86_64=019b12730b55d57c8352b1b2603ce009b3c837cb78d1f7594d557ce26815fa2e
fi
echo $DEPS_SHA256_linux_x86_64

DEPS_FILE_macos_x86_64=cutter-deps-macos-x86_64.tar.gz
DEPS_SHA256_macos_x86_64=bcdc214e34dc3fd720327ad42e03fe3ec996ca28a9987e99898f149a65299a8c
DEPS_SHA256_macos_x86_64=4713ca125fdb56ff788aa50b94abf12af1342fd8bb5851c1f79a905431144699

DEPS_FILE_macos_arm64=cutter-deps-macos-arm64.tar.gz
DEPS_SHA256_macos_arm64=aa3f5ae91b93c5176d6bd4313af0888a2b6dcdaa2ef1750dd7e2f98156882e0f
DEPS_SHA256_macos_arm64=ee7ae89c06c190464cd84386fe1683147cf9d93a2bab0113a0250aa5d7f124f7

DEPS_FILE_win_x86_64=cutter-deps-win-x86_64.tar.gz
DEPS_SHA256_win_x86_64=710e40cf8329205d09535cc56a9fb155a56ff1a1ca112145864382fb3d4e8160
DEPS_SHA256_win_x86_64=0dbd73f5f83f7bc40aef6dd3d5254d7a7151d07abdaf08d84150c1ec37b520e2


ARCH=x86_64
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/PluginManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,9 @@ CutterPlugin *PluginManager::loadPythonPlugin(const char *moduleName)

PythonToCppFunc pythonToCpp = Shiboken::Conversions::isPythonToCppPointerConvertible(
# if QT_VERSION < QT_VERSION_CHECK(6, 2, 0)
reinterpret_cast<SbkObjectType *>(SbkCutterBindingsTypes[SBK_CUTTERPLUGIN_IDX]),
reinterpret_cast<SbkObjectType *>(SbkCutterBindingsTypes[SBK_CutterPlugin_IDX]),
# else
reinterpret_cast<PyTypeObject **>(SbkCutterBindingsTypeStructs)[SBK_CUTTERPLUGIN_IDX],
reinterpret_cast<PyTypeObject **>(SbkCutterBindingsTypeStructs)[SBK_CutterPlugin_IDX],
# endif
pluginObject);
if (!pythonToCpp) {
Expand Down
Loading