<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/88eb4637a61a79a8bfc27d2d019179aa67d50293">https://github.com/macports/macports-ports/commit/88eb4637a61a79a8bfc27d2d019179aa67d50293</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 88eb463 graphite2: Update to 1.3.12
</span>88eb463 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 88eb4637a61a79a8bfc27d2d019179aa67d50293
</span>Author: David Gilman <davidgilman1@gmail.com>
AuthorDate: Tue Sep 18 15:08:39 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> graphite2: Update to 1.3.12
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Use github 1.0 portgroup
</span><span style='display:block; white-space:pre;color:#404040;'> * Use cxx11 1.1 portgroup; 1.3.12 and later require C++11
</span><span style='display:block; white-space:pre;color:#404040;'> * Update to cmake 1.1 portgroup
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove patch-src-Face.cpp.diff as it builds without this
</span><span style='display:block; white-space:pre;color:#404040;'> * Re-enable the featuremap test as it works now
</span><span style='display:block; white-space:pre;color:#404040;'> * Add fonttools and python36 test dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove test.env as tests pass without it
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove cppflags-replace no longer needed after cmake portgroup fix
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove removal of -fno-stack-protector on Darwin 8 as upstream no
</span><span style='display:block; white-space:pre;color:#404040;'> longer uses this flag
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove disabling segment caching code on PowerPC as upstream has
</span><span style='display:block; white-space:pre;color:#404040;'> removed the segment caching code as of 1.3.12
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove muniversal 1.0 portgroup no longer needed due to above
</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/42872
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/54141
</span>---
graphics/graphite2/Portfile | 68 ++++++----------------
.../graphite2/files/patch-src-CMakeLists.txt.diff | 23 +++++---
graphics/graphite2/files/patch-src-Face.cpp.diff | 10 ----
3 files changed, 31 insertions(+), 70 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphite2/Portfile b/graphics/graphite2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cf60ecc..d006b3c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphite2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphite2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,19 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup silnrsi graphite 1.3.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a8f2ad6f5921f893ccda73fe988fe69fc431db90 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cd9530c16955c181149f9af1f13743643771cb920c75a04c95c77c871a2029d0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6667293
</span>
name graphite2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.3.9
</span> categories graphics
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span> license LGPL-2.1+
description a “smart font” system for lesser-known languages
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,54 +23,15 @@ long_description Graphite is a “smart font” system developed specifically
</span> the world.
homepage http://graphite.sil.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/silgraphite/graphite2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-${version}
</span> extract.suffix .tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 cc69347fcc1a7cb2b332377e51d652ccac5d712c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ec0185b663059553fd46e8c4a4f0dede60a02f13a7a1fefc2ce70332ea814567
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-Face.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# gcc version 4.0.1 (Apple Computer, Inc. build 5370) (from Xcode 2.5 on Tiger) is affected.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# apple-gcc42 @5666.3_10 doesn't contain a c++ compiler so it falls back to the affected Xcode compiler.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# gcc version 4.0.1 (Apple Inc. build 5493) (from Xcode 3.1.4 on Leopard) is not affected.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Other versions of gcc 4.0 not tested. Later versions of gcc are not affected.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://sourceforge.net/p/silgraphite/bugs/50/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|-fno-stack-protector||g" src/CMakeLists.txt tests/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/37947
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://sourceforge.net/p/silgraphite/bugs/54/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/add_subdirectory(featuremap)/d" ${worksrcpath}/tests/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix upgrade failure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-src-CMakeLists.txt.diff
</span>
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.env DYLD_LIBRARY_PATH=${worksrcpath}/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-test {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://sourceforge.net/p/silgraphite/bugs/48/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_installed_version [strsed [exec python --version 2>@1] {g/Python //}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_minimum_version 2.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${python_installed_version} ${python_minimum_version}] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Testing ${name} requires Python ${python_minimum_version} or later but your “python” is version ${python_installed_version}."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible python version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Disable segment caching code on PowerPC where it fails to build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://sourceforge.net/p/silgraphite/bugs/49/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set merger_configure_args(ppc) -DGRAPHITE2_NSEGCACHE:BOOL=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set merger_configure_args(ppc64) -DGRAPHITE2_NSEGCACHE:BOOL=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset universal] && [info exists merger_configure_args(${configure.build_arch})]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append $merger_configure_args(${configure.build_arch})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#test.env ARGS=-V
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Use the same python as fonttools.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test port:fonttools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python36
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphite2/files/patch-src-CMakeLists.txt.diff b/graphics/graphite2/files/patch-src-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6cf5e1f..8d655c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphite2/files/patch-src-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphite2/files/patch-src-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,19 +3,24 @@ https://sourceforge.net/p/silgraphite/bugs/56/
</span>
Use -Wimplicit-fallthrough only with clang, to prevent compile failure with gcc.
https://sourceforge.net/p/silgraphite/bugs/60/
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/CMakeLists.txt.orig 2016-01-14 22:17:18.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/CMakeLists.txt 2016-02-17 00:35:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -135,9 +135,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use -mfpmath=sse -msse2 only on Intel.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CMakeLists.txt.orig 2018-08-15 00:38:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CMakeLists.txt 2018-10-01 12:46:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -136,9 +136,14 @@
</span>
if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties(graphite2 PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wimplicit-fallthrough -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LINK_FLAGS "-nodefaultlibs"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(graphite2 PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wimplicit-fallthrough -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -mfpmath=sse -msse2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LINK_FLAGS "-nodefaultlibs"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden"
</span> LINKER_LANGUAGE C)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_definitions(-mfpmath=sse -msse2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
</span> + add_definitions(-Wimplicit-fallthrough)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
</span> target_link_libraries(graphite2 c)
include(Graphite)
nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphite2/files/patch-src-Face.cpp.diff b/graphics/graphite2/files/patch-src-Face.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index aa60b27..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphite2/files/patch-src-Face.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Face.cpp.orig 2013-02-04 23:27:22.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Face.cpp 2013-02-04 23:28:44.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,6 +24,7 @@ Mozilla Public License (http://mozilla.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- License, as published by the Free Software Foundation, either version 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- of the License or (at your option) any later version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <algorithm>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cstring>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "graphite2/Segment.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "inc/CmapCache.h"
</span></pre><pre style='margin:0'>
</pre>