qt(55|56|57|58)-qtsvg: unset known_fail

No longer needed as of c06efd1 See: https://trac.macports.org/ticket/62190 Clean up `use_xcode yes` usage [skip ci]
macports · Jul 24, 2022 · 0a6c222 · 0a6c222
1 parent a7f8a70
commit 0a6c222
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 77 deletions.
diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
@@ -15,10 +15,10 @@ homepage            https://www.qt.io
 
 version             5.5.1
 
+# Requires xcodebuild
+# https://trac.macports.org/ticket/59312
 # https://trac.macports.org/ticket/63154
-if { ${xcodeversion} ne "none" } {
-    use_xcode       yes
-}
+use_xcode           yes
 
 set just_want_qt5_variables yes
 PortGroup qt5 1.0
@@ -774,9 +774,6 @@ foreach {module module_info} [array get modules] {
             # see https://trac.macports.org/ticket/59434
             patchfiles-append patch-qtbase-icu_test.diff
 
-            # see https://trac.macports.org/ticket/59312
-            use_xcode yes
-
             #-----------------------------------------------------------------------------
             # qtbase is used for:
             #    1) building qtbase
@@ -1434,19 +1431,6 @@ foreach {module module_info} [array get modules] {
                     move ${worksrcpath}/src/3rdparty/javascriptcore/VERSION ${worksrcpath}/src/3rdparty/javascriptcore/VERSION.txt
                 }
             }
-
-            # special case
-            if {${module} eq "qtsvg" && ${os.platform} eq "darwin" && ${os.major} >= 19} {
-                # Project ERROR: Xcode not set up properly.
-                known_fail  yes
-                depends_lib
-                depends_build
-                depends_extract
-                pre-fetch {
-                    ui_error "${subport} does not build on macOS 10.15 or later"
-                    return -code error "incompatible OS version"
-                }
-            }
         }
     }
 

diff --git a/aqua/qt56/Portfile b/aqua/qt56/Portfile
@@ -15,10 +15,10 @@ homepage            https://www.qt.io
 
 version             5.6.3
 
+# Requires xcodebuild
+# https://trac.macports.org/ticket/59312
 # https://trac.macports.org/ticket/63154
-if { ${xcodeversion} ne "none" } {
-    use_xcode       yes
-}
+use_xcode           yes
 
 set just_want_qt5_variables yes
 PortGroup qt5 1.0
@@ -819,9 +819,6 @@ foreach {module module_info} [array get modules] {
             # see https://trac.macports.org/ticket/59434
             patchfiles-append patch-qtbase-icu_test.diff
 
-            # see https://trac.macports.org/ticket/59312
-            use_xcode yes
-
             #-----------------------------------------------------------------------------
             # qtbase is used for:
             #    1) building qtbase
@@ -1475,19 +1472,6 @@ foreach {module module_info} [array get modules] {
                 # dependents of qtwebengine
                 supported_archs x86_64
             }
-
-            # special case
-            if {${module} eq "qtsvg" && ${os.platform} eq "darwin" && ${os.major} >= 19} {
-                # Project ERROR: Xcode not set up properly.
-                known_fail  yes
-                depends_lib
-                depends_build
-                depends_extract
-                pre-fetch {
-                    ui_error "${subport} does not build on macOS 10.15 or later"
-                    return -code error "incompatible OS version"
-                }
-            }
         }
     }
 

diff --git a/aqua/qt57/Portfile b/aqua/qt57/Portfile
@@ -15,10 +15,10 @@ homepage            https://www.qt.io
 
 version             5.7.1
 
+# Requires xcodebuild
+# https://trac.macports.org/ticket/59312
 # https://trac.macports.org/ticket/63154
-if { ${xcodeversion} ne "none" } {
-    use_xcode       yes
-}
+use_xcode           yes
 
 set just_want_qt5_variables yes
 PortGroup qt5 1.0
@@ -889,9 +889,6 @@ foreach {module module_info} [array get modules] {
             # see https://trac.macports.org/ticket/59434
             patchfiles-append patch-qtbase-icu_test.diff
 
-            # see https://trac.macports.org/ticket/59312
-            use_xcode yes
-
             #-----------------------------------------------------------------------------
             # qtbase is used for:
             #    1) building qtbase
@@ -1552,19 +1549,6 @@ foreach {module module_info} [array get modules] {
                 # dependents of qtwebengine
                 supported_archs x86_64
             }
-
-            # special case
-            if {${module} eq "qtsvg" && ${os.platform} eq "darwin" && ${os.major} >= 19} {
-                # Project ERROR: Could not resolve SDK Path for 'macosx'
-                known_fail  yes
-                depends_lib
-                depends_build
-                depends_extract
-                pre-fetch {
-                    ui_error "${subport} does not build on macOS 10.15 or later"
-                    return -code error "incompatible OS version"
-                }
-            }
         }
     }
 

diff --git a/aqua/qt58/Portfile b/aqua/qt58/Portfile
@@ -15,10 +15,10 @@ homepage            https://www.qt.io
 
 version             5.8.0
 
+# Requires xcodebuild
+# https://trac.macports.org/ticket/59312
 # https://trac.macports.org/ticket/63154
-if { ${xcodeversion} ne "none" } {
-    use_xcode       yes
-}
+use_xcode           yes
 
 set just_want_qt5_variables yes
 PortGroup qt5 1.0
@@ -892,9 +892,6 @@ foreach {module module_info} [array get modules] {
                     mkspecs/features/mac/rez.prf
             }
 
-            # see https://trac.macports.org/ticket/59312
-            use_xcode yes
-
             #-----------------------------------------------------------------------------
             # qtbase is used for:
             #    1) building qtbase
@@ -1566,20 +1563,6 @@ foreach {module module_info} [array get modules] {
                 # dependents of qtwebengine
                 supported_archs x86_64
             }
-
-            # special case
-            if {${module} eq "qtsvg" && ${os.platform} eq "darwin" && ${os.major} >= 19} {
-                # Project ERROR: Could not resolve SDK Path for 'macosx'
-                # https://trac.macports.org/ticket/62190
-                known_fail  yes
-                depends_lib
-                depends_build
-                depends_extract
-                pre-fetch {
-                    ui_error "${subport} does not build on macOS 10.15 or later, see https://trac.macports.org/ticket/62190"
-                    return -code error "incompatible OS version"
-                }
-            }
         }
     }