From 09351e78166b5e864197c4456ebae3f89dd0bed9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 22 Jan 2019 10:09:44 +0000 Subject: gentoo resync : 22.01.2019 --- media-gfx/xloadimage/Manifest | 3 +- .../xloadimage/files/xloadimage-4.1-libpng15.patch | 4 +- media-gfx/xloadimage/xloadimage-4.1-r12.ebuild | 96 ++++++++++++++++++++++ 3 files changed, 100 insertions(+), 3 deletions(-) create mode 100644 media-gfx/xloadimage/xloadimage-4.1-r12.ebuild (limited to 'media-gfx/xloadimage') diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest index be9e8fddf19e..225979e1fa03 100644 --- a/media-gfx/xloadimage/Manifest +++ b/media-gfx/xloadimage/Manifest @@ -2,11 +2,12 @@ AUX xloadimage-4.1-bracket.patch 518 BLAKE2B fca92d66bc559f17e091d544f2b726d1db1 AUX xloadimage-4.1-endif.patch 321 BLAKE2B dc140933e4b61e9a243f9cc2c4c78b5406a7d4defe0d7ae796c46ea8e21607d27c79481fe528f4c3e40dbfa5b27db09b47600a61454aaa3882c2ff267f18931a SHA512 503fd3672ae22a468ae6ec71a62b3113dc3df2e5bed4b90b641320d954c563118eb53b8681ad38edaff5a87a385fb063592ac422c24c2150084e0171f4f17d25 AUX xloadimage-4.1-include-errno_h.patch 303 BLAKE2B f82f4beadf42e2b5ba0f20ed6c16ea88e829c0b224c219a257c9986d30a8568d8d59e92f686469c26238eb33c6a51f3ba90e854a3f8c9c9c386a4848f745c8f2 SHA512 208261855d1677a755e34b421bbb4f95cbbe1d9d494cb3c895e9f799a376f2162a3f8e08134b06029da5acd318c873c798bd2c64eaf0aaf1d0e2970a56f4ef2f AUX xloadimage-4.1-ldflags_and_exit.patch 775 BLAKE2B e2107eca87d99d28d19f2213877bb6e3f6cfa5294c69a2ba9eeb01407b4f2b54f9f96de4b15e1ddd67acde45e8c2df0d4ed135001fdd3dc78afff9a367975fa1 SHA512 724484e06868c818c6c66cfdca9b07972da6c6b7977da9dad4e05109506751641e211dd34a9afbf925fed712ed046764362856079dda11b628b32fe3f6813f59 -AUX xloadimage-4.1-libpng15.patch 747 BLAKE2B f400d4e1ae96cddce9cde967d19d1b943b8a64af25d357920de428f2509c30e4f3d9e4a5d931d713accd8df6b356479c7e7293cac2981f834827045f698a5dbc SHA512 3a96676237388d9da6c05c654db33c862c02858d8e0b352461d25c5dd21128306ec7e492fbd6a20f6af6adb20070c9e9cfdd366803a747697f334955e11f5bb6 +AUX xloadimage-4.1-libpng15.patch 751 BLAKE2B 411c7a2fcf62a86e9402e7656b4cf484c16028802cebe97a843669bb12e96897ff47d66544387bc6754180ade67516f6c41b532efe3b1a3b5733b68ad41b0eb0 SHA512 12fae67db18540ca4ccd39e077c7557b878581a79082ae6abd156a4633db59f157bafbcb45d1b0fb40b9f8356a6fb44117da7b1d3e7803361e800435d7877a12 AUX xloadimage-4.1-unaligned-access.patch 1730 BLAKE2B 03015b18488346a1e690bfd1dab51a39c13b91d543d215cd2ec635da2bacae946bb101569a11bfcd5a0f62d9b61262b01f9cdd32be751cf5e9b137b308293a44 SHA512 4861c805a4bca2cec81fa2e7de44838e8451f08a2e1d189cf9a27e1c078d1ae0403fda3ab9c8ad44187db4fd5078d088f755eef16fbe00d55c02e0c54a5be139 AUX xloadimage-4.1-zio-shell-meta-char.diff 1372 BLAKE2B 1c960ba7ae4da62eedcdfc283a7d81367e4ede508aa45346d263c18407b62f928a5e1c1112b3e1c864ea87f80013c4f3550d790ef43de2e4feae7639e58e71df SHA512 38e449e005d84a5e93c1a1ef71929a4002b9dfb94d1ad785714f572e4adb0313722620947c091dc5ea2a73fe5d01d321f21259be9ff0770052f5f5ad13c727d6 AUX xloadimage-gentoo.patch 8956 BLAKE2B 9834cb47e16fb20f970e9d33a6e42fef09d5a3d3cae3f5ab0db5c76661acb7c67a20115f4069bc2769b6d9f54acf4adea27e27b79495d74a77644db5281beba8 SHA512 8eba3107d81f0dc6caf749e9a9889f1662e5d1004e480a9a170533f3ee00c6f9f11d3c2008655322242ab61f31b676406fd44b97d83e4ce93b8f68a12397830b DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112 SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3 DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586 EBUILD xloadimage-4.1-r11.ebuild 2552 BLAKE2B 9ea8ec71be31f995f78aa0cd1801a9a47c9aacb3462f7397ed43b697021e0bced2f0a144082972daed3a10ac9589a65570506e0fa50fe2a64abe1663f3e31332 SHA512 03b9f7de5b6d51bde25176cbac7f82b37a13d73545916588b41469b1b158003663db5c534ad9fa0afde16773799634fe6f8527ab1335786d58d9daa604e7e2b9 +EBUILD xloadimage-4.1-r12.ebuild 2525 BLAKE2B 0e5c4b171361ec69f5d7c5c288896f1bc391a220de9f8f60e1211901edbb404781bb5cdaaae95fcd48cf40755d0637c150cebb10d9a70221079b5a394ee158b1 SHA512 26db57ef320f69379a5afebd673f267cd399d59339ab2774f297efe7d9d12586c449238a524a6850d0dae9dda5309cc73e5b76e3acff7b1d139bbed1f0fa041f MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch b/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch index ffd05f62b332..da222d68c257 100644 --- a/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch +++ b/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch @@ -1,5 +1,5 @@ ---- png.c -+++ png.c +--- a/png.c ++++ b/png.c @@ -75,7 +75,7 @@ { debug(" #error "); diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild new file mode 100644 index 000000000000..7e9f5a36e1e4 --- /dev/null +++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="utility to view many different types of images under X11" +HOMEPAGE="https://tracker.debian.org/pkg/xloadimage" +SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz + mirror://gentoo/${P}-gentoo-r1.diff.bz2" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="tiff jpeg png" + +RDEPEND="x11-libs/libX11 + tiff? ( media-libs/tiff:0= ) + png? ( media-libs/libpng:0= ) + jpeg? ( virtual/jpeg:0 )" +DEPEND="${RDEPEND} + !media-gfx/xli" + +S=${WORKDIR}/${P/-/.} + +src_prepare() { + eapply "${WORKDIR}"/${P}-gentoo-r1.diff + eapply "${FILESDIR}"/${P}-zio-shell-meta-char.diff + eapply "${FILESDIR}"/${P}-endif.patch + + # Do not define errno extern, but rather include errno.h + # (1 Jan 2003) + eapply "${FILESDIR}"/${P}-include-errno_h.patch + + eapply "${FILESDIR}"/xloadimage-gentoo.patch + + sed -i -e "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf || die + sed -i -e "s:^#include :#include :" rlelib.c || die + + # On FreeBSD systems malloc.h is a false header asking for fixes. + # On MacOSX it would require malloc/malloc.h + # On other systems it's simply unneeded + sed -i -e 's,,,' vicar.c || die + + eapply "${FILESDIR}"/${P}-unaligned-access.patch + eapply "${FILESDIR}"/${P}-ldflags_and_exit.patch + + sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in || die + + eapply "${FILESDIR}"/${P}-libpng15.patch + sed -i \ + -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \ + png.c || die + + # One of the previous patches screws up a bracket... + eapply "${FILESDIR}"/${P}-bracket.patch + + default + + chmod +x configure || die + eautoreconf +} + +src_configure() { + # Set TIFFHeader to TIFFHeaderCommon wrt #319383 + has_version '>=media-libs/tiff-4.0.0_pre' && \ + append-flags -DTIFFHeader=TIFFHeaderCommon + + tc-export CC + econf $(use_with jpeg) \ + $(use_with png) \ + $(use_with tiff) +} + +src_compile() { + emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage +} + +src_install() { + dobin xloadimage uufilter + + dosym xloadimage /usr/bin/xsetbg + dosym xloadimage /usr/bin/xview + + insinto /etc/X11 + doins xloadimagerc + + newman xloadimage.man xloadimage.1 + newman uufilter.man uufilter.1 + + echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1 || die + doman "${T}"/xsetbg.1 + newman "${T}"/xsetbg.1 xview.1 + + dodoc README +} -- cgit v1.2.3