commit: a4dce61ead4d4d094d6fcc92fddefbcd6100438d Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Thu Nov 23 20:47:17 2017 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Thu Nov 23 20:50:01 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4dce61e
app-text/podofo: remove old version 0.9.6_pre20170629 Package-Manager: Portage-2.3.16, Repoman-2.3.6 app-text/podofo/Manifest | 5 +- .../podofo-0.9.6_pre20170629-openssl-1.1.patch | 114 ---------------- app-text/podofo/podofo-0.9.6_pre20170629.ebuild | 146 --------------------- 3 files changed, 2 insertions(+), 263 deletions(-) diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest index 4b65f5793f2..40ed338f19f 100644 --- a/app-text/podofo/Manifest +++ b/app-text/podofo/Manifest @@ -1,3 +1,2 @@ -DIST podofo-0.9.6_pre20170508.tar.xz 919876 SHA256 6a35e08aa22105eeb6b00078b74791da2d4dc0d86189f795315808428efacd17 SHA512 37d8e844ba5763d06d467e316871436e1a63795d66675677d9775cd1bd311f43b241d58e82213a0342ab69a0f5cd80261aad48c4af29c82f7bcc0c14bd242f10 WHIRLPOOL c0ad8baca1f912929d1b2dd2e783340aeeb50965136dcf2699407cb70ca058e20748ee8024739b913a1e2ddb317c72f5aed6074862c4360d339365764ac9c67a -DIST podofo-0.9.6_pre20170629.tar.xz 919076 SHA256 439c0bffed19275315075d5b0a2728453e7a8bee4480e1f23bca2ee4b02462d0 SHA512 29b0e28131ca9cadf19e5ec43df1c39e146ad8d35ad9f0bfa2dff1138e3448c3be95c6130ef8a19b7ad927b8e0c5a7890485f120d7f7da85e2b434e4a417d9bc WHIRLPOOL b8ecab404679f48ff611e543d375829a636f4026232a83ff2fe3f3ca42f1a5c2a589641d4c09b92b7b078026a6b4d95b172a764089729086f7001d3a4850b272 -DIST podofo-0.9.6_pre20171027.tar.xz 919504 SHA256 0eff17add2c44e8d609756fa735e7265178c6eb9cf30ec2d5b896d6de83e643d SHA512 db1ac836abd7be0d2cc3c27114c7134de9de8ba931a6a8265514fedefe3c6f06a24371f7a5425c8b7251fe7166bc27f07733cba878ad24c12651c8c051cac8be WHIRLPOOL 8f0dbe4ffba24f1c3aee7c9d2ea819e232d9a552d048d09192960dae448d25593ad340712e055410d13b661110c90a2d5b5a69e02bf5511f78ee7a5b347bdbf0 +DIST podofo-0.9.6_pre20170508.tar.xz 919876 BLAKE2B 39be46db0e36755c828373659f681aa6334ec6be01cdcc62616d8ce4e59a2ab916cbfc4aa58d4bf8ab95843a40b7b536cb1b2ccfa14beacf629ff1fbcb699613 SHA512 37d8e844ba5763d06d467e316871436e1a63795d66675677d9775cd1bd311f43b241d58e82213a0342ab69a0f5cd80261aad48c4af29c82f7bcc0c14bd242f10 +DIST podofo-0.9.6_pre20171027.tar.xz 919504 BLAKE2B d03852a25e50085ed2108e90c293600e0515c06918276888e63917ca00a9fe3b392cd9ec9aeb6f651fd7e0b45a5e3c08e3f4d6df6f4a04d8fb224fbdd0599342 SHA512 db1ac836abd7be0d2cc3c27114c7134de9de8ba931a6a8265514fedefe3c6f06a24371f7a5425c8b7251fe7166bc27f07733cba878ad24c12651c8c051cac8be diff --git a/app-text/podofo/files/podofo-0.9.6_pre20170629-openssl-1.1.patch b/app-text/podofo/files/podofo-0.9.6_pre20170629-openssl-1.1.patch deleted file mode 100644 index 22b1e419312..00000000000 --- a/app-text/podofo/files/podofo-0.9.6_pre20170629-openssl-1.1.patch +++ /dev/null @@ -1,114 +0,0 @@ -From f5da3b4d9e35a2df272f2f4056c3647454eaea95 Mon Sep 17 00:00:00 2001 -From: Zac Medico <zmed...@gmail.com> -Date: Sun, 15 Oct 2017 23:04:57 -0700 -Subject: [PATCH] podofosign: fix compile errors with openssl-1.1.0f -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -https://sourceforge.net/p/podofo/mailman/message/36077904/ - -This fixes the following compile errors with openssl-1.1.0f: - -tools/podofosign/podofosign.cpp:877:32: error: ‘OpenSSL_add_all_algorithms’ was not declared in this scope - OpenSSL_add_all_algorithms(); - ^ -tools/podofosign/podofosign.cpp:878:29: error: ‘ERR_load_crypto_strings’ was not declared in this scope - ERR_load_crypto_strings(); - ^ -tools/podofosign/podofosign.cpp:1085:22: error: ‘ERR_free_strings’ was not declared in this scope - ERR_free_strings(); - ^ - -This patch has been tested on Linux with openssl-1.0.2l and -openssl-1.1.0f. - -Bug: https://bugs.gentoo.org/614756 ---- - CMakeLists.txt | 12 ++++++++++-- - tools/podofosign/podofosign.cpp | 7 +++++++ - 2 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0c9a2ce..b4f7b3c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -325,6 +325,14 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) - FIND_PACKAGE(ZLIB REQUIRED) - MESSAGE("Found zlib headers in ${ZLIB_INCLUDE_DIR}, library at ${ZLIB_LIBRARIES}") - -+FIND_PACKAGE(OpenSSL) -+if(OpenSSL_FOUND) -+ SET(PODOFO_HAVE_OPENSSL TRUE) -+ INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIRS}) -+ LINK_DIRECTORIES(${OPENSSL_LIBRARIES}) -+ MESSAGE(STATUS "Using OpenSSL ${OPENSSL_VERSION}") -+ MESSAGE("Found OpenSSL ${OPENSSL_VERSION} headers in ${OPENSSL_INCLUDE_DIRS}, library at ${OPENSSL_LIBRARIES}") -+ELSE(OpenSSL_FOUND) - FIND_PACKAGE(LIBCRYPTO) - - IF(LIBCRYPTO_FOUND) -@@ -334,6 +342,7 @@ IF(LIBCRYPTO_FOUND) - ELSE(LIBCRYPTO_FOUND) - MESSAGE("OpenSSL's libCrypto not found. Encryption support will be disabled") - ENDIF(LIBCRYPTO_FOUND) -+ENDIF(OpenSSL_FOUND) - - FIND_PACKAGE(LIBIDN) - -@@ -393,8 +402,6 @@ ENDIF(CppUnit_FOUND) - - ENDIF(NOT PODOFO_BUILD_LIB_ONLY) - --FIND_PACKAGE(OpenSSL) -- - FIND_PACKAGE(FREETYPE REQUIRED) - MESSAGE("Found freetype library at ${FREETYPE_LIBRARIES}, headers ${FREETYPE_INCLUDE_DIR}") - -@@ -499,6 +506,7 @@ SET(PODOFO_LIB_DEPENDS - ${LIBCRYPTO_LDFLAGS} - ${LIBCRYPTO_LIBRARIES} - ${LIBJPEG_LIBRARIES} -+ ${OPENSSL_LIBRARIES} - ${PLATFORM_SYSTEM_LIBRARIES} - ${stlport_libraries_if_use_stlport} - ${FREETYPE_LIBRARIES} -diff --git a/tools/podofosign/podofosign.cpp b/tools/podofosign/podofosign.cpp -index b8f5f61..a7be1e5 100644 ---- a/tools/podofosign/podofosign.cpp -+++ b/tools/podofosign/podofosign.cpp -@@ -27,6 +27,7 @@ - #include <openssl/evp.h> - #include <openssl/err.h> - #include <openssl/pem.h> -+#include <openssl/ssl.h> - #include <openssl/x509.h> - - #if defined(_WIN64) -@@ -874,11 +875,15 @@ int main( int argc, char* argv[] ) - outputfile = NULL; - } - -+#ifdef PODOFO_HAVE_OPENSSL_1_1 -+ OPENSSL_init_ssl(0, NULL); -+#else - OpenSSL_add_all_algorithms(); - ERR_load_crypto_strings(); - ERR_load_PEM_strings(); - ERR_load_ASN1_strings(); - ERR_load_EVP_strings(); -+#endif - - X509* cert = NULL; - EVP_PKEY* pkey = NULL; -@@ -1082,7 +1087,9 @@ int main( int argc, char* argv[] ) - result = e.GetError(); - } - -+#ifndef PODOFO_HAVE_OPENSSL_1_1 - ERR_free_strings(); -+#endif - - if( pSignField ) - delete pSignField; --- diff --git a/app-text/podofo/podofo-0.9.6_pre20170629.ebuild b/app-text/podofo/podofo-0.9.6_pre20170629.ebuild deleted file mode 100644 index 186555f8192..00000000000 --- a/app-text/podofo/podofo-0.9.6_pre20170629.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils flag-o-matic multilib toolchain-funcs - -DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format" -HOMEPAGE="https://sourceforge.net/projects/podofo/"; -SRC_URI="mirror://gentoo/${P}.tar.xz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="+boost idn libressl debug test +tools" -REQUIRED_USE="test? ( tools )" - -RDEPEND="dev-lang/lua:= - idn? ( net-dns/libidn:= ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - media-libs/fontconfig:= - media-libs/freetype:2= - virtual/jpeg:0= - media-libs/libpng:0= - media-libs/tiff:0= - sys-libs/zlib:=" -DEPEND="${RDEPEND} - virtual/pkgconfig - boost? ( dev-util/boost-build ) - test? ( dev-util/cppunit )" - -DOCS="AUTHORS ChangeLog TODO" -PATCHES=( - "${FILESDIR}/${P}-openssl-1.1.patch" -) - -src_prepare() { - cmake-utils_src_prepare - local x sed_args - - # The 0.9.6 ABI is not necessarily stable, so make PODOFO_SOVERSION - # equal to ${PV}. - sed -e 's|${PODOFO_VERSION_PATCH}|\0_'${PV##*_}'|' -i CMakeLists.txt || die - - # 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 #439784: Add missing unistd include for close() and unlink(). - sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \ - test/unit/TestUtils.cpp || die - - # TODO: fix these test cases - # ColorTest.cpp:62:Assertion - # Test name: ColorTest::testDefaultConstructor - # expected exception not thrown - # - Expected: PdfError - sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \ - -e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \ - -e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \ - -e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \ - -e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \ - -e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \ - -e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \ - -e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \ - -i test/unit/ColorTest.h || die - - # ColorTest.cpp:42:Assertion - # Test name: ColorTest::testHexNames - # assertion failed - # - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A - sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \ - -i test/unit/ColorTest.h || die - - # Bug #352125: test failure, depending on installed fonts - # ##Failure Location unknown## : Error - # Test name: FontTest::testFonts - # uncaught exception of type PoDoFo::PdfError - # - ePdfError_UnsupportedFontFormat - sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \ - -i test/unit/FontTest.h || die - - # Test name: EncodingTest::testDifferencesEncoding - # equality assertion failed - # - Expected: 1 - # - Actual : 0 - sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \ - -i test/unit/EncodingTest.h || die - - # Bug #407015: fix to compile with Lua 5.2 - if has_version '>=dev-lang/lua-5.2' ; then - sed -e 's: lua_open(: luaL_newstate(:' \ - -e 's: luaL_getn(: lua_rawlen(:' -i \ - tools/podofocolor/luaconverter.cpp \ - tools/podofoimpose/planreader_lua.cpp || die - fi -} - -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" - -DWANT_BOOST=$(usex boost ON OFF) - -DHAVE_LIBIDN=$(usex idn ON OFF) - -DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF) - -DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON) - ) - - cmake-utils_src_configure -} - -src_test() { - cd "${CMAKE_BUILD_DIR}"/test/unit - ./podofo-test --selftest || die "self test failed" -}
