summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViorel Munteanu <ceamac.paragon@gmail.com>2021-11-25 10:04:33 +0200
committerIonen Wolkens <ionen@gentoo.org>2021-11-27 21:08:58 -0500
commit3ad19a84552b64107365fbcd64ac457b84800d80 (patch)
tree1244adbe1599dbfa51f5e18d6617f1b199f28cc2 /media-libs/netpbm/files
parentmedia-libs/netpbm: bump to v10.86.26 (diff)
downloadgentoo-3ad19a84552b64107365fbcd64ac457b84800d80.tar.gz
gentoo-3ad19a84552b64107365fbcd64ac457b84800d80.tar.bz2
gentoo-3ad19a84552b64107365fbcd64ac457b84800d80.zip
media-libs/netpbm: drop v10.76.00
Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Viorel Munteanu <ceamac.paragon@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/23073 Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'media-libs/netpbm/files')
-rw-r--r--media-libs/netpbm/files/netpbm-10.76.00-build.patch38
-rw-r--r--media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch68
-rw-r--r--media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch22
-rw-r--r--media-libs/netpbm/files/netpbm-10.76.00-test.patch248
4 files changed, 0 insertions, 376 deletions
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-build.patch b/media-libs/netpbm/files/netpbm-10.76.00-build.patch
deleted file mode 100644
index 231da5446719..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
-- Try to fix parallel building
-
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -249,7 +249,7 @@
- .PHONY: install.staticlib
- install.staticlib: $(PKGDIR)/link
- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
-- $(PKGDIR)/link
-+ $(PKGDIR)/lib
-
- # Install a shared library stub -- the ".so" file used at link time to
- # prepare a program for dynamically linking a library at run time
-@@ -257,9 +257,9 @@
- install.sharedlibstub: $(PKGDIR)/link
- ifeq ($(NETPBMLIBTYPE),unixshared)
- # install the link-time (.so) links to the runtime libraries
-- cd $(PKGDIR)/link ; \
-+ cd $(PKGDIR)/lib ; \
- rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
-- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
-+ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
- libnetpbm.$(NETPBMLIBSUFFIX)
- endif
- ifeq ($(NETPBMLIBTYPE),dll)
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -87,6 +87,9 @@
-
- .PHONY: nonmerge
- nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
-+
-+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
-+converter/all analyzer/all editor/all generator/all other/all: lib/all
-
- # Parallel make (make --jobs) is not smart enough to coordinate builds
- # between submakes, so a naive parallel make would cause certain
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch b/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
deleted file mode 100644
index bd894bfb3159..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-do not autoprobe deps when we disabled them
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -74,7 +74,10 @@ include $(BUILDDIR)/config.mk
-
- PROG_SUBDIRS = converter analyzer editor generator other
- PRODUCT_SUBDIRS = lib $(PROG_SUBDIRS)
--SUPPORT_SUBDIRS = urt icon buildtools test
-+SUPPORT_SUBDIRS = icon buildtools test
-+ifeq ($(URTLIB),$(BUNDLED_URTLIB))
-+SUPPORT_SUBDIRS += urt
-+endif
-
- SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
-
---- a/converter/other/Makefile
-+++ b/converter/other/Makefile
-@@ -7,6 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
-
- include $(BUILDDIR)/config.mk
-
-+ifneq ($(XML2_LIBS),NONE)
- TEST_PKGCONFIG_LIBXML2 = if pkg-config libxml-2.0; then echo exists; fi
-
- ifneq ($(shell $(TEST_PKGCONFIG_LIBXML2)),)
-@@ -22,6 +23,7 @@ else
- XML2_CFLAGS=$(shell xml2-config --cflags)
- endif
- endif
-+endif
-
- SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg
- ifneq ($(BUILD_FIASCO), N)
-@@ -34,6 +36,7 @@ ifneq ($(TIFFLIB),NONE)
- endif
- endif
-
-+ifneq ($(PNGLIB),NONE)
- TEST_PKGCONFIG_LIBPNG = if pkg-config libpng$(PNGVER); then echo exists; fi
-
- ifneq ($(shell $(TEST_PKGCONFIG_LIBPNG)),)
-@@ -58,6 +61,7 @@ else
- endif
- endif
- endif
-+endif
-
- ifneq ($(JPEGLIB),NONE)
- ifneq ($(JPEGHDR_DIR)x,x)
---- a/other/pamx/Makefile
-+++ b/other/pamx/Makefile
-@@ -9,6 +9,7 @@ include $(BUILDDIR)/config.mk
-
- EXTERN_INCLUDE =
-
-+ifneq ($(X11LIB),NONE)
- ifeq ($(shell pkg-config x11 --modversion --silence-errors),)
- # Pkg-config has never heard of X11, or doesn't even exist
-
-@@ -23,6 +24,7 @@ else
- X11LIB = $(shell pkg-config x11 --libs)
- EXTERN_INCLUDES += $(shell pkg-config x11 --cflags)
- endif
-+endif
-
- ifeq ($(HAVE_X11LIB),Y)
- PORTBINARIES += pamx
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
deleted file mode 100644
index 717c86a72ac5..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-the tool tries to generate binary output, but the current locale might change
-what awk generates. force it to C/ASCII to avoid that.
-
-https://bugs.gentoo.org/601012
-
---- a/test/pbmtext.test
-+++ b/test/pbmtext.test
-@@ -81,12 +81,14 @@ rm ${fontRectangle_txt} ${font_pbm}
-
- # One long row
- # Should print 3233136020 4535
-+LC_CTYPE=C \
- awk 'BEGIN { for (i=32; i<=125;++i) printf("%c",i);
- for (i=160;i<=255;++i) printf("%c",i); }' | \
- pbmtext -builtin bdf | cksum
-
- # One tall column
- # Should print 1216262214 5711
-+LC_CTYPE=C \
- awk 'BEGIN { for (i=32; i<=125;++i) printf("%c\n",i);
- for (i=160;i<=255;++i) printf("%c\n",i); }' | \
- pbmtext -nomargins -builtin bdf | cksum
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-test.patch
deleted file mode 100644
index 8bb1b17e15fa..000000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-test.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-automatically skip tests of disabled tools
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -455,6 +458,21 @@ deb:
- .PHONY: check-package
- .PHONY: check-install
-
-+# Variables from the make env we pass down to the test scripts.
-+CHECK_VARS = \
-+ BUILDDIR=$(BUILDDIR) \
-+ RGBDEF=$(RGBDEF) \
-+ BUILD_FIASCO=$(BUILD_FIASCO) \
-+ JASPERLIB="$(JASPERLIB)" \
-+ JBIGLIB="$(JBIGLIB)" \
-+ JPEGLIB="$(JPEGLIB)" \
-+ PNGLIB="$(PNGLIB)" \
-+ TIFFLIB="$(TIFFLIB)" \
-+ URTLIB="$(URTLIB)" \
-+ X11LIB="$(X11LIB)" \
-+ XML2_LIBS="$(XML2_LIBS)" \
-+ ZLIB="$(ZLIB)"
-+
- # Test files in source tree.
-
- check-tree : BUILDBINDIRS :=./analyzer \
-@@ -525,10 +543,10 @@ resultdir-backup: FORCE
-
- check-tree: $(TESTRANDOM) resultdir-backup
- cd $(RESULTDIR); \
-+ $(CHECK_VARS) \
- CHECK_TYPE=tree \
-- PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \
-+ PBM_TEST_PATH=$(PBM_TEST_PATH) \
- LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \
-- RGBDEF=$(RGBDEF) \
- $(SRCDIR)/test/Execute-Tests 2>&1
-
- # Execute-Tests needs to know BUILDDIR in order to locate testrandom.
-@@ -545,19 +563,18 @@ check: check-package
-
- check-package: $(TESTRANDOM) resultdir-backup
- cd $(RESULTDIR); \
-+ $(CHECK_VARS) \
- CHECK_TYPE=package \
-- PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \
-+ PBM_TEST_PATH=$(PBM_TEST_PATH) \
- LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \
-- RGBDEF=$(RGBDEF) \
- $(SRCDIR)/test/Execute-Tests 2>&1
-
-
- # Check after install
- check-install: $(TESTRANDOM) resultdir-backup
- cd $(RESULTDIR); \
-+ $(CHECK_VARS) \
- CHECK_TYPE=install \
-- BUILDDIR=$(BUILDDIR) \
-- RGBDEF=$(RGBDEF) \
- $(SRCDIR)/test/Execute-Tests 2>&1
-
-
---- a/test/all-in-place.test
-+++ b/test/all-in-place.test
-@@ -367,11 +367,62 @@ ordinary_testprogs="\
- zeisstopnm \
- "
-
-+enabled_testprog() {
-+ case $1 in
-+ fiascotopnm|\
-+ pnmtofiasco)
-+ [ "${BUILD_FIASCO}" = "N" ] && return 1 ;;
-+
-+ jpeg2ktopam|\
-+ pamtojpeg2k)
-+ [ "${JASPERLIB}" = "NONE" ] && return 1 ;;
-+
-+ jbigtopnm|\
-+ pnmtojbig)
-+ [ "${JBIGLIB}" = "NONE" ] && return 1 ;;
-+
-+ jpegtopnm|\
-+ pnmtojpeg|\
-+ ppmtojpeg)
-+ [ "${JPEGLIB}" = "NONE" ] && return 1 ;;
-+
-+ pamtopng|\
-+ pngtopam|\
-+ pnmtopng)
-+ [ "${PNGLIB}" = "NONE" ] && return 1 ;;
-+
-+ svgtopam)
-+ [ "${PNGLIB}" = "NONE" ] && return 1
-+ [ "${XML2_LIBS}" = "NONE" ] && return 1
-+ ;;
-+
-+ pamtotiff|\
-+ pnmtotiffcmyk|\
-+ tifftopnm)
-+ [ "${TIFFLIB}" = "NONE" ] && return 1 ;;
-+
-+ pnmtorle|\
-+ rletopnm)
-+ [ "${URTLIB}" = "NONE" ] && return 1 ;;
-+
-+ pamx)
-+ [ "${X11LIB}" = "NONE" ] && return 1 ;;
-+ esac
-+
-+ return 0
-+}
-+
- # The string "fiascotopnm" has to be filtered out by egrep for fiascotopnm
- # has a slightly different version report format.
-
- for i in $ordinary_testprogs
- do
-+ # Stub out programs that aren't built.
-+ if ! enabled_testprog "$i"; then
-+ echo "$i: ok"
-+ continue
-+ fi
-+
- $i --version 2>&1 | \
- egrep -v -e fiascotopnm -e \
- "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
---- a/test/fiasco-roundtrip.test
-+++ b/test/fiasco-roundtrip.test
-@@ -2,6 +2,10 @@
- # This script tests: pnmtofiasco fiascotopnm
- # Also requires: pnmpad
-
-+if [ "${BUILD_FIASCO}" = "N" ]; then
-+ exit 80
-+fi
-+
- # Should print 215556145 102615
-
- pnmpad --black --bottom 1 --left 1 testimg.ppm | \
---- a/test/jbig-roundtrip.test
-+++ b/test/jbig-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pnmtojbig jbigtopnm
- # Also requires: pamchannel pamtopnm
-
-+if [ "${JBIGLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-
- # Test 1. Should print 2425386270 41
- pnmtojbig testgrid.pbm | jbigtopnm | cksum
---- a/test/legacy-names.test
-+++ b/test/legacy-names.test
-@@ -94,8 +94,30 @@ ordinary_testprogs="\
- ppmtouil \
- "
-
-+enabled_testprog() {
-+ case $1 in
-+ ppmtojpeg)
-+ [ "${JPEGLIB}" = "NONE" ] && return 1 ;;
-+
-+ pamrgbatopng|\
-+ pngtopnm)
-+ [ "${PNGLIB}" = "NONE" ] && return 1 ;;
-+
-+ pnmtotiff)
-+ [ "${TIFFLIB}" = "NONE" ] && return 1 ;;
-+ esac
-+
-+ return 0
-+}
-+
- for i in $ordinary_testprogs
- do
-+ # Stub out programs that aren't built.
-+ if ! enabled_testprog "$i"; then
-+ echo "$i: ok"
-+ continue
-+ fi
-+
- $i --version 2>&1 | \
- egrep -v \
- "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
---- a/test/png-roundtrip.test
-+++ b/test/png-roundtrip.test
-@@ -6,6 +6,10 @@
- ## If this test fails and pnm-roundtrip2.test succeeds, it indicates
- ## some problem with pnmtopng.
-
-+if [ "${PNGLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-+
- # Test 1. Should print 1926073387 101484 18 times
- for flags in "" -interlace \
- -gamma=.45 \
---- a/test/png-roundtrip2.test
-+++ b/test/png-roundtrip2.test
-@@ -9,6 +9,10 @@
- ## If both tests fail, the likely cause is a problem with pngtopam.
- ## It is also possible that there is some problem in libpng.
-
-+if [ "${PNGLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-+
- # Test 1. Should print 1926073387 101484 twice
- for flags in "" -gamma=.45
- do
---- a/test/ps-roundtrip.test
-+++ b/test/ps-roundtrip.test
-@@ -8,6 +8,10 @@
- ## (1) zlib was not linked.
- ## (2) ghostscript is not available.
-
-+if [ "${ZLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-+
- tmpdir=${tmpdir:-/tmp}
-
- # pstopnm does not use libnetpbm functions for output.
---- a/test/tiff-roundtrip.test
-+++ b/test/tiff-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pamtotiff tifftopnm
- # Also requires:
-
-+if [ "${TIFFLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-
- # Failure message
- ## Second test fails if Netpbm was built without the flate library
---- a/test/utahrle-roundtrip.test
-+++ b/test/utahrle-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pnmtorle rletopnm
- # Also requires: pamchannel pamtopnm
-
-+if [ "${URTLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-
- #Test 1. Should produce 1571496937 33838, cksum of testimg.red
- pamchannel -infile=testimg.ppm -tupletype="GRAYSCALE" 0 | pamtopnm | \