<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e3d57283bddb2ae09d824c17cd0aa0a9dc819ea6">https://github.com/macports/macports-ports/commit/e3d57283bddb2ae09d824c17cd0aa0a9dc819ea6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e3d57283bddb2ae09d824c17cd0aa0a9dc819ea6
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Aug 25 07:16:26 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> libgdiplus: update version 5.6.1->6.0.2
</span>---
devel/libgdiplus/Portfile | 16 ++++++---------
devel/libgdiplus/files/patch-fix_flags.diff | 30 +----------------------------
devel/libgdiplus/files/patch-no_zlib.diff | 12 ++++++------
3 files changed, 13 insertions(+), 45 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libgdiplus/Portfile b/devel/libgdiplus/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f331f6..2c8d969 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libgdiplus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libgdiplus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup active_variants 1.1
name libgdiplus
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.0.2
</span> revision 0
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +18,9 @@ long_description An implementation of the GDI+ API for Mono, an \
</span> homepage https://www.mono-project.com/Libgdiplus
master_sites https://download.mono-project.com/sources/libgdiplus/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 57f6f03b0734acabb557a0348f4e12e27db604b9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 78624f268fae77ba391037fe0c8c804924e8e9f94d4ca9a9dd5610d694cf9014 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 734255
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4b11e8dd15edb86d21170a215c62681c777a9df3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 716cf8fbbca6963022d5f1510b58a44cf8f40380cf6f7433d68c3db651f6f904 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1377140
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +31,7 @@ depends_lib port:jpeg \
</span> port:fontconfig \
port:libexif \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/pango.pc:pango \
</span> path:lib/pkgconfig/cairo.pc:cairo
patchfiles patch-no_zlib.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +47,7 @@ post-destroot {
</span> xinstall -d ${destroot}${docdir}
xinstall -m 0644 -W ${worksrcpath} \
AUTHORS COPYING ChangeLog LICENSE NEWS \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- README TODO \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ README.md TODO \
</span> ${destroot}${docdir}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,8 +57,3 @@ variant x11 {
</span> require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
}
default_variants +x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant pango description {Enable Pango font rendering support (experimental)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/pkgconfig/pango.pc:pango
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-pango
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libgdiplus/files/patch-fix_flags.diff b/devel/libgdiplus/files/patch-fix_flags.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 997c07b..68679b6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libgdiplus/files/patch-fix_flags.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libgdiplus/files/patch-fix_flags.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CFLAGS and LDFLAGS were modified for macOS in 2004.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See https://github.com/mono/libgdiplus/commit/bce17c28c445c49e9349aace2eb0e4a9bd235aad.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-It is not entirely clear why the changes were needed because the bug report is no longer available.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-However, they are causing problems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See https://trac.macports.org/ticket/24501.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-There is an upstream pull request to fix the issue.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See https://github.com/mono/libgdiplus/pull/534.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-no_x was removed upstream.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See https://github.com/mono/libgdiplus/commit/bf232eb9d5031d229933c0270cf74f3bdd1ccbc1.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> no_libpng16 it not appropriate for MacPorts, which provides libpng16.
--- configure.orig 2018-03-28 12:28:08.000000000 -0700
+++ configure 2019-02-20 15:39:46.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13281,10 +13281,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13527,7 +13527,6 @@
</span> #define OSX 1
_ACEOF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="-no-cpp-precomp $CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="-flat_namespace -undefined suppress $LDFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- no_x=yes
</span> - no_libpng16=yes # workaround until we can upgrade the libpng used by bockbuild
;;
*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14132,12 +14128,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</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;'>--# Add xrender here so that we don't fail to find glib if we won't have xrender.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "x$no_x" != "xyes" && "x$x11_available" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GDIPLUS_LIBS="$GDIPLUS_LIBS `$PKG_CONFIG --libs xrender `"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS `$PKG_CONFIG --cflags xrender `"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test x$with_libexif != xno && test -z "$LIBEXIF"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pkg_failed=no
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libgdiplus/files/patch-no_zlib.diff b/devel/libgdiplus/files/patch-no_zlib.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2691c7b..ca6c085 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libgdiplus/files/patch-no_zlib.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libgdiplus/files/patch-no_zlib.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ Remove explicit dependency on zlib.
</span> It is unnecessary.
--- configure.orig 2018-03-28 12:28:08.000000000 -0700
+++ configure 2019-02-20 15:37:34.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13695,7 +13695,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13945,7 +13945,7 @@
</span> $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ It is unnecessary.
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13728,7 +13728,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13978,7 +13978,7 @@
</span> if test "x$ac_cv_lib_tiff_TIFFWriteScanline" = xyes; then :
ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
if test "x$ac_cv_header_tiffio_h" = xyes; then :
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ It is unnecessary.
</span> else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5
$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13742,7 +13742,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13992,7 +13992,7 @@
</span> $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ It is unnecessary.
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13775,7 +13775,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14025,7 +14025,7 @@
</span> if test "x$ac_cv_lib_tiff34_TIFFFlushData" = xyes; then :
ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
if test "x$ac_cv_header_tiffio_h" = xyes; then :
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@ It is unnecessary.
</span> else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5
$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13994,7 +13994,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14244,7 +14244,7 @@
</span> $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@ It is unnecessary.
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14060,7 +14060,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14310,7 +14310,7 @@
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_ok" >&5
$as_echo "$png_ok" >&6; }
if test "$png_ok" = yes; then
</pre><pre style='margin:0'>
</pre>