wcstools, bump version (#8374)

This commit is contained in:
Schrijvers Luc
2023-04-14 11:42:36 +02:00
committed by GitHub
parent a67722f527
commit 7f58a203c6
4 changed files with 31 additions and 69 deletions

View File

@@ -13,5 +13,3 @@ libwcstools_la_SOURCES = \
wcsdir = $(includedir)/wcs
wcs_HEADERS = \
wcscat.h wcslib.h wcs.h lwcs.h fitshead.h fitsfile.h imio.h
noinst_HEADERS = fitsfile1.h wcscat1.h

View File

@@ -1,59 +0,0 @@
From dc8211f03f3c6ab2b427820f01fad755ddfb6136 Mon Sep 17 00:00:00 2001
From: Gabriele Baldassarre <gabriele@gabrielebaldassarre.com>
Date: Fri, 8 May 2020 23:33:56 +0000
Subject: Use autoheader file
diff --git a/libwcs/wcs.h b/libwcs/wcs.h
index 0d69049..6cda4e4 100644
--- a/libwcs/wcs.h
+++ b/libwcs/wcs.h
@@ -30,6 +30,10 @@
#ifndef _wcs_h_
#define _wcs_h_
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "wcslib.h"
#include "fitshead.h"
--
2.26.0
From d4c42087bf2a8c2e122de4a4a776c05e0ad26a48 Mon Sep 17 00:00:00 2001
From: Gabriele Baldassarre <gabriele@gabrielebaldassarre.com>
Date: Fri, 8 May 2020 23:37:56 +0000
Subject: Fix compiler warnings
diff --git a/libwcs/imhfile.c b/libwcs/imhfile.c
index b618686..4279d3c 100644
--- a/libwcs/imhfile.c
+++ b/libwcs/imhfile.c
@@ -1075,7 +1075,7 @@ char *hdrname; /* IRAF image header file pathname */
/* add name */
newpixname[len] = '\0';
- (void)strncat (newpixname, pixname, SZ_IM2PIXFILE);
+ (void)strncat (newpixname, pixname, SZ_IM2PIXFILE - len);
}
/* Pixel file has same name as header file, but with .pix extension */
diff --git a/libwcs/webread.c b/libwcs/webread.c
index 1f5c518..cd9cba9 100644
--- a/libwcs/webread.c
+++ b/libwcs/webread.c
@@ -32,6 +32,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
+#include <ctype.h>
#include <math.h>
#include "wcs.h"
#include "fitsfile.h"
--
2.26.0

View File

@@ -0,0 +1,24 @@
From f9ed9b1615b94f83c5ae467452091234d14cf073 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Fri, 14 Apr 2023 11:15:46 +0200
Subject: Fix for missing sys/fcntl.h
diff --git a/libwcs/webread.c b/libwcs/webread.c
index 3f5b86b..24e94ba 100644
--- a/libwcs/webread.c
+++ b/libwcs/webread.c
@@ -45,8 +45,10 @@
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#else
+#ifdef HAVE_SYS_FCNTL_H
#include <sys/fcntl.h>
#endif
+#endif
#include <sys/time.h>
#include <sys/types.h>
--
2.37.3

View File

@@ -11,15 +11,12 @@ LICENSE="GNU GPL v2
GNU LGPL v2.1"
REVISION="1"
SOURCE_URI="http://tdc-www.harvard.edu/software/wcstools/wcstools-$portVersion.tar.gz"
CHECKSUM_SHA256="b2f9be55fdec29f0c640028a9986771bfd6ab3d2f633953e4c7cc3b410e5fe9c"
CHECKSUM_SHA256="525f6970eb818f822db75c1526b3122b1af078affa572dce303de37df5c7b088"
PATCHES="wcstools-$portVersion.patchset"
ADDITIONAL_FILES="
configure.ac
ADDITIONAL_FILES="configure.ac
Makefile.am
Makefile.libwcs.am
wcstools.pc.in
"
wcstools.pc.in"
ARCHITECTURES="all !x86_gcc2 ?arm ?ppc ?sparc"
SECONDARY_ARCHITECTURES="x86"
@@ -196,7 +193,9 @@ BUILD()
autoconf --force
automake --add-missing --force-missing
runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir"
runConfigure --omit-dirs binDir ./configure \
--bindir="$commandBinDir" \
--disable-static
make $jobArgs
}
@@ -204,7 +203,7 @@ INSTALL()
{
make install
rm -f $libDir/libwcstools.la*
rm -f $libDir/libwcstools.la
prepareInstalledDevelLib libwcstools
fixPkgconfig