commit: febc4111d1cf81f843e20bb2118b6c1a642fbaec Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jan 6 08:15:07 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jan 6 08:15:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=febc4111
net-misc/hylafaxplus: fix build w/ tiff-4.5.0 Closes: https://bugs.gentoo.org/886303 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/hylafaxplus/Manifest | 1 + .../hylafaxplus/files/hylafaxplus-7.0.6-allow-tiff-4.5.patch | 12 ++++++++++++ net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest index bd5b6c79d310..879f2476cabe 100644 --- a/net-misc/hylafaxplus/Manifest +++ b/net-misc/hylafaxplus/Manifest @@ -1 +1,2 @@ DIST hylafax-7.0.6.tar.gz 1418749 BLAKE2B 83fff43dbc5c51f542aa847f61ae1617514a4260695d5c79a036416578ac632a778d0b5263a80fa7ccea9e9923a783759295a39199bdd32a2cb0ecac47ac91b4 SHA512 d1f69e13017f5d013ff39cf050c3a7ac6cef19a9ee5910ebe774a7ae06d7d22fd21e31de9734847764caea995539f578c3c458ecec7b9523b5823a841337d9cb +DIST hylafaxplus-7.0.6-tiff-4.5.0.patch.xz 5880 BLAKE2B 866de4d8f6159dcf8e27061c49a94e7e9b91f7ae74fad59cb35b99fb2f15bc8f45b4961bd616036bb494b06039658e3f9ec286ebc5de41ab6b6338051bddbc48 SHA512 44fc3460a5bd239e039a13b931ef795afa3767c749d6eee09efa8264f0c5288739ffbe1f0011ee156f7d44db455e07c1d3fd72722fb9994bab51fbbbfd25ab82 diff --git a/net-misc/hylafaxplus/files/hylafaxplus-7.0.6-allow-tiff-4.5.patch b/net-misc/hylafaxplus/files/hylafaxplus-7.0.6-allow-tiff-4.5.patch new file mode 100644 index 000000000000..dc48efa212bb --- /dev/null +++ b/net-misc/hylafaxplus/files/hylafaxplus-7.0.6-allow-tiff-4.5.patch @@ -0,0 +1,12 @@ +--- a/configure ++++ b/configure +@@ -2583,7 +2583,7 @@ EOF + echo '#define TIFFSTRIPBYTECOUNTS uint32_t' + echo '#define TIFFVERSION TIFF_VERSION' + echo '#define TIFFHEADER TIFFHeader';; +- 4.[01234]) tiff_runlen_t="uint32_t" ++ 4.[012345]) tiff_runlen_t="uint32_t" + tiff_offset_t="uint64_t" + echo '#define TIFFSTRIPBYTECOUNTS uint64_t' + echo '#define TIFFVERSION TIFF_VERSION_CLASSIC' + diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild index 35ed4a8e31d9..41b92caf95e1 100644 --- a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild +++ b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild @@ -11,6 +11,8 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems" HOMEPAGE="https://hylafax.sourceforge.io/"; SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz" +# bug #886303 +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-tiff-4.5.0.patch.xz"; S="${WORKDIR}"/${MY_P} LICENSE="hylafaxplus" @@ -44,6 +46,8 @@ CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog" # See bug #706154, bug #810658 if need to patch for newer libtiff. PATCHES=( "${FILESDIR}"/ldconfig-patch + "${FILESDIR}"/${P}-allow-tiff-4.5.patch + "${WORKDIR}"/${P}-tiff-4.5.0.patch ) src_prepare() {
