<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/64cbf41b61694e52efa0d79387874ddabbbf9c46">https://github.com/macports/macports-ports/commit/64cbf41b61694e52efa0d79387874ddabbbf9c46</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 64cbf41b616 scribus: update to version 1.4.8, homepage
</span>64cbf41b616 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 64cbf41b61694e52efa0d79387874ddabbbf9c46
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Mon Aug 10 14:16:21 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> scribus: update to version 1.4.8, homepage
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * support macOS through Catalina
</span>---
print/scribus/Portfile | 10 +++++-----
print/scribus/files/patch-CMakeLists.txt.diff | 22 +++++++++++++++-------
2 files changed, 20 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/scribus/Portfile b/print/scribus/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a33ded62830..aa84c68a094 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/scribus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/scribus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,8 @@ PortGroup qt4 1.0
</span>
name scribus
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.4.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories print
license GPL-2+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,9 @@ homepage https://www.scribus.net/
</span> master_sites sourceforge:project/scribus/scribus/${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e748a7d180b53f1716dfa0e876b61fdab5fecbff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 42d335b4a59c26c8ae1e3f601676baa3c42b035b8cde326d195f7a30078e5fec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 72763748
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b145de40f078d37a32861791289c185e9582f00b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 22253bb5994023f39608b37c57c7cd0280059fd97d2a4d71d4011aeeeb18042f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 73114760
</span>
# Builds forever with llvm-gcc-4.2. https://trac.macports.org/ticket/30835
# blacklist compilers with known problems on older systems
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/scribus/files/patch-CMakeLists.txt.diff b/print/scribus/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 45453a10b04..502c18e44c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/scribus/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/scribus/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2018-03-06 14:53:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2018-09-02 10:13:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -123,6 +123,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2019-03-05 14:44:45.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2020-08-10 17:42:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,6 +123,26 @@
</span>
IF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1))
STRING(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}")
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF (_apple_ver EQUAL "19")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MESSAGE(STATUS "Found OSX Catalina Target: Apple, 64 bit, X86")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(APPLE_10_15_X 1 CACHE TYPE BOOL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF (_apple_ver EQUAL "19")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF (_apple_ver EQUAL "18")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MESSAGE(STATUS "Found OSX Mojave Target: Apple, 64 bit, X86")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(APPLE_10_14_X 1 CACHE TYPE BOOL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF (_apple_ver EQUAL "18")
</span> + IF (_apple_ver EQUAL "17")
+ MESSAGE(STATUS "Found OSX High Sierra Target: Apple, 64 bit, X86")
+ SET(APPLE_10_13_X 1 CACHE TYPE BOOL)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,22 +27,22 @@
</span> IF (_apple_ver EQUAL "14")
MESSAGE(STATUS "Found OSX Yosemite Target: Apple, 64 bit, X86")
SET(APPLE_10_10_X 1 CACHE TYPE BOOL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -496,15 +508,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -496,15 +516,15 @@
</span> IF (WANT_OSX_SDK)
SET(CMAKE_OSX_DEPLOYMENT_TARGET "${OSXMINVER}")
ENDIF (WANT_OSX_SDK)
- IF(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IF(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X OR APPLE_10_11_X OR APPLE_10_12_X OR APPLE_10_13_X)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X OR APPLE_10_11_X OR APPLE_10_12_X OR APPLE_10_13_X OR APPLE_10_14_X OR APPLE_10_15_X)
</span> MESSAGE("Setting x86_64 Architecture for OSX Build/Bundle")
SET(CMAKE_OSX_ARCHITECTURES "x86_64" )
SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "x86_64" )
- ELSE(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ELSE(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X OR APPLE_10_11_X OR APPLE_10_12_X OR APPLE_10_13_X)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ELSE(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X OR APPLE_10_11_X OR APPLE_10_12_X OR APPLE_10_13_X OR APPLE_10_14_X OR APPLE_10_15_X)
</span> MESSAGE("Setting i386 Architecture for OSX Build/Bundle")
SET(CMAKE_OSX_ARCHITECTURES "i386" )
SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "i386" )
- ENDIF(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ENDIF(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X OR APPLE_10_11_X OR APPLE_10_12_X OR APPLE_10_13_X)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X OR APPLE_10_11_X OR APPLE_10_12_X OR APPLE_10_13_X OR APPLE_10_14_X OR APPLE_10_15_X)
</span> ENDIF(ARCH_PPC OR ARCH_PPC_64)
ENDIF(WANT_UNIVERSAL_BUNDLE)
MESSAGE(STATUS "${CMAKE_OSX_ARCHITECTURES} ${CMAKE_OSX_SYSROOT}")
</pre><pre style='margin:0'>
</pre>