# HG changeset patch # User John Donoghue # Date 1690909157 14400 # Node ID c04e1789dc7aa85da39ffc59786c964b305425db # Parent 92633c7288cd923d6846950d804c235ed28bd2fe cfitsio: update to v4.3.0 * src/cfitsio.mk: update version, disable curl explicitly in mingw * src/mingw-cfitsio-1-fixes.patch: deleted * dist-files.mk: remove deleted file ref diff -r 92633c7288cd -r c04e1789dc7a dist-files.mk --- a/dist-files.mk Tue Aug 01 18:03:05 2023 +0200 +++ b/dist-files.mk Tue Aug 01 12:59:17 2023 -0400 @@ -336,7 +336,6 @@ mesa.mk \ mingw-blas-1-xerbla.patch \ mingw-cairo-1-ssize-t-defined.patch \ - mingw-cfitsio-1-fixes.patch \ mingw-epstool-1-fixes.patch \ mingw-glpk-1-fixes.patch \ mingw-graphicsmagick-1-dcraw.patch \ diff -r 92633c7288cd -r c04e1789dc7a src/cfitsio.mk --- a/src/cfitsio.mk Tue Aug 01 18:03:05 2023 +0200 +++ b/src/cfitsio.mk Tue Aug 01 12:59:17 2023 -0400 @@ -3,8 +3,8 @@ PKG := cfitsio $(PKG)_IGNORE := -$(PKG)_VERSION := 4.2.0 -$(PKG)_CHECKSUM := 165f0af3c9931ae5ad0dc3eb396a10711b4fdd6b +$(PKG)_VERSION := 4.3.0 +$(PKG)_CHECKSUM := ccacad868712821c345da3313c3c83afb8efde1e $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/$($(PKG)_FILE) @@ -17,7 +17,7 @@ $(PKG)_CONFIGURE_FLAGS := ifeq ($(MXE_SYSTEM),mingw) - $(PKG)_CONFIGURE_FLAGS += CURLCONFIG=none + $(PKG)_CONFIGURE_FLAGS += --disable-curl endif define $(PKG)_UPDATE diff -r 92633c7288cd -r c04e1789dc7a src/mingw-cfitsio-1-fixes.patch --- a/src/mingw-cfitsio-1-fixes.patch Tue Aug 01 18:03:05 2023 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -ur cfitsio-4.1.0.orig/configure.in cfitsio-4.1.0/configure.in ---- cfitsio-4.1.0.orig/configure.in 2022-05-26 08:43:32.205001801 -0400 -+++ cfitsio-4.1.0/configure.in 2022-05-26 08:44:53.020552448 -0400 -@@ -489,7 +489,7 @@ - if test "x$ADD_CURL" = xyes; then - # Use curl-config to get compiler & linker flags, if available. - AC_CHECK_PROG([CURLCONFIG], [curl-config], [curl-config], [], [], []) -- if test "x$CURLCONFIG" != x; then -+ if test "x$CURLCONFIG" != x && test "x$CURLCONFIG" != "xnone"; then - CURL_LIB=`$CURLCONFIG --libs` - CURL_INC=`$CURLCONFIG --cflags` - if test "x$CURL_LIB" != x; then