summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2024-06-19 06:27:24 +0200
committerMichał Górny <mgorny@gentoo.org>2024-06-19 06:27:24 +0200
commitd71a074b304a386ccd43dbb94c149f6488fb6790 (patch)
tree1363d566d61027aa7cecf28af62492f3473e1149 /sci-libs/cfitsio/files
parentdev-python/fitsio: Bump to 1.2.4 (diff)
downloadgentoo-d71a074b304a386ccd43dbb94c149f6488fb6790.tar.gz
gentoo-d71a074b304a386ccd43dbb94c149f6488fb6790.tar.bz2
gentoo-d71a074b304a386ccd43dbb94c149f6488fb6790.zip
sci-libs/cfitsio: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sci-libs/cfitsio/files')
-rw-r--r--sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch20
-rw-r--r--sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch60
-rw-r--r--sci-libs/cfitsio/files/cfitsio-4.0.0-pkgconfig.patch20
-rw-r--r--sci-libs/cfitsio/files/cfitsio-4.0.0-system-zlib.patch50
-rw-r--r--sci-libs/cfitsio/files/cfitsio-4.1.0-pkgconfig.patch19
-rw-r--r--sci-libs/cfitsio/files/cfitsio-4.1.0-system-zlib.patch53
6 files changed, 0 insertions, 222 deletions
diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch
deleted file mode 100644
index 37b47c7b820f..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur a/cfitsio.pc.in b/cfitsio.pc.in
---- a/cfitsio.pc.in 2019-05-08 17:34:49.000000000 +0200
-+++ b/cfitsio.pc.in 2019-08-01 15:56:52.064310329 +0200
-@@ -1,12 +1,12 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=@includedir@
-+includedir=@includedir@/cfitsio
-
- Name: cfitsio
- Description: FITS File Subroutine Library
- URL: https://heasarc.gsfc.nasa.gov/fitsio/
- Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@
--Libs: -L${libdir} -lcfitsio
--Libs.private: -lm @LIBS@
--Cflags: -I${includedir}
-+Libs: -L${libdir} -lcfitsio
-+Libs.private: -lm -lz @LIBS@
-+Cflags: -D_REENTRANT -I${includedir}
diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch
deleted file mode 100644
index 6ade40ce62f3..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur a/Makefile.in b/Makefile.in
---- a/Makefile.in 2019-05-08 17:34:50.000000000 +0200
-+++ b/Makefile.in 2019-08-01 15:52:57.829760351 +0200
-@@ -68,9 +68,7 @@
- pliocomp.c fits_hcompress.c fits_hdecompress.c \
- simplerng.c @GSIFTP_SRC@
-
--ZLIB_SOURCES = zlib/adler32.c zlib/crc32.c zlib/deflate.c zlib/infback.c \
-- zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \
-- zlib/uncompr.c zlib/zcompress.c zlib/zuncompress.c zlib/zutil.c
-+ZLIB_SOURCES = zlib/zcompress.c zlib/zuncompress.c
-
- SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@
-
-@@ -103,7 +101,7 @@
- shared: lib${PACKAGE}${SHLIB_SUFFIX}
-
- lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
-- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS}
-+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS}
- @if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
- ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
- ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
-@@ -140,28 +138,28 @@
- ${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
-
- smem: smem.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz
-
- testprog: testprog.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- fpack: fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- funpack: funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- fitscopy: fitscopy.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- speed: speed.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- imcopy: imcopy.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- cookbook: cookbook.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- eval: # Rebuild eval_* files from flex/bison source
- ${FLEX} -t eval.l > eval_l.c1
diff --git a/sci-libs/cfitsio/files/cfitsio-4.0.0-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-4.0.0-pkgconfig.patch
deleted file mode 100644
index 4d743f2d32d9..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-4.0.0-pkgconfig.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/cfitsio.pc.in b/cfitsio.pc.in
-index 7cc25c6..95fb9d0 100644
---- a/cfitsio.pc.in
-+++ b/cfitsio.pc.in
-@@ -1,12 +1,12 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=@includedir@
-+includedir=@includedir@/cfitsio
-
- Name: cfitsio
- Description: FITS File Subroutine Library
- URL: https://heasarc.gsfc.nasa.gov/fitsio/
- Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@.@CFITSIO_MICRO@
- Libs: -L${libdir} -lcfitsio
--Libs.private: -lm @LIBS@
--Cflags: -I${includedir}
-+Libs.private: -lm -lz @LIBS@
-+Cflags: -D_REENTRANT -I${includedir}
diff --git a/sci-libs/cfitsio/files/cfitsio-4.0.0-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-4.0.0-system-zlib.patch
deleted file mode 100644
index f26f3d431505..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-4.0.0-system-zlib.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index d607eec..b646458 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -102,7 +102,7 @@ lib${PACKAGE}.a: ${OBJECTS}
- shared: lib${PACKAGE}${SHLIB_SUFFIX}
-
- lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
-- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS}
-+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS}
- @if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
- ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
- ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
-@@ -140,28 +140,28 @@ swapproc.o: swapproc.c
- ${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
-
- smem: smem.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz
-
- testprog: testprog.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- fpack: fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- funpack: funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- fitscopy: fitscopy.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- speed: speed.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- imcopy: imcopy.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- cookbook: cookbook.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- eval: # Rebuild eval_* files from flex/bison source
- ${FLEX} -t eval.l > eval_l.c1
diff --git a/sci-libs/cfitsio/files/cfitsio-4.1.0-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-4.1.0-pkgconfig.patch
deleted file mode 100644
index 63502b77f756..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-4.1.0-pkgconfig.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur a/cfitsio.pc.in b/cfitsio.pc.in
---- a/cfitsio.pc.in 2022-05-26 17:25:47.094287274 +0200
-+++ b/cfitsio.pc.in 2022-05-26 17:30:27.552413663 +0200
-@@ -1,12 +1,12 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=@includedir@
-+includedir=@includedir@/cfitsio
-
- Name: cfitsio
- Description: FITS File Subroutine Library
- URL: https://heasarc.gsfc.nasa.gov/fitsio/
- Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@.@CFITSIO_MICRO@
- Libs: -L${libdir} -lcfitsio
--Libs.private: -lm @LIBS@
--Cflags: -I${includedir}
-+Libs.private: -lm -lz @LIBS@
-+Cflags: -D_REENTRANT -I${includedir}
diff --git a/sci-libs/cfitsio/files/cfitsio-4.1.0-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-4.1.0-system-zlib.patch
deleted file mode 100644
index 6d740074857c..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-4.1.0-system-zlib.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -ur a/Makefile.in b/Makefile.in
---- a/Makefile.in 2022-05-26 17:33:37.986215858 +0200
-+++ b/Makefile.in 2022-05-26 17:34:27.580944957 +0200
-@@ -102,7 +102,7 @@
- shared: lib${PACKAGE}${SHLIB_SUFFIX}
-
- lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
-- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS}
-+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS}
- @if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
- ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
- ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
-@@ -140,31 +140,31 @@
- ${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
-
- smem: smem.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz
-
- testprog: testprog.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- fpack: fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- funpack: funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- fitscopy: fitscopy.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- speed: speed.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- imcopy: imcopy.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- cookbook: cookbook.o lib${PACKAGE}.a ${OBJECTS}
-- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- testf77: testf77.o lib${PACKAGE}.a ${OBJECTS}
-- ${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
-+ ${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
-
- eval: # Rebuild eval_* files from flex/bison source
- ${FLEX} -t eval.l > eval_l.c1