From adb727afeb568404873e8cbc91ba93d3d49eff13 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Dec 2022 14:07:48 +0000 Subject: gentoo auto-resync : 26:12:2022 - 14:07:48 --- sci-misc/fitsverify/Manifest | 6 +- ...erify-4.20-Wimplicit-function-declaration.patch | 75 ++++++++++++++++++++++ .../files/fitsverify-4.20-makefile.patch | 10 +++ sci-misc/fitsverify/fitsverify-4.18.ebuild | 34 ---------- sci-misc/fitsverify/fitsverify-4.20.ebuild | 32 +++++++++ 5 files changed, 121 insertions(+), 36 deletions(-) create mode 100644 sci-misc/fitsverify/files/fitsverify-4.20-Wimplicit-function-declaration.patch create mode 100644 sci-misc/fitsverify/files/fitsverify-4.20-makefile.patch delete mode 100644 sci-misc/fitsverify/fitsverify-4.18.ebuild create mode 100644 sci-misc/fitsverify/fitsverify-4.20.ebuild (limited to 'sci-misc/fitsverify') diff --git a/sci-misc/fitsverify/Manifest b/sci-misc/fitsverify/Manifest index 12f028ff2f1c..85f16c81be70 100644 --- a/sci-misc/fitsverify/Manifest +++ b/sci-misc/fitsverify/Manifest @@ -1,3 +1,5 @@ -DIST fitsverify-4.18.tar.gz 42840 BLAKE2B e02fc9d5558e31fa2fa98b155a8acabe75f1fa2dfd8924519c6117cfde4754a2f49085e77fe52c0f859310877f5927e7a17f93c458e7d5aa72cb14b313c99211 SHA512 4be82078bf328538e1b98b386aedd6b2501a25e3d17f19e0db5b82ed8f62493e51f01228653ecf769ff3c706a16c8d65fe64ebc8693e8dd406e88d0a9ffc5010 -EBUILD fitsverify-4.18.ebuild 782 BLAKE2B ab629fad58555ea8a5d71783820bab6787dc58eadfb080047e01768cf8ea4962b996afc6a8e2b491a9b76e0ff4b0cee28bde6449a49815e6015db7fc379ebd3d SHA512 a85ff09bd7d6fa9e18f677a92c0c0bc0afa857d6a23d17b07e3498f1127d07959b5fb73e07f2af7d0b4746a1e31e7d1cff4f71289cc545d027211a3f3501bb3f +AUX fitsverify-4.20-Wimplicit-function-declaration.patch 1985 BLAKE2B 1141dc2ca294fee607f24e4e0b32dd16688366ec0413d7d918630b009d857ca9292444a2a026bfb2074d5b4ec66e3325666e9ce2440da5709dc3b7f7e74dd388 SHA512 4a1a4dd3c68a790f08262a7f050a3ccbb67fa4832f606090b0033609ab6f96588fc4f15d09f2951ba63f570bf790128fabb53c7a18ffc54c9bb27e2f2f32016c +AUX fitsverify-4.20-makefile.patch 317 BLAKE2B 8bd86e11dc8ce1532cf2ca02247d13e38ed5eb5c4799e5d8eb93b955b79dc2b116466ea21beaf0e837737d2e55b5eb8232cea681988520a317be2a64698a359a SHA512 fb563634d4c15b8d3c653990d643e42d1cb9d7e2687b8770624d1d20d924fecc243926803c49fb70fad3d3f64b36f114db9c096b0a7b99badbf5be6cc515ab60 +DIST fitsverify-4.20.tar.gz 43113 BLAKE2B b449a93cc99b477b7c720f2fd460baa706235929ac87b15f18405dd507e085c6759cb9c4b76b2abc4318a4711e4db507334972cf0cf1620251df32a4cf1709fa SHA512 686940d509ffd355f7616d6348e143f91152a6f248c0fea512cd8a47cda4b93048e1e7304652af598b7cca4685437c0a0e6f170213335381c77e8ff7cd7bf49c +EBUILD fitsverify-4.20.ebuild 687 BLAKE2B c421c6960167060a0a3e8f58cfae779ecc6af7c343300775adafbfcc67d95a944cc4aaf730b0c5240ef7cf8a5e130a1fdefc974bb033e130d9df81232ab0ddb6 SHA512 1a923b039868c612d5f948b857b058b12d198410c5b8516e44babe282110aa99190bd689c43f5d6b339865c5e2b472759a7e7b709ff646b92fcdb97cef44e9cc MISC metadata.xml 511 BLAKE2B 3b832e8fee0ebe02f3cd971228687f951f67b99f2105d281e263f4f83dab7598657cff78b21a9aca0cdf749433e0d6de09c8a6acec9382cc020c325f182dc9af SHA512 58ed7a7b191fc0d7c725731d31320945f529aa68ef87b6c13e5eb68e0a5401fc897d6760beaaccf662f6004035aee044a2d7f17d3d5b3e15f6f89cd40bc54ec4 diff --git a/sci-misc/fitsverify/files/fitsverify-4.20-Wimplicit-function-declaration.patch b/sci-misc/fitsverify/files/fitsverify-4.20-Wimplicit-function-declaration.patch new file mode 100644 index 000000000000..771fb9394b73 --- /dev/null +++ b/sci-misc/fitsverify/files/fitsverify-4.20-Wimplicit-function-declaration.patch @@ -0,0 +1,75 @@ +--- a/fverify.h ++++ b/fverify.h +@@ -169,16 +169,16 @@ + int errnum; /* number of errors in this hdu */ + int wrnno; /* number of warnning in this hdu */ + }HduName; +-int get_total_warn(); +-int get_total_err(); +-void init_hduname(); ++int get_total_warn(void); ++int get_total_err(void); ++void init_hduname(void); + void set_hduname(int hdunum,int hdutype, char* extname,int extver); + void set_hduerr(int hdunum); + void set_hdubasic(int hdunum,int hdutype); + int test_hduname(int hdunum1, int hdunum2); + void total_errors (int *totalerr, int * totalwrn); + void hdus_summary(FILE *out); +-void destroy_hduname(); ++void destroy_hduname(void); + void test_end(fitsfile *infits, FILE *out); + void init_report(FILE *out, char *rootnam); + void close_report(FILE *out); +@@ -198,7 +198,7 @@ + int wrtserr(FILE *out, char* mess, int *status, int severity); + void wrtsep (FILE *out,char fill, char *title, int nchar); + void num_err_wrn(int *num_err, int *num_wrn); +-void reset_err_wrn(); ++void reset_err_wrn(void); + int compkey (const void *key1, const void *key2); + int compcol (const void *col1, const void *col2); + int compcol (const void *col1, const void *col2); +--- a/fvrf_file.c ++++ b/fvrf_file.c +@@ -3,17 +3,17 @@ + static int total_err=1; /* initialzed to 1 in case fail to open file */ + static int total_warn=0; + +-int get_total_warn() ++int get_total_warn(void) + { + return (total_warn); + } +-int get_total_err() ++int get_total_err(void) + { + return (total_err); + } + + /* Get the total hdu number and allocate the memory for hdu array */ +-void init_hduname() ++void init_hduname(void) + { + int i; + /* allocate memories for the hdu structure array */ +@@ -168,7 +168,7 @@ + + + +-void destroy_hduname() ++void destroy_hduname(void) + { + int i; + for (i=0; i < totalhdu; i++) free(hduname[i]); +--- a/fvrf_misc.c ++++ b/fvrf_misc.c +@@ -20,7 +20,7 @@ + return; + } + +-void reset_err_wrn() ++void reset_err_wrn(void) + { + nwrns = 0; + nerrs = 0; diff --git a/sci-misc/fitsverify/files/fitsverify-4.20-makefile.patch b/sci-misc/fitsverify/files/fitsverify-4.20-makefile.patch new file mode 100644 index 000000000000..d7d644720479 --- /dev/null +++ b/sci-misc/fitsverify/files/fitsverify-4.20-makefile.patch @@ -0,0 +1,10 @@ +--- /dev/null ++++ b/Makefile +@@ -0,0 +1,7 @@ ++PKG_CONFIG ?= pkg-config ++ ++CPPFLAGS += -DSTANDALONE $(shell $(PKG_CONFIG) --cflags cfitsio) ++LIBS += $(shell $(PKG_CONFIG) --libs cfitsio) ++ ++fitsverify: ftverify.o fvrf_data.o fvrf_file.o fvrf_head.o fvrf_key.o fvrf_misc.o ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS) diff --git a/sci-misc/fitsverify/fitsverify-4.18.ebuild b/sci-misc/fitsverify/fitsverify-4.18.ebuild deleted file mode 100644 index 9d85f6e203cf..000000000000 --- a/sci-misc/fitsverify/fitsverify-4.18.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="FITS file format checker" -HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/" -SRC_URI="https://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="sci-libs/cfitsio:0=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${PN}" - -src_compile() { - $(tc-getCC) ${CPPFLAGS} -DSTANDALONE ${CFLAGS} ${LDFLAGS} \ - $($(tc-getPKG_CONFIG) --cflags cfitsio) \ - ftverify.c fvrf*.c \ - $($(tc-getPKG_CONFIG) --libs cfitsio) -o ${PN} \ - || die "compiled failed" -} - -src_install() { - dobin fitsverify - dodoc README -} diff --git a/sci-misc/fitsverify/fitsverify-4.20.ebuild b/sci-misc/fitsverify/fitsverify-4.20.ebuild new file mode 100644 index 000000000000..c194846beabf --- /dev/null +++ b/sci-misc/fitsverify/fitsverify-4.20.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="FITS file format checker" +HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/" +SRC_URI="https://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +RDEPEND="sci-libs/cfitsio:0=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch +) + +src_configure() { + tc-export CC PKG_CONFIG +} + +src_install() { + dobin fitsverify + einstalldocs +} -- cgit v1.2.3