From 963dfa36b0fc3f01c2969110b23787a52503288e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 26 Dec 2022 10:13:31 -0800 Subject: app-text/podofo: revbump with patch for bug 888533 Closes: https://bugs.gentoo.org/888533 Signed-off-by: Zac Medico --- app-text/podofo/Manifest | 1 + app-text/podofo/podofo-0.9.8-r1.ebuild | 118 +++++++++++++++++++++++++++++++++ app-text/podofo/podofo-0.9.8.ebuild | 116 -------------------------------- 3 files changed, 119 insertions(+), 116 deletions(-) create mode 100644 app-text/podofo/podofo-0.9.8-r1.ebuild delete mode 100644 app-text/podofo/podofo-0.9.8.ebuild (limited to 'app-text/podofo') diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest index b56e6d15c5fc..161a0c69cf39 100644 --- a/app-text/podofo/Manifest +++ b/app-text/podofo/Manifest @@ -1,3 +1,4 @@ DIST podofo-0.9.6_p20190928.tar.xz 747532 BLAKE2B 39d051e6adca85bf0f124e5d48e1ff88dc951d7c1b38bc76dc7e3640ea9c3f8a59c6ba9a9105a263234e94932e450bec12dde455850dbf96cd7eec3e69a1a28d SHA512 b9d46fb02eeba61190a0efd17b507bba62d7246af6fff3c3514c9970e99e085f9aad92baa05cc6cf0a8c3c2843554099c904bff10be54dbb4d4cb7de460fc3cc DIST podofo-0.9.7.tar.gz 1005247 BLAKE2B d8f123008d272c1c39f60438d7cd6112cdd851488775e7e0fcb3fd9c4669fd64867fa293ef18b3189eac01f84a8a6b3c536171528f2b6097a5fe181c98501a71 SHA512 0e699739c2fb7d4d02ffca371504bb19f3a8a97ddcbfc06f8d9636db9e73064b4f633f7f09bce92140bb2174610ad68c1e5f8460d474d176ab803ed28295251b +DIST podofo-0.9.8-bug-888463.patch 1269 BLAKE2B 632e9326112eecb484a15a532fc218263eab081acaf2af2bc1cc3d1020347846ce9ce82147d9d2fa9b42d690270b01b68eaf621cfbbdcfce041b8d651754c08e SHA512 9b0764d8697fad57107647a620f6dbe5d8025628faf02b1d6839d3f975216b16a58ccc115f58809aa4e31fb6b4b487b1490eedf468ddc8b90e494f68d8e50dc6 DIST podofo-0.9.8.tar.gz 1012918 BLAKE2B 5d343128bcf06dbb8ef1d70b32f580a800726c33e4c14c86a6c7df0278a34b2d96cba7975c00d32e792596ca3cb54fa66fee262b49a240cd52e31646947b943e SHA512 b220322114450f1656c73d325f5172bc4cec0b1913e98b4eb2455f8ed7394bcaa47438d41003c9678937ef44d411e135431ddd6784f83d3663337d471baa02b1 diff --git a/app-text/podofo/podofo-0.9.8-r1.ebuild b/app-text/podofo/podofo-0.9.8-r1.ebuild new file mode 100644 index 000000000000..6b4fab5a8cee --- /dev/null +++ b/app-text/podofo/podofo-0.9.8-r1.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit cmake flag-o-matic lua-single toolchain-funcs + +DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format" +HOMEPAGE="https://sourceforge.net/projects/podofo/" +SRC_URI="https://cfhcable.dl.sourceforge.net/project/podofo/podofo/${PV}/${P}.tar.gz + https://github.com/podofo/podofo/commit/d0e9f5d503b0cb79516ec9bff989f3d7d625b678.patch -> ${P}-bug-888463.patch" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="+boost idn debug test +tools" +RESTRICT="test" +REQUIRED_USE="${LUA_REQUIRED_USE} + test? ( tools )" + +RDEPEND="${LUA_DEPS} + idn? ( net-dns/libidn:= ) + dev-libs/openssl:= + media-libs/fontconfig:= + media-libs/freetype:2= + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/tiff:= + sys-libs/zlib:=" +DEPEND="${RDEPEND} + test? ( dev-util/cppunit ) +" + +BDEPEND="virtual/pkgconfig + boost? ( dev-libs/boost )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.9.6_p20190928-cmake_lua_version.patch + "${DISTDIR}"/${P}-bug-888463.patch +) + +DOCS="AUTHORS ChangeLog TODO" + +src_prepare() { + cmake_src_prepare + local x sed_args + + # bug 620934 - Disable linking with cppunit when possible, since it + # triggers errors with some older compilers. + use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die + + # bug 556962 + sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \ + test/unit/EncryptTest.cpp || die + + sed -i \ + -e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \ + -e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \ + CMakeLists.txt || die + + # Use pkg-config to find headers for bug #459404. + sed_args= + for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do + [[ ${x} == -I* ]] || continue + x=${x#-I} + if [[ -f ${x}/ft2build.h ]] ; then + sed_args+=" -e s:/usr/include/\\r\$:${x}:" + elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then + sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:" + fi + done + [[ -n ${sed_args} ]] && \ + { sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; } + + # Bug #407015: fix to compile with Lua 5.2+ + case "${ELUA}" in + lua5-1|luajit) + ;; + *) + sed -e 's: lua_open(: luaL_newstate(:' \ + -e 's: luaL_getn(: lua_rawlen(:' -i \ + tools/podofocolor/luaconverter.cpp \ + tools/podofoimpose/planreader_lua.cpp || die + ;; + esac +} + +src_configure() { + + # Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()' + filter-flags -fvisibility-inlines-hidden + + mycmakeargs+=( + "-DPODOFO_BUILD_SHARED=1" + "-DPODOFO_HAVE_JPEG_LIB=1" + "-DPODOFO_HAVE_PNG_LIB=1" + "-DPODOFO_HAVE_TIFF_LIB=1" + "-DWANT_FONTCONFIG=1" + "-DUSE_STLPORT=0" + -DLUA_VERSION="$(lua_get_version)" + -DWANT_BOOST=$(usex boost ON OFF) + -DHAVE_LIBIDN=$(usex idn ON OFF) + # We use libidn for unicode support instead + -DCMAKE_DISABLE_FIND_PACKAGE_UNISTRING=ON + -DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF) + -DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON) + ) + + cmake_src_configure + mkdir -p "${S}/test/TokenizerTest/objects" || die +} + +src_test() { + cd "${BUILD_DIR}"/test/unit || die + ./podofo-test --selftest || die "self test failed" +} diff --git a/app-text/podofo/podofo-0.9.8.ebuild b/app-text/podofo/podofo-0.9.8.ebuild deleted file mode 100644 index dbba2cec5c14..000000000000 --- a/app-text/podofo/podofo-0.9.8.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..4} ) - -inherit cmake flag-o-matic lua-single toolchain-funcs - -DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format" -HOMEPAGE="https://sourceforge.net/projects/podofo/" -SRC_URI="https://cfhcable.dl.sourceforge.net/project/podofo/podofo/${PV}/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="+boost idn debug test +tools" -RESTRICT="test" -REQUIRED_USE="${LUA_REQUIRED_USE} - test? ( tools )" - -RDEPEND="${LUA_DEPS} - idn? ( net-dns/libidn:= ) - dev-libs/openssl:= - media-libs/fontconfig:= - media-libs/freetype:2= - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/tiff:= - sys-libs/zlib:=" -DEPEND="${RDEPEND} - test? ( dev-util/cppunit ) -" - -BDEPEND="virtual/pkgconfig - boost? ( dev-libs/boost )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.6_p20190928-cmake_lua_version.patch -) - -DOCS="AUTHORS ChangeLog TODO" - -src_prepare() { - cmake_src_prepare - local x sed_args - - # bug 620934 - Disable linking with cppunit when possible, since it - # triggers errors with some older compilers. - use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die - - # bug 556962 - sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \ - test/unit/EncryptTest.cpp || die - - sed -i \ - -e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \ - -e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \ - CMakeLists.txt || die - - # Use pkg-config to find headers for bug #459404. - sed_args= - for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do - [[ ${x} == -I* ]] || continue - x=${x#-I} - if [[ -f ${x}/ft2build.h ]] ; then - sed_args+=" -e s:/usr/include/\\r\$:${x}:" - elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then - sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:" - fi - done - [[ -n ${sed_args} ]] && \ - { sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; } - - # Bug #407015: fix to compile with Lua 5.2+ - case "${ELUA}" in - lua5-1|luajit) - ;; - *) - sed -e 's: lua_open(: luaL_newstate(:' \ - -e 's: luaL_getn(: lua_rawlen(:' -i \ - tools/podofocolor/luaconverter.cpp \ - tools/podofoimpose/planreader_lua.cpp || die - ;; - esac -} - -src_configure() { - - # Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()' - filter-flags -fvisibility-inlines-hidden - - mycmakeargs+=( - "-DPODOFO_BUILD_SHARED=1" - "-DPODOFO_HAVE_JPEG_LIB=1" - "-DPODOFO_HAVE_PNG_LIB=1" - "-DPODOFO_HAVE_TIFF_LIB=1" - "-DWANT_FONTCONFIG=1" - "-DUSE_STLPORT=0" - -DLUA_VERSION="$(lua_get_version)" - -DWANT_BOOST=$(usex boost ON OFF) - -DHAVE_LIBIDN=$(usex idn ON OFF) - # We use libidn for unicode support instead - -DCMAKE_DISABLE_FIND_PACKAGE_UNISTRING=ON - -DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF) - -DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON) - ) - - cmake_src_configure - mkdir -p "${S}/test/TokenizerTest/objects" || die -} - -src_test() { - cd "${BUILD_DIR}"/test/unit || die - ./podofo-test --selftest || die "self test failed" -} -- cgit v1.2.3-65-gdbad