Fix issue with urllib3 v2.0.

.cirrus.yml

@@ -238,7 +238,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     - chmod -R 755 /opt/homebrew/opt/poppler/*
     - chmod -R 755 /opt/homebrew/opt/xerces-c/*
     - python3 --version
-    - pip3 install --user --upgrade pip dropbox
+    - pip3 install --user --upgrade pip dropbox 'urllib3<2.0'
     - ccache --set-config sloppiness=pch_defines,time_macros max_size="$CCACHE_SIZE"
     - qmake --version
     - which qmake

appveyor.yml

@@ -608,7 +608,7 @@ for:
       secure: B8yHPBym+BTDPK5ZCg7WlSnUCHLbcim8WqLTC6/PSNs=
 
   cache:
-    - /Users/appveyor/.conan/data -> conanfile.py
+    #- /Users/appveyor/.conan/data -> conanfile.py
     - /Users/appveyor/cache_dir
 
   init:
@@ -654,8 +654,7 @@ for:
     
   before_build:
     - ls ${HOME}/Qt
-    - export QTDIR="${HOME}/${QT}"
-    - export PATH="$QTDIR/bin:$HOME/.local/bin:`python3 -m site --user-base`/bin:${HOME}/Qt/Qt Creator.app/Contents/MacOS:$PATH"
+    - export PATH="$HOME/.local/bin:`python3 -m site --user-base`/bin:$PATH"
     - echo $PATH
     - python3 --version
     - whereis python3
@@ -716,11 +715,14 @@ for:
 
       fi
     - sudo python3 -m pip install --upgrade pip
-    - pip3 install --user --upgrade pip dropbox
-    - export PATH="$PATH:`python3 -m site --user-base`/bin"
+    - pip3 install --user --upgrade pip dropbox 'urllib3<2.0'
+    - export QTDIR=`$(brew --prefix qt6)`
+    - export PATH="$PATH:`python3 -m site --user-base`/bin:$QTDIR/bin"
     - echo $PATH
     - python3 --version
     - clang --version
+    # Annoying clang issue: clang++ does not respect -isystem flag
+    - rm /usr/local/include/xercesc
     - qmake --version
     - which qmake
     - which qbs
@@ -847,7 +849,7 @@ for:
     - sudo ln -s /Library/Developer/CommandLineTools/usr/bin/python3 /Library/Developer/CommandLineTools/usr/bin/python
     - whereis python
     - sudo python3 -m pip install --upgrade pip
-    - pip3 install --user --upgrade pip dropbox conan==1.61.0
+    - pip3 install --user --upgrade pip dropbox conan==1.61.0 'urllib3<2.0'
     - conan --version
     - clang --version
     - qmake --version

qbs/modules/buildconfig/buildconfig.qbs

@@ -1,4 +1,5 @@
 import qbs.FileInfo
+import qbs.File
 import qbs.Utilities
 
 Module {
@@ -829,6 +830,15 @@ Module {
                         paths.push(includePaths[i]);
                     }
                 }
+
+                if (qbs.targetOS.contains("unix"))
+                {
+                    var xercescHeaders = "/usr/local/include/xercesc";
+                    if (File.exists(xercescHeaders) && !paths.contains(xercescHeaders))
+                    {
+                        paths.push(xercescHeaders);
+                    }
+                }
             }
 
             if (Utilities.versionCompare(qbs.version, "1.22") < 0)

qbs/modules/pdftops/pdftops.qbs

@@ -16,6 +16,7 @@ Module {
         property string path
         property string sourceDirectory: project.sourceDirectory
         property string qtVersion: product.Qt.core.version
+        property string architecture: product.qbs.architecture
 
         configure: {
             if (Utilities.versionCompare(qtVersion, "6") >= 0) {
@@ -34,7 +35,7 @@ Module {
                 }
             } else {
                 var binPath = sourceDirectory + "/dist/macx/bin64/pdftops";
-                if (product.qbs.architecture.contains("x86_64") && File.exists(binPath)) {
+                if (architecture.contains("x86_64") && File.exists(binPath)) {
                     path = binPath;
                     found = true;
                 }

scripts/deploy.py

@@ -137,7 +137,8 @@ def run_clean(refresh_token):
                         r'^valentina-WindowsXP\+-mingw-x86-Qt.*-develop-[a-f0-9]{40}\.tar\.xz$',
                         r'^valentina-macOS_11\+-Qt.*-x64-develop-[a-f0-9]{40}\.dmg$',
                         r'^valentina-macOS_10.13\+-Qt.*-x64-develop-[a-f0-9]{40}\.dmg$',
-                        r'^valentina-macOS.*\+-Qt.*-arm.*-develop-[a-f0-9]{40}\.dmg$']
+                        r'^valentina-macOS.*\+-Qt.*-arm.*-develop-[a-f0-9]{40}\.dmg$',
+                        r'^valentina-macOS.*\+-Qt.*-arm.*-develop-multibundle-[a-f0-9]{40}\.dmg$']
 
         item_types = {}