<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bdb112fc3ff4dc3fd2b2e0a397547255914e6418">https://github.com/macports/macports-ports/commit/bdb112fc3ff4dc3fd2b2e0a397547255914e6418</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new bdb112fc3ff scribus-devel: Fix build on newer macOS versions
</span>bdb112fc3ff is described below

<span style='display:block; white-space:pre;color:#808000;'>commit bdb112fc3ff4dc3fd2b2e0a397547255914e6418
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jul 7 14:58:45 2023 -0500

<span style='display:block; white-space:pre;color:#404040;'>    scribus-devel: Fix build on newer macOS versions
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/64290
</span>---
 print/scribus-devel/Portfile                       | 10 +++--
 .../files/arch-and-deployment-target.patch         | 46 ++++++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/scribus-devel/Portfile b/print/scribus-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cc6780c06a5..756c2105687 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/scribus-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/scribus-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,8 @@ PortGroup           boost 1.0
</span> qt5.depends_component qttools qttranslations
 qt5.min_version     5.14.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Newer versions require Qt 6.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 1.7.x and newer requires Qt 6.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 1.5.x development continues on the Version15x branch.
</span> name                scribus-devel
 epoch               1
 version             1.5.8
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +78,8 @@ post-extract {
</span>                     slaoutput.h
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          authors.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          arch-and-deployment-target.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    authors.patch \
</span>                     poppler.patch \
                     QFunctionPointer.patch \
                     unary_function.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,8 +89,10 @@ compiler.cxx_standard 2017
</span> 
 set PyFRM           ${frameworks_dir}/Python.framework/Versions
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.install_prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "${applications_dir}/[string toupper ${name} 0].app"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DCMAKE_INSTALL_PREFIX="${applications_dir}/[string toupper ${name} 0].app" \
</span>                     -DWITH_PODOFO=YES \
                     -DWANT_DISTROBUILD=YES \
                     -DWITH_BOOST=YES \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/scribus-devel/files/arch-and-deployment-target.patch b/print/scribus-devel/files/arch-and-deployment-target.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..939c590d696
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/scribus-devel/files/arch-and-deployment-target.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build on new macOS versions by deleting the macOS version detection code.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't override macOS arch and deployment target settings.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.scribus.net/view.php?id=16975
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig    2022-01-23 10:14:43.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-07-07 14:27:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -201,7 +201,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## Do our Apple OSX version setup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (FALSE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if ((CMAKE_SIZEOF_VOID_P EQUAL 8) AND (ARCH_ARM))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           string(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           if (_apple_ver EQUAL "21")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists_Apple.cmake.orig    2022-01-23 10:16:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists_Apple.cmake 2023-07-07 14:27:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(FALSE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE_12_00_X)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set(OSXMINVER "12.00" CACHE STRING "OSX 12.00")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if (WANT_OSX_SDK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -172,17 +173,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Apple Architecture: ${CMAKE_OSX_ARCHITECTURES}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Apple SDK: ${CMAKE_OSX_SYSROOT}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(ENV{MACOSX_DEPLOYMENT_TARGET} ${OSXMINVER} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(ENV{LD_PREBIND} 1 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(ENV{LD_PREBIND_ALLOW_OVERLAP} 1 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (WANT_DEBUG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -fno-inline-functions -Wall")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -fno-inline-functions -Wall")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (WANT_RELEASEWITHDEBUG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -fno-inline-functions -Wall")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -fno-inline-functions -Wall")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-inline-functions -Wall")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -fno-inline-functions -Wall")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span></pre><pre style='margin:0'>

</pre>