commit: 1e46dec3cfec8520ca09813c06dd1babe04254bb Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Feb 12 21:26:32 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Feb 14 13:33:57 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e46dec3
media-gfx/sfftobmp: drop 3.1.2-r3 Bug: https://bugs.gentoo.org/968784 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-gfx/sfftobmp/Manifest | 1 - .../sfftobmp/files/sfftobmp-3.1.2-Wformat.patch | 11 ---- .../sfftobmp/files/sfftobmp-3.1.2-boost-1.85.patch | 63 ---------------------- .../sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch | 21 -------- media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild | 42 --------------- 5 files changed, 138 deletions(-) diff --git a/media-gfx/sfftobmp/Manifest b/media-gfx/sfftobmp/Manifest index 91fd5fcaf3db..45bfda798be0 100644 --- a/media-gfx/sfftobmp/Manifest +++ b/media-gfx/sfftobmp/Manifest @@ -1,2 +1 @@ DIST sfftobmp-3.1.4_p20250813.tar.gz 7274212 BLAKE2B cad075033a9c487658722ee3e044955eb5849b9e4af235e1f75b3f62bfaa5a8a3693c6c9d81879784f9442c65bf40a7a9bc1f6053e0afa5d7937e8df1964efb5 SHA512 1ed1af8ed61b20c9237c3281622ec3dad2c07aec4216395ad1faf7982c14597c8c3558d2cad810f8e73ac9110380d801953178a6e88cb8dc39eb6e162d740c71 -DIST sfftobmp3_1_2_src.zip 121478 BLAKE2B fe5e09d358cfa75a45a05e780fcf8b3409ae9791882c8c4ab3fe99b078cade57a75751343c42a5d7764702ca32565e8c97d417e3c095c10a01b6fcd0f09f03b3 SHA512 3c460dcd60486954f792ecc8e864d109dabbae30b56a6ba4b3228a42dd489fd88793e4d93e2d032e6cd1c552bf5e217bc2afb3eae85a1a4e1db340f7761905b7 diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-Wformat.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-Wformat.patch deleted file mode 100644 index a7ab1c185751..000000000000 --- a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-Wformat.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/output.cpp -+++ b/src/output.cpp -@@ -163,7 +163,7 @@ - m_pFile->Write(acBuf, strlen(acBuf)); - sprintf(acBuf, "%s", "# generated with SffToBmp\n"); - m_pFile->Write(acBuf, strlen(acBuf)); -- sprintf(acBuf, "%ld %ld\n", aWidth, aHeight); -+ sprintf(acBuf, "%u %u\n", aWidth, aHeight); - m_pFile->Write(acBuf, strlen(acBuf)); - } - diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost-1.85.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost-1.85.patch deleted file mode 100644 index 9fac13880922..000000000000 --- a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost-1.85.patch +++ /dev/null @@ -1,63 +0,0 @@ -https://www.boost.org/doc/libs/1_85_0/libs/filesystem/doc/deprecated.html ---- a/src/cmdline.cpp -+++ b/src/cmdline.cpp -@@ -41,7 +41,6 @@ - #include <iostream> - - #include <boost/filesystem/operations.hpp> --#include <boost/filesystem/convenience.hpp> - - #include <tiff.h> - ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -41,7 +41,6 @@ - - #include <boost/filesystem/path.hpp> - #include <boost/filesystem/operations.hpp> --#include <boost/filesystem/convenience.hpp> - - extern "C" - { -@@ -172,10 +171,10 @@ int main( int argc, char *argv[] ) - if (pathOutFileName.string().length()) { - // A fixed name was given, so use it as a base name - outPath = pathOutFileName; -- std::string orgExt = fs::extension(outPath); -+ std::string orgExt = outPath.extension().string(); - if (nFileCountOut > 1) { - sprintf(acNumber, "_%03d", nPage+1); -- outPath = fs::change_extension(outPath, acNumber); -+ outPath.replace_extension(acNumber); - if (orgExt.length()) { - std::string strTemp = outPath.string(); - strTemp += orgExt; -@@ -184,15 +183,15 @@ int main( int argc, char *argv[] ) - } - } else { - // Otherwise construct output filename from input filename -- outPath = pathOutDirectory / pathInFileName.leaf(); -+ outPath = pathOutDirectory / pathInFileName.filename(); - if (nFileCountOut > 1) { - sprintf(acNumber, "_%03d", nPage+1); -- outPath = fs::change_extension(outPath, acNumber); -+ outPath.replace_extension(acNumber); - std::string strTemp = outPath.string(); - strTemp += pOut->GetExtension(); - outPath = fs::path(strTemp); - } else { -- outPath = fs::change_extension(outPath, pOut->GetExtension()); -+ outPath.replace_extension(pOut->GetExtension()); - } - } - if (!proc.doOverwrite() && !((nPage > 0) && (nFileCountOut == 1)) && fs::exists(outPath)) { ---- a/src/output.cpp -+++ b/src/output.cpp -@@ -42,7 +42,6 @@ - #include <iostream> - - #include <boost/filesystem/path.hpp> --#include <boost/filesystem/convenience.hpp> - - #ifdef WIN32 - #include <io.h> diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch deleted file mode 100644 index 7ae13855def7..000000000000 --- a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch +++ /dev/null @@ -1,21 +0,0 @@ -http://bugs.gentoo.org/425364 - ---- a/src/cmdline.cpp -+++ b/src/cmdline.cpp -@@ -264,14 +264,14 @@ - } - do { - if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { -- m_vFiles.push_back( fs::path(fd.cFileName, fs::native) ); -+ m_vFiles.push_back( fs::path(fd.cFileName) ); - } - } while (::FindNextFile(hFind, &fd)); - ::FindClose(hFind); - #else - int n = optind; - while (n < m_argc) { -- m_vFiles.push_back( fs::path(m_argv[n], fs::native) ); -+ m_vFiles.push_back( fs::path(m_argv[n]) ); - ++n; - } - #endif diff --git a/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild b/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild deleted file mode 100644 index 6b9a92e6cfc2..000000000000 --- a/media-gfx/sfftobmp/sfftobmp-3.1.2-r3.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -MY_P=${PN}${PV//./_} - -DESCRIPTION="sff to bmp converter" -HOMEPAGE="https://sfftools.sourceforge.io/"; -SRC_URI="https://downloads.sourceforge.net/sfftools/${MY_P}_src.zip"; -S="${WORKDIR}/${MY_P}" - -LICENSE="HPND MIT" -SLOT="0" -KEYWORDS="amd64 ~hppa ppc x86" - -RDEPEND=" - dev-libs/boost:= - media-libs/libjpeg-turbo:= - media-libs/tiff:= -" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/unzip" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.1-gcc44-and-boost-1_37.patch - "${FILESDIR}"/${PN}-3.1.2-boost_fs3.patch - "${FILESDIR}"/${PN}-3.1.2-Wformat.patch - "${FILESDIR}"/${PN}-3.1.2-boost-1.85.patch -) - -src_prepare() { - default - eautoreconf -} - -src_install() { - default - dodoc doc/{changes,credits,readme} -}
