Devin/1743572379 gtk4 migration

.github/ISSUE_TEMPLATE.md

@@ -1,18 +1,17 @@
 ### System information
 
-SolveSpace version: (e.g. 3.0~3dd2fc00; go to Help → About...)
-
-Operating system: (e.g. Debian testing)
+- **SolveSpace version:** <!--e.g. 3.1~70bde63c; go to Help → About… / SolveSpace → About SolveSpace (macOS)-->
+- **Operating system:** <!--e.g. Debian testing-->
 
 ### Expected behavior
 
-What should have happened?
+<!--What should have happened?-->
 
 ### Actual behavior
 
-What actually happened?
+<!--What actually happened?-->
 
 ### Additional information
 
-For bugs, please attach a savefile that shows the problematic behavior.
-You can attach `.slvs` files by archiving them into a `.zip` first.
+<!--For bugs, please attach a savefile that shows the problematic behavior.
+You can attach `.slvs` files by archiving them into a `.zip` first.-->

.github/scripts/build-macos.sh

@@ -0,0 +1,53 @@
+#!/bin/sh -xe
+
+ENABLE_SANITIZERS="OFF"
+if [ "$1" = "release" ]; then
+    BUILD_TYPE="RelWithDebInfo"
+    ENABLE_LTO="ON"
+else
+    BUILD_TYPE="Debug"
+    ENABLE_LTO="OFF"
+fi
+
+# this is an option for our Github CI only, since it doesn't have a macos arm64 image yet
+CMAKE_GENERATOR="Unix Makefiles"
+CMAKE_PREFIX_PATH=""
+if [ "$2" = "arm64" ]; then
+    OSX_ARCHITECTURE="arm64"
+    CMAKE_PREFIX_PATH=$(find /tmp/libomp-arm64/libomp -depth 1)
+    git apply cmake/libpng-macos-arm64.patch || echo "Could not apply patch, probably already patched..."
+    mkdir build-arm64 || true
+    cd build-arm64
+elif [ "$2" = "x86_64" ]; then
+    OSX_ARCHITECTURE="x86_64"
+    CMAKE_PREFIX_PATH=$(find /tmp/libomp-x86_64/libomp -depth 1)
+    mkdir build || true
+    cd build
+else
+    mkdir build || true
+    cd build
+fi
+
+if [ "$3" = "xcode" ]; then
+    CMAKE_GENERATOR="Xcode"
+fi
+
+cmake \
+    -G "${CMAKE_GENERATOR}" \
+    -D CMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}" \
+    -D CMAKE_OSX_ARCHITECTURES="${OSX_ARCHITECTURE}" \
+    -D CMAKE_BUILD_TYPE="${BUILD_TYPE}" \
+    -D ENABLE_OPENMP="ON" \
+    -D ENABLE_SANITIZERS="${ENABLE_SANITIZERS}" \
+    -D ENABLE_LTO="${ENABLE_LTO}" \
+    -D CMAKE_POLICY_VERSION_MINIMUM=3.5 \
+    ..
+
+if [ "$3" = "xcode" ]; then
+    open solvespace.xcodeproj
+else
+    cmake --build . --config "${BUILD_TYPE}" -j$(sysctl -n hw.logicalcpu)
+    if [ $(uname -m) = "$2" ]; then
+        make -j$(sysctl -n hw.logicalcpu) test_solvespace
+    fi
+fi

.github/scripts/build-snap.sh

@@ -0,0 +1,3 @@
+#!/bin/sh -xe
+
+./pkg/snap/build.sh --use-lxd

.github/scripts/build-ubuntu.sh

@@ -0,0 +1,12 @@
+#!/bin/sh -xe
+
+mkdir build
+cd build
+cmake \
+  -DCMAKE_BUILD_TYPE="Debug" \
+  -DENABLE_OPENMP="ON" \
+  -DENABLE_SANITIZERS="ON" \
+  -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+  ..
+make -j$(nproc) VERBOSE=1
+make test_solvespace

.github/scripts/build-wasmlib.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+cd ..
+git clone https://github.com/emscripten-core/emsdk.git --depth 1
+cd emsdk
+./emsdk install latest
+./emsdk activate latest
+cd ../solvespace
+source ../emsdk/emsdk_env.sh
+mkdir build-wasmlib || true
+cd build-wasmlib
+emcmake cmake .. \
+  -DCMAKE_RELEASE_TYPE=Debug \
+  -DENABLE_GUI="OFF" \
+  -DENABLE_CLI="OFF" \
+  -DENABLE_TESTS="OFF" \
+  -DENABLE_COVERAGE="OFF" \
+  -DENABLE_OPENMP="OFF" \
+  -DFORCE_VENDORED_Eigen3="ON" \
+  -DENABLE_LTO="ON" \
+  -DENABLE_EMSCRIPTEN_LIB="ON"
+cmake --build . -j$(nproc)

.github/scripts/build-windows.sh

@@ -0,0 +1,38 @@
+#!/bin/sh -xe
+
+mkdir build
+cd build
+
+if [ "$1" = "release" ]; then
+    if [ "$2" = "openmp" ]; then
+        ENABLE_OPENMP="ON"
+    else
+        ENABLE_OPENMP="OFF"
+    fi
+    BUILD_TYPE=RelWithDebInfo
+    cmake \
+        -G "Visual Studio 16 2019" \
+        -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \
+        -DENABLE_OPENMP="${ENABLE_OPENMP}" \
+        -DENABLE_LTO=ON \
+        -DCMAKE_GENERATOR_PLATFORM="Win32" \
+        -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+        ..
+else
+    BUILD_TYPE=Debug
+    cmake \
+        -G "Visual Studio 16 2019" \
+        -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \
+        -DENABLE_OPENMP="ON" \
+        -DCMAKE_GENERATOR_PLATFORM="Win32" \
+        -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+        ..
+fi
+
+cmake --build . --config "${BUILD_TYPE}" -- -maxcpucount
+
+bin/$BUILD_TYPE/solvespace-testsuite.exe
+
+if [ "$2" = "openmp" ]; then
+    mv bin/$BUILD_TYPE/solvespace.exe bin/$BUILD_TYPE/solvespace-openmp.exe
+fi

.github/scripts/install-macos.sh

@@ -0,0 +1,16 @@
+#!/bin/sh -xe
+
+if [ "$1" = "ci" ]; then
+    armloc=$(brew fetch --bottle-tag=arm64_ventura libomp | grep -i downloaded | grep tar.gz | cut -f2 -d:)
+    x64loc=$(brew fetch --bottle-tag=ventura libomp | grep -i downloaded | grep tar.gz | cut -f2 -d:)
+    cp $armloc /tmp/libomp-arm64.tar.gz
+    mkdir /tmp/libomp-arm64 || true
+    tar -xzvf /tmp/libomp-arm64.tar.gz -C /tmp/libomp-arm64
+    cp $x64loc /tmp/libomp-x86_64.tar.gz
+    mkdir /tmp/libomp-x86_64 || true
+    tar -xzvf /tmp/libomp-x86_64.tar.gz -C /tmp/libomp-x86_64
+else
+    brew install libomp
+fi
+
+git submodule update --init extlib/cairo extlib/freetype extlib/libdxfrw extlib/libpng extlib/mimalloc extlib/pixman extlib/zlib extlib/eigen

.github/scripts/install-snap.sh

@@ -0,0 +1,6 @@
+#!/bin/sh -xe
+
+sudo /snap/bin/lxd waitready
+sudo /snap/bin/lxd init --auto
+sudo chgrp travis /var/snap/lxd/common/lxd/unix.socket
+mkdir -p "$TRAVIS_BUILD_DIR/snaps-cache"

.travis/install-debian.sh → .github/scripts/install-ubuntu.sh

@@ -5,6 +5,6 @@ sudo apt-get update -qq
 sudo apt-get install -q -y \
   zlib1g-dev libpng-dev libcairo2-dev libfreetype6-dev libjson-c-dev \
   libfontconfig1-dev libgtkmm-3.0-dev libpangomm-1.4-dev libgl-dev \
-  libgl-dev libglu-dev libspnav-dev 
+  libgl-dev libglu-dev libspnav-dev
 
-git submodule update --init extlib/libdxfrw extlib/flatbuffers extlib/q3d
+git submodule update --init extlib/libdxfrw extlib/mimalloc extlib/eigen

.travis/install-macos.sh → .github/scripts/install-windows.sh

@@ -1,5 +1,3 @@
 #!/bin/sh -xe
 
-brew update
-brew install freetype cairo
 git submodule update --init

.github/scripts/sign-macos.sh

@@ -0,0 +1,86 @@
+#!/bin/bash -xe
+
+lipo \
+    -create \
+        build/bin/SolveSpace.app/Contents/Resources/libomp.dylib \
+        build-arm64/bin/SolveSpace.app/Contents/Resources/libomp.dylib \
+    -output \
+        build/bin/SolveSpace.app/Contents/Resources/libomp.dylib
+
+lipo \
+    -create \
+        build/bin/SolveSpace.app/Contents/MacOS/SolveSpace \
+        build-arm64/bin/SolveSpace.app/Contents/MacOS/SolveSpace \
+    -output \
+        build/bin/SolveSpace.app/Contents/MacOS/SolveSpace
+
+lipo \
+    -create \
+        build/bin/SolveSpace.app/Contents/MacOS/solvespace-cli \
+        build-arm64/bin/SolveSpace.app/Contents/MacOS/solvespace-cli \
+    -output \
+        build/bin/SolveSpace.app/Contents/MacOS/solvespace-cli
+
+cd build
+
+openmp="bin/SolveSpace.app/Contents/Resources/libomp.dylib"
+app="bin/SolveSpace.app"
+dmg="bin/SolveSpace.dmg"
+bundle_id="com.solvespace.solvespace"
+
+if [ "$CI" = "true" ]; then
+    # get the signing certificate (this is the Developer ID:Application: Your Name, exported to a p12 file, then converted to base64, e.g.: cat ~/Desktop/certificate.p12 | base64 | pbcopy)
+    echo $MACOS_CERTIFICATE_P12 | base64 --decode > certificate.p12
+
+    # create a keychain
+    security create-keychain -p secret build.keychain
+    security default-keychain -s build.keychain
+    security unlock-keychain -p secret build.keychain
+
+    # import the key
+    security import certificate.p12 -k build.keychain -P "${MACOS_CERTIFICATE_PASSWORD}" -T /usr/bin/codesign
+
+    security set-key-partition-list -S apple-tool:,apple: -s -k secret build.keychain
+
+    # check if all is good
+    security find-identity -v
+fi
+
+# sign openmp
+codesign -s "${MACOS_DEVELOPER_ID}" --timestamp --options runtime -f --deep "${openmp}"
+
+# sign the .app
+codesign -s "${MACOS_DEVELOPER_ID}" --timestamp --options runtime -f --deep "${app}"
+
+# create the .dmg from the signed .app
+hdiutil create -srcfolder "${app}" "${dmg}"
+
+# sign the .dmg
+codesign -s "${MACOS_DEVELOPER_ID}" --timestamp --options runtime -f --deep "${dmg}"
+
+if ! command -v xcrun >/dev/null || ! xcrun --find notarytool >/dev/null; then
+    echo "Notarytool is not present in the system. Notarization has failed."
+    exit 1
+fi
+
+# Submit the package for notarization
+notarization_output=$(
+    xcrun notarytool submit "${dmg}" \
+        --apple-id "hello@koenschmeets.nl" \
+        --password "${MACOS_APPSTORE_APP_PASSWORD}" \
+        --team-id "8X77K9NDG3" \
+        --wait 2>&1)
+
+if [ $? -eq 0 ]; then
+    # Extract the operation ID from the output
+    operation_id=$(echo "$notarization_output" | awk '/RequestUUID/ {print $NF}')
+    echo "Notarization submitted. Operation ID: $operation_id"
+    exit 0
+  else
+    echo "Notarization failed. Error: $notarization_output"
+    exit 1
+  fi
+fi
+
+# staple
+xcrun stapler staple "${dmg}"