Revision: 103559 https://trac.macports.org/changeset/103559 Author: ryandesign@macports.org Date: 2013-03-01 04:34:52 -0800 (Fri, 01 Mar 2013) Log Message: ----------- graphite2: update to 1.2.1 Modified Paths: -------------- trunk/dports/graphics/graphite2/Portfile Removed Paths: ------------- trunk/dports/graphics/graphite2/files/patch-Graphite.cmake.diff Modified: trunk/dports/graphics/graphite2/Portfile =================================================================== --- trunk/dports/graphics/graphite2/Portfile 2013-03-01 12:34:50 UTC (rev 103558) +++ trunk/dports/graphics/graphite2/Portfile 2013-03-01 12:34:52 UTC (rev 103559) @@ -6,8 +6,7 @@ PortGroup muniversal 1.0 name graphite2 -version 1.2.0 -revision 1 +version 1.2.1 categories graphics platforms darwin maintainers ryandesign openmaintainer @@ -23,17 +22,17 @@ master_sites sourceforge:project/silgraphite/graphite2 extract.suffix .tgz -checksums rmd160 fe630b134be3c7f4da019827272c1ce9d09039f3 \ - sha256 630fba251c7e570f2b0c4a0c63a7abb4d45b0246d390f53188b1a9b73de7b96e +checksums rmd160 cd821bbe54025f0ac684894a1b7a8ef8c520e3ad \ + sha256 7b15b749ae65c1ce3cfb4b98b8d4125e91b695ca31fa83aa51d6542109ab449d -patchfiles patch-Graphite.cmake.diff \ - missing-include.patch +patchfiles missing-include.patch -if {[string match *gcc-4.0 ${configure.compiler}]} { +# gcc version 4.0.1 (Apple Computer, Inc. build 5370) (from Xcode 2.5 on Tiger) is affected. +# apple-gcc42 @5666.3_10 doesn't contain a c++ compiler so it falls back to the affected Xcode compiler. +# gcc version 4.0.1 (Apple Inc. build 5493) (from Xcode 3.1.4 on Leopard) is not affected. +# Other versions of gcc 4.0 not tested. Later versions of gcc are not affected. +platform darwin 8 { post-patch { - # https://sourceforge.net/tracker/?func=detail&atid=513479&aid=3581749&group_i... - reinplace "s|-fdiagnostics-show-option||g" ${worksrcpath}/src/CMakeLists.txt ${worksrcpath}/tests/CMakeLists.txt - # https://sourceforge.net/tracker/?func=detail&aid=3597386&group_id=66144&atid... reinplace "s|-fno-stack-protector||g" ${worksrcpath}/src/CMakeLists.txt ${worksrcpath}/tests/CMakeLists.txt } @@ -41,6 +40,7 @@ post-patch { # https://trac.macports.org/ticket/37947 + # https://sourceforge.net/tracker/?func=detail&atid=513479&aid=3606023&group_i... reinplace "/add_subdirectory(featuremap)/d" ${worksrcpath}/tests/CMakeLists.txt } Deleted: trunk/dports/graphics/graphite2/files/patch-Graphite.cmake.diff =================================================================== --- trunk/dports/graphics/graphite2/files/patch-Graphite.cmake.diff 2013-03-01 12:34:50 UTC (rev 103558) +++ trunk/dports/graphics/graphite2/files/patch-Graphite.cmake.diff 2013-03-01 12:34:52 UTC (rev 103559) @@ -1,23 +0,0 @@ -http://lists.freedesktop.org/archives/harfbuzz/2012-December/002735.html -http://projects.palaso.org/projects/graphitedev/repository/revisions/1112 -Plus a comment change to make the .la file merge properly. ---- Graphite.cmake.orig -+++ Graphite.cmake -@@ -32,7 +32,7 @@ - GET_TARGET_PROPERTY_WITH_DEFAULT(_target_age ${_target} LT_VERSION_AGE 0) - GET_TARGET_PROPERTY_WITH_DEFAULT(_target_revision ${_target} LT_VERSION_REVISION 0) - GET_TARGET_PROPERTY_WITH_DEFAULT(_target_installed ${_target} LT_INSTALLED yes) -- GET_TARGET_PROPERTY_WITH_DEFAULT(_target_shouldnotlink ${_target} LT_SHOULDNOTLINK yes) -+ GET_TARGET_PROPERTY_WITH_DEFAULT(_target_shouldnotlink ${_target} LT_SHOULDNOTLINK no) - GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlopen ${_target} LT_DLOPEN "") - GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlpreopen ${_target} LT_DLPREOPEN "") - GET_FILENAME_COMPONENT(_lanamewe ${_target_location} NAME_WE) -@@ -51,7 +51,7 @@ - FILE(APPEND ${_laname} "dependency_libs='${_target_dependency_libs}'\n\n") - FILE(APPEND ${_laname} "# Names of additional weak libraries provided by this library\n") - FILE(APPEND ${_laname} "weak_library_names=\n\n") -- FILE(APPEND ${_laname} "# Version information for ${_laname}.\n") -+ FILE(APPEND ${_laname} "# Version information\n") - FILE(APPEND ${_laname} "current=${_target_current}\n") - FILE(APPEND ${_laname} "age=${_target_age}\n") - FILE(APPEND ${_laname} "revision=${_target_revision}\n\n")