MacPorts fixes

NatronGitHub · Dec 7, 2021 · 1801f83 · 1801f83
1 parent c6fc87f
commit 1801f83
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/config-macports.pri b/config-macports.pri
@@ -1,6 +1,18 @@
 boost {
   LIBS += -lboost_serialization-mt
 }
+equals(QT_MAJOR_VERSION, 5) {
+  shiboken:  INCLUDEPATH += $$PYTHON_SITE_PACKAGES/shiboken2_generator/include
+  shiboken:  LIBS += -L$$PYTHON_SITE_PACKAGES/shiboken2 -lshiboken2.cpython-$$PYVERNODOT-darwin.$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}
+  shiboken:  QMAKE_RPATHDIR += $$PYTHON_SITE_PACKAGES/shiboken2
+  pyside:    INCLUDEPATH += $$PYTHON_SITE_PACKAGES/PySide2/include
+  pyside:    INCLUDEPATH += $$PYTHON_SITE_PACKAGES/PySide2/include/QtCore
+  pyside:    INCLUDEPATH += $$PYTHON_SITE_PACKAGES/PySide2/include/QtGui
+  pyside:    INCLUDEPATH += $$PYTHON_SITE_PACKAGES/PySide2/include/QtWidgets
+  pyside:    LIBS += -L$$PYTHON_SITE_PACKAGES/PySide2 -lpyside2.cpython-$$PYVERNODOT-darwin.$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}
+  pyside:    QMAKE_RPATHDIR += $$PYTHON_SITE_PACKAGES/PySide2
+}
+
 macx:openmp {
   # clang 12+ is OK to build Natron, but libomp 12+ has a bug on macOS when
   # lanching tasks from a background thread, see https://bugs.llvm.org/show_bug.cgi?id=50579

diff --git a/global.pri b/global.pri
@@ -52,7 +52,7 @@ run-without-python {
     }
     # PYVER contains just major.minor
     PYVER=$$system(python$$PYV -c \"import platform; print(\'.\'.join(platform.python_version_tuple()[:2]))\")
-    PYVERNODOT=$$replace($$PYVER,.,)
+    PYVERNODOT=$$replace(PYVER,\.,)
     # PYTHON_VERSION contains major.minor.micro
     PYTHON_VERSION=$$system(python$$PYV -c \"import platform; print(platform.python_version())\")
     # PYTHON_SITE_PACKAGES contains the location of the site-packages directory
@@ -448,13 +448,15 @@ unix {
      }
 
     equals(QT_MAJOR_VERSION, 5) {
-        shiboken: PKGCONFIG += shiboken2
-        pyside:   PKGCONFIG += pyside2
-        # add QtCore to includes
-        PYSIDE_INCLUDEDIR = $$system(pkg-config --variable=includedir pyside2)
-        pyside:   INCLUDEPATH += $$PYSIDE_INCLUDEDIR/QtCore
-        pyside:   INCLUDEPATH += $$PYSIDE_INCLUDEDIR/QtGui
-        pyside:   INCLUDEPATH += $$PYSIDE_INCLUDEDIR/QtWidgets
+        system(pkg-config --exists pyside2) {
+            shiboken: PKGCONFIG += shiboken2
+            pyside:   PKGCONFIG += pyside2
+            # add QtCore to includes
+            PYSIDE_INCLUDEDIR = $$ && pkg-config --variable=includedir pyside2)
+            pyside:   INCLUDEPATH += $$PYSIDE_INCLUDEDIR/QtCore
+            pyside:   INCLUDEPATH += $$PYSIDE_INCLUDEDIR/QtGui
+            pyside:   INCLUDEPATH += $$PYSIDE_INCLUDEDIR/QtWidgets
+        }
     }
 
      equals(QT_MAJOR_VERSION, 4) {

diff --git a/tools/MacPorts/net/curl/Portfile b/tools/MacPorts/net/curl/Portfile
@@ -3,6 +3,8 @@
 PortSystem                      1.0
 PortGroup                       clang_dependency 1.0
 
+# Increase the revision of p5-www-curl whenever the version of curl gets updated.
+
 name                            curl
 version                         7.80.0
 categories                      net www

diff --git a/tools/MacPorts/net/curl/Portfile.orig b/tools/MacPorts/net/curl/Portfile.orig
@@ -3,6 +3,8 @@
 PortSystem                      1.0
 PortGroup                       clang_dependency 1.0
 
+# Increase the revision of p5-www-curl whenever the version of curl gets updated.
+
 name                            curl
 version                         7.80.0
 categories                      net www