.appveyor.yml

@@ -27,6 +27,9 @@ install:
 build_script:
   - del C:\Windows\System32\libssl-*.dll C:\Windows\system32\libcrypto-*.dll
   - del C:\Windows\SysWOW64\libssl-*.dll C:\Windows\SysWOW64\libcrypto-*.dll
+  - curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
+  - C:\msys64\usr\bin\bash --login -c "pacman -U $(cygpath ${APPVEYOR_BUILD_FOLDER})/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz %PACMAN_OPTIONS%"
+  - C:\msys64\usr\bin\pacman -Sy pacman %PACMAN_OPTIONS%
   - C:\msys64\usr\bin\pacman -Syuu %PACMAN_OPTIONS%
   - C:\msys64\usr\bin\bash --login -c "$(cygpath ${APPVEYOR_BUILD_FOLDER})/buildtools/appveyor.sh"
 

.gitignore

@@ -14,6 +14,7 @@ inkscape_devel_source.tar.bz2
 *~
 *.rej
 .vscode
+.uuid
 .clangd/
 compile_commands.json
 

.gitlab-ci.yml

@@ -72,6 +72,8 @@ inkscape:mac:
   tags:
     - mac
   rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
     - if: '$CI_PROJECT_NAMESPACE == "inkscape"'
       when: always
     - if: '$CI_PROJECT_NAMESPACE == "dehesselle"'
@@ -120,7 +122,7 @@ codeprotect:
   needs: []
   script:
     - git fetch https://gitlab.com/inkscape/inkscape.git
-    - git diff FETCH_HEAD -U0 --no-color src/3rdparty/adaptagrams/ src/3rdparty/libdepixelize src/3rdparty/libuemf | tee forbidden
+    - git diff FETCH_HEAD -U0 --no-color src/3rdparty | tee forbidden
     - if [[ -s forbidden ]]; then echo "This commit modifies files that are in an dependency library. Make sure you update upstream first, *then* force the merge in Inkscape."; false; fi
 
   #### All files should have a licence
@@ -262,7 +264,7 @@ test:linux:
     when: always
 
 
-# uploads the clang scan to user.gitlab.io/inkscape/
+# uploads the clang scan and documentation to user.gitlab.io/inkscape/
 pages:
   stage: deploy
   cache:
@@ -278,8 +280,8 @@ pages:
     - mkdir -p public/
     - sed "s/%DATE%/$(date '+%B %d, %Y')/" buildtools/ci-index.html > public/index.html
     - if test -e scan; then rm -fr public/scan-build && cp -rv scan/* public/scan-build; fi
-    - if test -e doc/doxygen; then cp -rv doc/doxygen/html/. public/doxygen; fi
-    - if test -e doc/doxygen-extensions; then cp -rv doc/doxygen-extensions/html/. public/doxygen-extensions; fi
+    - if test -e doc/doxygen; then rm -fr public/doxygen && cp -rv doc/doxygen/html/. public/doxygen; fi
+    - if test -e doc/doxygen-extensions; then rm -fr public/doxygen-extensions && cp -rv doc/doxygen-extensions/html/. public/doxygen-extensions; fi
   artifacts:
     paths:
       - public

CMakeLists.txt

@@ -39,7 +39,7 @@ include(CMakeScripts/ConfigPaths.cmake)
 
 set(PROJECT_NAME inkscape)
 
-# see https://gitlab.com/inkscape/inkscape/issues/551 for versioning suffixes
+# see https://gitlab.com/inkscape/inkscape/-/issues/551 for versioning suffixes
 set(INKSCAPE_VERSION_MAJOR  1)
 set(INKSCAPE_VERSION_MINOR  1)
 set(INKSCAPE_VERSION_PATCH  0)
@@ -149,6 +149,7 @@ endif()
 # end badness
 # -----------------------------------------------------------------------------
 
+set(2GEOM_BUILD_SHARED ${BUILD_SHARED_LIBS} CACHE BOOL "" FORCE)
 
 
 # -----------------------------------------------------------------------------

CMakeScripts/DefineDependsandFlags.cmake

@@ -162,6 +162,19 @@ list(APPEND INKSCAPE_INCS_SYS ${BOEHMGC_INCLUDE_DIRS})
 list(APPEND INKSCAPE_LIBS ${BOEHMGC_LIBRARIES})
 add_definitions(${BOEHMGC_DEFINITIONS})
 
+# This package isn’t marked REQUIRED, because we fallback to the
+# src/3rdparty/2geom submodule if it isn’t available system-wide.
+find_package(2Geom 1.0.0 QUIET)
+if(NOT 2Geom_FOUND)
+    pkg_check_modules(2Geom QUIET IMPORTED_TARGET GLOBAL 2geom>=1.0.0)
+    if(2Geom_FOUND)
+        add_library(2Geom::2geom ALIAS PkgConfig::2Geom)
+    endif()
+endif()
+if(NOT 2Geom_FOUND)
+    message(WARNING "lib2geom not found, falling back to the submodule in src/3rdparty/2geom")
+endif()
+
 if(ENABLE_POPPLER)
     find_package(PopplerCairo)
     if(POPPLER_FOUND)
@@ -276,10 +289,10 @@ endif()
 pkg_check_modules(
     GTK3
     REQUIRED
-    gtkmm-3.0>=3.22
-    gdkmm-3.0>=3.22
-    gtk+-3.0>=3.22
-    gdk-3.0>=3.22
+    gtkmm-3.0>=3.24
+    gdkmm-3.0>=3.24
+    gtk+-3.0>=3.24
+    gdk-3.0>=3.24
     gdl-3.0>=3.6
     )
 list(APPEND INKSCAPE_CXX_FLAGS ${GTK3_CFLAGS_OTHER})

CONTRIBUTING.md

@@ -120,3 +120,16 @@ Testing
 Before landing a patch, the unit tests should pass.
 
 See: http://wiki.inkscape.org/wiki/index.php/CMake#Using_CMake_to_run_tests
+
+General Guidelines for developers
+----------------------------------
+
+* If you are new, fork the inkscape project (https://gitlab.com/inkscape/inkscape) and create a new branch for each bug/feature you want to work on. Try to Set the CI time to a high value like 2 hour (Go to your fork > Settings > General Pipelines > Timeout)
+* Merge requests (MR) are encouraged for the smallest of contributions. This helps other developers review the code you've written and check for the mistakes that may have slipped by you.
+* Before working on anything big, be sure to discuss your idea with us ([IRC](irc://irc.freenode.org/#inkscape) or [RocketChat](https://chat.inkscape.org/)). Someone else might already have plans you can build upon and we will try to guide you !
+* Adopt the coding style (indentation, bracket placement, reference/pointer placement, variable naming etc. - developer's common sense required!) of existing source so that your changes and code doesn't stand out/feel foreign.
+* Carefully explain your ideas and the changes you've made along with their importance in the MR. Feel free to use pictures !
+* Check the "Allow commits from members who can merge to this target branch" option while submitting the MR.
+* Write informative commit messages ([check this](https://chris.beams.io/posts/git-commit/)). Use full url of bug instead of mentioning just the number in messages and discussions.
+* Try to keep your MR current instead of creating a new one. Rebase your MR sometimes.
+* Inkscape has contributors/developers from across the globe. Some may be unavailable at times but be patient and we will try our best to help you. We are glad to have you!

INSTALL.md

@@ -47,7 +47,7 @@ typical libraries you may need to install are:
 Please see [the wiki page on compiling Inkscape](http://wiki.inkscape.org/wiki/index.php/CompilingInkscape) for the
 most current dependencies, including links to the source tarballs. 
 For common linux-distributions (Ubuntu, Debian, Fedora) you can use 
-[a bash-script](https://gitlab.com/inkscape/inkscape-ci-docker/raw/master/install_dependencies.sh?inline=false) 
+[a bash-script](https://gitlab.com/inkscape/inkscape-ci-docker/-/raw/master/install_dependencies.sh?inline=false) 
 for getting required libaries.
 
 

NEWS.md

@@ -350,7 +350,7 @@ Available options:
   • cut
 
 ] functionality incomplete currently, does not hide linked operand, see https:/
-/gitlab.com/inkscape/inkscape/merge_requests/20#note_100799480
+/gitlab.com/inkscape/inkscape/-/merge_requests/20#note_100799480
 
   • Boolean Operations LPE
 
@@ -581,7 +581,7 @@ Plot extension
 The new option 'Convert objects to paths' will take care of converting
 everything to a path non-destructively before the data is sent to the plotter.
 [gives wrong error message, maybe not working? https://gitlab.com/inkscape/
-inkscape/commit/dd3b6aa099175e2244e1e04dde45bf21a966425e#note_100908512]
+inkscape/-/commit/dd3b6aa099175e2244e1e04dde45bf21a966425e#note_100908512]
 
 Palettes
 

README.md

 Inkscape. Draw Freely.
 ======================
 
-[https://www.inkscape.org/](https://www.inkscape.org/)
+[https://inkscape.org/](https://inkscape.org/)
 
 Inkscape is a Free and open source vector graphics editor. It offers a rich set
 of features and is widely used for both artistic and technical illustrations
@@ -25,7 +25,7 @@ lightweight core with powerful features added as extensions, and the
 establishment of a friendly, open, community-oriented development
 processes.
 
-[![build status](https://gitlab.com/inkscape/inkscape/badges/master/pipeline.svg)](https://gitlab.com/inkscape/inkscape/commits/master)
+[![build status](https://gitlab.com/inkscape/inkscape/badges/master/pipeline.svg)](https://gitlab.com/inkscape/inkscape/-/commits/master)
 [![Build Status](https://ci.appveyor.com/api/projects/status/gitlab/inkscape/inkscape?branch=master&svg=true)](https://ci.appveyor.com/project/inkscape/inkscape)
 
 For installation, please see: [INSTALL.md](INSTALL.md)

_clang-format

@@ -65,7 +65,7 @@ IncludeCategories:
   - Regex:           '^"'
     Priority:        2
 IncludeIsMainRegex: '(-test)?$'
-IndentCaseLabels: false
+IndentCaseLabels: true
 IndentPPDirectives: None
 IndentWidth:     4
 IndentWrappedFunctionNames: false
@@ -103,10 +103,11 @@ SpacesInContainerLiterals: false
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard:        Cpp11
+Standard:        c++17
 StatementMacros: []
 TypenameMacros: []
 TabWidth: 4
+UseCRLF: false
 UseTab: Never
 ...
 

buildtools/appveyor.sh

@@ -65,7 +65,6 @@ cmake .. -G Ninja \
     -DCMAKE_C_COMPILER_LAUNCHER="ccache" \
     -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
     -DCMAKE_INSTALL_MESSAGE="NEVER" \
-    -D2GEOM_BUILD_SHARED=ON \
     || error "cmake failed"
 
 # build

buildtools/ci-index.html

@@ -16,6 +16,6 @@
             <li><a href="doxygen-extensions/">Doxygen documentation for extensions</a></li>
             <li><a href="scan-build/">scan-build static analysis report</a></li>
         </ul>
-        <p><span style="font-size:small;position:absolute;bottom:0;right:0;"><a href="https://gitlab.com/inkscape/inkscape/blob/master/buildtools/ci-index.html">Feel free to improve this file.</a></span></p>
+        <p><span style="font-size:small;position:absolute;bottom:0;right:0;"><a href="https://gitlab.com/inkscape/inkscape/-/blob/master/buildtools/ci-index.html">Feel free to improve this file.</a></span></p>
     </body>
 </html>

buildtools/msys2installdeps.sh

@@ -72,7 +72,7 @@ $ARCH-gspell
 #     or (always!) run pacman with the additional command line switch
 #        --ignore=mingw-w64-*-imagemagick
 for arch in $(eval echo $ARCH); do
-  wget -nv https://gitlab.com/ede123/bintray/raw/master/${arch}-imagemagick-6.9.10.69-1-any.pkg.tar.xz \
+  wget -nv https://gitlab.com/ede123/bintray/-/raw/master/${arch}-imagemagick-6.9.10.69-1-any.pkg.tar.xz \
     && pacman -U $PACMAN_OPTIONS ${arch}-imagemagick-6.9.10.69-1-any.pkg.tar.xz \
     && rm  ${arch}-imagemagick-6.9.10.69-1-any.pkg.tar.xz
 done

config.h.cmake

@@ -29,9 +29,6 @@
 /* always defined to indicate that i18n is enabled */
 #cmakedefine ENABLE_NLS 1
 
-/* Build with OSX .app data dir paths? */
-#cmakedefine ENABLE_OSX_APP_LOCATIONS 1
-
 /* Whether the Cairo PDF backend is available */
 #cmakedefine PANGO_ENABLE_ENGINE 1
 

org.inkscape.Inkscape.desktop.template

@@ -15,8 +15,13 @@ Terminal=false
 StartupNotify=true
 Icon=${INKSCAPE_ICONPATH}
 X-Ayatana-Desktop-Shortcuts=Drawing
+Actions=new-window;
 
 [X-Drawing Shortcut Group]
 Name=New Drawing
 Exec=inkscape
 TargetEnvironment=Unity
+
+[Desktop Action new-window]
+Name=Open a New Window
+Exec=inkscape

packaging/appimage/AppRun

@@ -2,6 +2,12 @@
 
 HERE="$(dirname "$(readlink -f "${0}")")"
 
+# Temporary workaround for broken libgc
+if [ -z "$_INKSCAPE_GC" ] ; then
+    echo "Setting _INKSCAPE_GC=disable as a workaround for broken libgc" >&2
+    export _INKSCAPE_GC=disable
+fi
+
 # Custom AppRun script for Inkscape
 # by Simon Peter
 
@@ -16,12 +22,8 @@ if [ ! -z $APPIMAGE ] ; then
 else
   BINARY_NAME=$(basename "$0")
 fi
-if [ ! -z "$1" ] && [ -e "$HERE/bin/$1" ] ; then
-  MAIN="$HERE/bin/$1" ; shift
-elif [ ! -z "$1" ] && [ -e "$HERE/usr/bin/$1" ] ; then
+if [ ! -z "$1" ] && [ -e "$HERE/usr/bin/$1" ] ; then
   MAIN="$HERE/usr/bin/$1" ; shift
-elif [ -e "$HERE/bin/$BINARY_NAME" ] ; then
-  MAIN="$HERE/bin/$BINARY_NAME"
 elif [ -e "$HERE/usr/bin/$BINARY_NAME" ] ; then
   MAIN="$HERE/usr/bin/$BINARY_NAME"
 else
@@ -32,13 +34,7 @@ fi
 # Prefer to run the bundled executables (e.g., Python)
 ############################################################################################
 
-export PATH="${HERE}"/usr/bin/:"${HERE}"/usr/sbin/:"${HERE}"/usr/games/:"${HERE}"/bin/:"${HERE}"/sbin/:"${PATH}"
-
-############################################################################################
-# Use bundled Python
-############################################################################################
-
-export PYTHONHOME="$HERE/usr/"
+export PATH="${HERE}/usr/bin:${PATH}"
 
 ############################################################################################
 # Run experimental bundle that bundles everything if a private ld-linux-x86-64.so.2 is there
@@ -62,7 +58,6 @@ if [ -e "$HERE/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2" ] ; then
   export GDK_PIXBUF_MODULEDIR=$(readlink -f "$HERE"/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/ )
   export GDK_PIXBUF_MODULE_FILE=$(readlink -f "$HERE"/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders.cache ) # Patched to contain no paths
   export LIBRARY_PATH=$GDK_PIXBUF_MODULEDIR:$LIBRARY_PATH # Otherwise getting "Unable to load image-loading module"
-  export INKSCAPE_DATADIR=${XDG_CONFIG_HOME:-~/.config}/inkscape-1.0-beta
   exec "${HERE}/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2" --inhibit-cache --library-path "${LIBRARY_PATH}" "${MAIN}" "$@"
 else
   exec "${MAIN}" "$@"

packaging/appimage/generate.sh

@@ -17,8 +17,6 @@ cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_BINRELOC=ON \
 make -j$(nproc)
 make DESTDIR=appdir -j$(nproc) install ; find appdir/
 cp ../packaging/appimage/AppRun appdir/AppRun ; chmod +x appdir/AppRun
-( cd appdir/usr/lib/ ; ln -s ../* . ) # FIXME: Why is this needed?
-( cd appdir/ ; ln -s usr/* . ) # FIXME: Why is this needed?
 cp ./appdir/usr/share/icons/hicolor/256x256/apps/org.inkscape.Inkscape.png ./appdir/
 sed -i -e 's|^Icon=.*|Icon=org.inkscape.Inkscape|g' ./appdir/usr/share/applications/org.inkscape.Inkscape.desktop # FIXME
 cd appdir/
@@ -28,33 +26,47 @@ cd appdir/
 # to allow the AppImage to run on older systems as well
 ########################################################################
 
+apt_bundle() {
+    apt-get download "$@"
+    find *.deb -exec dpkg-deb -x {} . \;
+    find *.deb -delete
+}
+
 # Bundle all of glibc; this should eventually be done by linuxdeployqt
 apt update
-apt-get download libc6
-find *.deb -exec dpkg-deb -x {} . \;
-rm *deb
+apt_bundle libc6
 
 # Make absolutely sure it will not load stuff from /lib or /usr
 sed -i -e 's|/usr|/xxx|g' lib/x86_64-linux-gnu/ld-linux-x86-64.so.2
-sed -i -e 's|/usr/lib|/ooo/ooo|g' lib/x86_64-linux-gnu/ld-linux-x86-64.so.2
 
 # Bundle Gdk pixbuf loaders without which the bundled Gtk does not work;
 # this should eventually be done by linuxdeployqt
-apt-get download librsvg2-common libgdk-pixbuf2.0-0
-find *.deb -exec dpkg-deb -x {} . \;
-rm *deb
+apt_bundle librsvg2-common libgdk-pixbuf2.0-0
 cp /usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/* usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/
 cp /usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders.cache usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/
-sed -i -e 's|/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/||g' usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders.cache
+sed -i -e 's|/usr/lib/x86_64-linux-gnu/gdk-pixbuf-.*/.*/loaders/||g' usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders.cache
 
 # Bundle fontconfig settings
 mkdir -p etc/fonts/
 cp /etc/fonts/fonts.conf etc/fonts/
 
 # Bundle Python
-apt-get download libpython3.8-stdlib python3.8 python3.8-minimal libpython3.8-minimal python3-lxml python3-numpy python3-scour python3-gi
-find *.deb -exec dpkg-deb -x {} . \;
-rm *deb
+PY_VER=3.8
+apt_bundle \
+    libpython${PY_VER}-stdlib \
+    libpython${PY_VER}-minimal \
+    python${PY_VER} \
+    python${PY_VER}-minimal \
+    python3-lxml \
+    python3-numpy \
+    python3-scour \
+    python3-gi
+(
+    cd usr/bin
+    ln -s python${PY_VER} python3
+    ln -s python${PY_VER} python
+)
+
 cd -
 
 ########################################################################
@@ -64,77 +76,20 @@ cd -
 wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
 chmod a+x linuxdeployqt-continuous-x86_64.AppImage
 
+linuxdeployqtargs=()
+
+for so in $(find \
+    appdir/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders \
+    appdir/usr/lib/python3 \
+    appdir/usr/lib/python${PY_VER} \
+    -name \*.so); do
+    linuxdeployqtargs+=("-executable=$(readlink -f "$so")")
+done
+
 ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract-and-run appdir/usr/share/applications/org.inkscape.Inkscape.desktop \
   -appimage -unsupported-bundle-everything -executable=appdir/usr/bin/inkview \
   -executable=appdir/usr/lib/inkscape/libinkscape_base.so \
-  -executable=$(readlink -f appdir/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/libpixbufloader-xpm.so) \
-  -executable=$(readlink -f appdir/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/libpixbufloader-xbm.so) \
-  -executable=$(readlink -f appdir/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/libpixbufloader-tiff.so) \
-  -executable=$(readlink -f appdir/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/libpixbufloader-tga.so) \
-  -executable=$(readlink -f appdir/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/libpixbufloader-svg.so) \
-  -executable=$(readlink -f appdir/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/libpixbufloader-qtif.so) \
-  -executable=$(readlink -f appdir/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/libpixbufloader-pnm.so) \
-  -executable=$(readlink -f appdir/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/libpixbufloader-png.so) \
-  -executable=$(readlink -f appdir/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/libpixbufloader-jpeg.so) \
-  -executable=$(readlink -f appdir/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/libpixbufloader-ico.so) \
-  -executable=$(readlink -f appdir/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/libpixbufloader-icns.so) \
-  -executable=$(readlink -f appdir/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/libpixbufloader-gif.so) \
-  -executable=$(readlink -f appdir/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/libpixbufloader-bmp.so) \
-  -executable=$(readlink -f appdir/usr/lib/x86_64-linux-gnu/gdk-pixbuf-*/*/loaders/libpixbufloader-ani.so) \
-  -executable=appdir/usr/bin/python3.8 \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/lxml/_elementpath.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/lxml/builder.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/lxml/etree.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/lxml/html/clean.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/lxml/html/diff.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/lxml/objectify.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/numpy/core/_dummy.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/numpy/core/multiarray.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/numpy/core/multiarray_tests.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/numpy/core/operand_flag_tests.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/numpy/core/struct_ufunc_test.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/numpy/core/test_rational.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/numpy/core/umath.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/numpy/core/umath_tests.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/numpy/fft/fftpack_lite.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/numpy/linalg/_umath_linalg.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/numpy/linalg/lapack_lite.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3/dist-packages/numpy/random/mtrand.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_bsddb.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_codecs_cn.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_codecs_hk.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_codecs_iso2022.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_codecs_jp.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_codecs_kr.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_codecs_tw.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_csv.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_ctypes.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_ctypes_test.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_curses.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_curses_panel.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_elementtree.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_hashlib.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_hotshot.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_json.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_lsprof.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_multibytecodec.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_multiprocessing.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_sqlite3.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_ssl.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/_testcapi.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/audioop.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/bz2.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/crypt.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/dbm.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/future_builtins.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/linuxaudiodev.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/mmap.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/nis.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/ossaudiodev.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/parser.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/pyexpat.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/readline.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/resource.*.so) \
-  -executable=$(readlink -f appdir/usr/lib/python3.8/lib-dynload/termios.*.so)
+  -executable=appdir/usr/bin/python${PY_VER} \
+  "${linuxdeployqtargs[@]}"
 
 mv Inkscape*.AppImage* ../

packaging/macos/020-vars.sh

@@ -37,7 +37,7 @@ export SDKROOT=$SDKROOT_DIR/MacOSX${MACOSX_DEPLOYMENT_TARGET}.sdk
 
 ### build system/toolset version ###############################################
 
-TOOLSET_VERSION=0.34
+TOOLSET_VERSION=0.35
 
 ### ramdisk ####################################################################
 
@@ -143,7 +143,7 @@ PY3_BUILD=1  # custom framework build number
 
 # https://github.com/dehesselle/gtk-osx
 # Forked from https://gitlab.gnome.org/GNOME/gtk-osx
-URL_GTK_OSX=https://raw.githubusercontent.com/dehesselle/gtk-osx/inkscape-1.0.x-4
+URL_GTK_OSX=https://raw.githubusercontent.com/dehesselle/gtk-osx/inkscape-1.0.x-5
 URL_GTK_OSX_SETUP=$URL_GTK_OSX/gtk-osx-setup.sh
 URL_GTK_OSX_MODULESET=$URL_GTK_OSX/modulesets-stable/gtk-osx.modules
 

packaging/macos/140-jhbuild-gtk3.sh

@@ -11,19 +11,9 @@
 SELF_DIR=$(F=$0; while [ ! -z $(readlink $F) ] && F=$(readlink $F); cd $(dirname $F); F=$(basename $F); [ -L $F ]; do :; done; echo $(pwd -P))
 for script in $SELF_DIR/0??-*.sh; do source $script; done
 
-### install prerequisites ######################################################
-
-# We're doing this to get Python.h, because gobject-introspection fails
-# otherwise.
-
-jhbuild build \
-  openssl \
-  python3
-
 ### install GTK3 libraries #####################################################
 
 jhbuild build \
   meta-gtk-osx-bootstrap \
-  meta-gtk-osx-freetype \
   meta-gtk-osx-gtk3 \
   meta-gtk-osx-gtkmm3

packaging/macos/150-jhbuild-inkdeps.sh

@@ -12,17 +12,14 @@
 SELF_DIR=$(F=$0; while [ ! -z $(readlink $F) ] && F=$(readlink $F); cd $(dirname $F); F=$(basename $F); [ -L $F ]; do :; done; echo $(pwd -P))
 for script in $SELF_DIR/0??-*.sh; do source $script; done
 
-### install additional GNOME libraries #########################################
+### install Inkscape dependencies ##############################################
 
 # Part of gtk-osx module sets.
 
 jhbuild build \
-  adwaita-icon-theme \
   gtkspell3 \
   libsoup
 
-### install Inkscape dependencies ##############################################
-
 # Part of inkscape module set.
 
 jhbuild build \