libgdiplus: remove unnecessary explicit dependencies

macports · Feb 20, 2019 · 4fd00ff · 4fd00ff
1 parent 5865a21
commit 4fd00ff
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 5 deletions.
diff --git a/devel/libgdiplus/Portfile b/devel/libgdiplus/Portfile
@@ -4,7 +4,7 @@ PortSystem              1.0
 
 name                    libgdiplus
 version                 2.10.9
-revision                6
+revision                7
 categories              devel
 platforms               darwin
 maintainers             {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
@@ -27,18 +27,16 @@ depends_lib             port:jpeg \
                         port:tiff \
                         port:giflib \
                         port:libpng \
-                        port:zlib \
                         port:fontconfig \
-                        port:libiconv \
                         port:libexif \
                         path:lib/pkgconfig/glib-2.0.pc:glib2 \
                         path:lib/pkgconfig/cairo.pc:cairo \
-                        port:xorg-libsm \
                         port:xrender
 
 patchfiles              patch-freetype-2.5.1.diff \
                         patch-libpng-1.5.diff \
-                        yosemite-libtool.patch
+                        yosemite-libtool.patch \
+                        patch-no_zlib.diff
 
 post-patch {
     reinplace "s/-pthread/-lpthread/g" ${worksrcpath}/configure

diff --git a/devel/libgdiplus/files/patch-no_zlib.diff b/devel/libgdiplus/files/patch-no_zlib.diff
@@ -0,0 +1,58 @@
+Remove explicit dependency on zlib.
+It is unnecessary.
+--- configure.orig	2012-01-31 10:28:27.000000000 -0700
++++ configure	2019-02-20 04:27:45.000000000 -0700
+@@ -12937,7 +12937,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ltiff -ljpeg -lz -lm $LIBS"
++LIBS="-ltiff -ljpeg $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+
+@@ -12970,7 +12970,7 @@
+ 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 :
+-  TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz'; tiff_ok=yes
++  TIFF='tiff'; LIBTIFF='-ltiff -ljpeg'; tiff_ok=yes
+ 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;}
+@@ -12984,7 +12984,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ltiff34 -lz -lm $LIBS"
++LIBS="-ltiff34 $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+
+@@ -13017,7 +13017,7 @@
+ 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 :
+-  TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz'; tiff_ok=yes
++  TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg'; tiff_ok=yes
+ 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;}
+@@ -13202,7 +13202,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng -lz -lm $LIBS"
++LIBS="-lpng $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+
+@@ -13268,7 +13268,7 @@
+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_ok" >&5
+ $as_echo "$png_ok" >&6; }
+           if test "$png_ok" = yes; then
+-            PNG='png'; LIBPNG='-lpng -lz'
++            PNG='png'; LIBPNG='-lpng'
+           else
+             as_fn_error but it is too old. See http://www.libpng.org/pub/png/libpng.html. "*** libpng12 found" "$LINENO" 5
+           fi