| 1 |
commit: a4dce61ead4d4d094d6fcc92fddefbcd6100438d |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 23 20:47:17 2017 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 23 20:50:01 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4dce61e |
| 7 |
|
| 8 |
app-text/podofo: remove old version 0.9.6_pre20170629 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
| 11 |
|
| 12 |
app-text/podofo/Manifest | 5 +- |
| 13 |
.../podofo-0.9.6_pre20170629-openssl-1.1.patch | 114 ---------------- |
| 14 |
app-text/podofo/podofo-0.9.6_pre20170629.ebuild | 146 --------------------- |
| 15 |
3 files changed, 2 insertions(+), 263 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest |
| 18 |
index 4b65f5793f2..40ed338f19f 100644 |
| 19 |
--- a/app-text/podofo/Manifest |
| 20 |
+++ b/app-text/podofo/Manifest |
| 21 |
@@ -1,3 +1,2 @@ |
| 22 |
-DIST podofo-0.9.6_pre20170508.tar.xz 919876 SHA256 6a35e08aa22105eeb6b00078b74791da2d4dc0d86189f795315808428efacd17 SHA512 37d8e844ba5763d06d467e316871436e1a63795d66675677d9775cd1bd311f43b241d58e82213a0342ab69a0f5cd80261aad48c4af29c82f7bcc0c14bd242f10 WHIRLPOOL c0ad8baca1f912929d1b2dd2e783340aeeb50965136dcf2699407cb70ca058e20748ee8024739b913a1e2ddb317c72f5aed6074862c4360d339365764ac9c67a |
| 23 |
-DIST podofo-0.9.6_pre20170629.tar.xz 919076 SHA256 439c0bffed19275315075d5b0a2728453e7a8bee4480e1f23bca2ee4b02462d0 SHA512 29b0e28131ca9cadf19e5ec43df1c39e146ad8d35ad9f0bfa2dff1138e3448c3be95c6130ef8a19b7ad927b8e0c5a7890485f120d7f7da85e2b434e4a417d9bc WHIRLPOOL b8ecab404679f48ff611e543d375829a636f4026232a83ff2fe3f3ca42f1a5c2a589641d4c09b92b7b078026a6b4d95b172a764089729086f7001d3a4850b272 |
| 24 |
-DIST podofo-0.9.6_pre20171027.tar.xz 919504 SHA256 0eff17add2c44e8d609756fa735e7265178c6eb9cf30ec2d5b896d6de83e643d SHA512 db1ac836abd7be0d2cc3c27114c7134de9de8ba931a6a8265514fedefe3c6f06a24371f7a5425c8b7251fe7166bc27f07733cba878ad24c12651c8c051cac8be WHIRLPOOL 8f0dbe4ffba24f1c3aee7c9d2ea819e232d9a552d048d09192960dae448d25593ad340712e055410d13b661110c90a2d5b5a69e02bf5511f78ee7a5b347bdbf0 |
| 25 |
+DIST podofo-0.9.6_pre20170508.tar.xz 919876 BLAKE2B 39be46db0e36755c828373659f681aa6334ec6be01cdcc62616d8ce4e59a2ab916cbfc4aa58d4bf8ab95843a40b7b536cb1b2ccfa14beacf629ff1fbcb699613 SHA512 37d8e844ba5763d06d467e316871436e1a63795d66675677d9775cd1bd311f43b241d58e82213a0342ab69a0f5cd80261aad48c4af29c82f7bcc0c14bd242f10 |
| 26 |
+DIST podofo-0.9.6_pre20171027.tar.xz 919504 BLAKE2B d03852a25e50085ed2108e90c293600e0515c06918276888e63917ca00a9fe3b392cd9ec9aeb6f651fd7e0b45a5e3c08e3f4d6df6f4a04d8fb224fbdd0599342 SHA512 db1ac836abd7be0d2cc3c27114c7134de9de8ba931a6a8265514fedefe3c6f06a24371f7a5425c8b7251fe7166bc27f07733cba878ad24c12651c8c051cac8be |
| 27 |
|
| 28 |
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 |
| 29 |
deleted file mode 100644 |
| 30 |
index 22b1e419312..00000000000 |
| 31 |
--- a/app-text/podofo/files/podofo-0.9.6_pre20170629-openssl-1.1.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,114 +0,0 @@ |
| 34 |
-From f5da3b4d9e35a2df272f2f4056c3647454eaea95 Mon Sep 17 00:00:00 2001 |
| 35 |
-From: Zac Medico <zmedico@×××××.com> |
| 36 |
-Date: Sun, 15 Oct 2017 23:04:57 -0700 |
| 37 |
-Subject: [PATCH] podofosign: fix compile errors with openssl-1.1.0f |
| 38 |
-MIME-Version: 1.0 |
| 39 |
-Content-Type: text/plain; charset=UTF-8 |
| 40 |
-Content-Transfer-Encoding: 8bit |
| 41 |
- |
| 42 |
-https://sourceforge.net/p/podofo/mailman/message/36077904/ |
| 43 |
- |
| 44 |
-This fixes the following compile errors with openssl-1.1.0f: |
| 45 |
- |
| 46 |
-tools/podofosign/podofosign.cpp:877:32: error: ‘OpenSSL_add_all_algorithms’ was not declared in this scope |
| 47 |
- OpenSSL_add_all_algorithms(); |
| 48 |
- ^ |
| 49 |
-tools/podofosign/podofosign.cpp:878:29: error: ‘ERR_load_crypto_strings’ was not declared in this scope |
| 50 |
- ERR_load_crypto_strings(); |
| 51 |
- ^ |
| 52 |
-tools/podofosign/podofosign.cpp:1085:22: error: ‘ERR_free_strings’ was not declared in this scope |
| 53 |
- ERR_free_strings(); |
| 54 |
- ^ |
| 55 |
- |
| 56 |
-This patch has been tested on Linux with openssl-1.0.2l and |
| 57 |
-openssl-1.1.0f. |
| 58 |
- |
| 59 |
-Bug: https://bugs.gentoo.org/614756 |
| 60 |
---- |
| 61 |
- CMakeLists.txt | 12 ++++++++++-- |
| 62 |
- tools/podofosign/podofosign.cpp | 7 +++++++ |
| 63 |
- 2 files changed, 17 insertions(+), 2 deletions(-) |
| 64 |
- |
| 65 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 66 |
-index 0c9a2ce..b4f7b3c 100644 |
| 67 |
---- a/CMakeLists.txt |
| 68 |
-+++ b/CMakeLists.txt |
| 69 |
-@@ -325,6 +325,14 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) |
| 70 |
- FIND_PACKAGE(ZLIB REQUIRED) |
| 71 |
- MESSAGE("Found zlib headers in ${ZLIB_INCLUDE_DIR}, library at ${ZLIB_LIBRARIES}") |
| 72 |
- |
| 73 |
-+FIND_PACKAGE(OpenSSL) |
| 74 |
-+if(OpenSSL_FOUND) |
| 75 |
-+ SET(PODOFO_HAVE_OPENSSL TRUE) |
| 76 |
-+ INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIRS}) |
| 77 |
-+ LINK_DIRECTORIES(${OPENSSL_LIBRARIES}) |
| 78 |
-+ MESSAGE(STATUS "Using OpenSSL ${OPENSSL_VERSION}") |
| 79 |
-+ MESSAGE("Found OpenSSL ${OPENSSL_VERSION} headers in ${OPENSSL_INCLUDE_DIRS}, library at ${OPENSSL_LIBRARIES}") |
| 80 |
-+ELSE(OpenSSL_FOUND) |
| 81 |
- FIND_PACKAGE(LIBCRYPTO) |
| 82 |
- |
| 83 |
- IF(LIBCRYPTO_FOUND) |
| 84 |
-@@ -334,6 +342,7 @@ IF(LIBCRYPTO_FOUND) |
| 85 |
- ELSE(LIBCRYPTO_FOUND) |
| 86 |
- MESSAGE("OpenSSL's libCrypto not found. Encryption support will be disabled") |
| 87 |
- ENDIF(LIBCRYPTO_FOUND) |
| 88 |
-+ENDIF(OpenSSL_FOUND) |
| 89 |
- |
| 90 |
- FIND_PACKAGE(LIBIDN) |
| 91 |
- |
| 92 |
-@@ -393,8 +402,6 @@ ENDIF(CppUnit_FOUND) |
| 93 |
- |
| 94 |
- ENDIF(NOT PODOFO_BUILD_LIB_ONLY) |
| 95 |
- |
| 96 |
--FIND_PACKAGE(OpenSSL) |
| 97 |
-- |
| 98 |
- FIND_PACKAGE(FREETYPE REQUIRED) |
| 99 |
- MESSAGE("Found freetype library at ${FREETYPE_LIBRARIES}, headers ${FREETYPE_INCLUDE_DIR}") |
| 100 |
- |
| 101 |
-@@ -499,6 +506,7 @@ SET(PODOFO_LIB_DEPENDS |
| 102 |
- ${LIBCRYPTO_LDFLAGS} |
| 103 |
- ${LIBCRYPTO_LIBRARIES} |
| 104 |
- ${LIBJPEG_LIBRARIES} |
| 105 |
-+ ${OPENSSL_LIBRARIES} |
| 106 |
- ${PLATFORM_SYSTEM_LIBRARIES} |
| 107 |
- ${stlport_libraries_if_use_stlport} |
| 108 |
- ${FREETYPE_LIBRARIES} |
| 109 |
-diff --git a/tools/podofosign/podofosign.cpp b/tools/podofosign/podofosign.cpp |
| 110 |
-index b8f5f61..a7be1e5 100644 |
| 111 |
---- a/tools/podofosign/podofosign.cpp |
| 112 |
-+++ b/tools/podofosign/podofosign.cpp |
| 113 |
-@@ -27,6 +27,7 @@ |
| 114 |
- #include <openssl/evp.h> |
| 115 |
- #include <openssl/err.h> |
| 116 |
- #include <openssl/pem.h> |
| 117 |
-+#include <openssl/ssl.h> |
| 118 |
- #include <openssl/x509.h> |
| 119 |
- |
| 120 |
- #if defined(_WIN64) |
| 121 |
-@@ -874,11 +875,15 @@ int main( int argc, char* argv[] ) |
| 122 |
- outputfile = NULL; |
| 123 |
- } |
| 124 |
- |
| 125 |
-+#ifdef PODOFO_HAVE_OPENSSL_1_1 |
| 126 |
-+ OPENSSL_init_ssl(0, NULL); |
| 127 |
-+#else |
| 128 |
- OpenSSL_add_all_algorithms(); |
| 129 |
- ERR_load_crypto_strings(); |
| 130 |
- ERR_load_PEM_strings(); |
| 131 |
- ERR_load_ASN1_strings(); |
| 132 |
- ERR_load_EVP_strings(); |
| 133 |
-+#endif |
| 134 |
- |
| 135 |
- X509* cert = NULL; |
| 136 |
- EVP_PKEY* pkey = NULL; |
| 137 |
-@@ -1082,7 +1087,9 @@ int main( int argc, char* argv[] ) |
| 138 |
- result = e.GetError(); |
| 139 |
- } |
| 140 |
- |
| 141 |
-+#ifndef PODOFO_HAVE_OPENSSL_1_1 |
| 142 |
- ERR_free_strings(); |
| 143 |
-+#endif |
| 144 |
- |
| 145 |
- if( pSignField ) |
| 146 |
- delete pSignField; |
| 147 |
--- |
| 148 |
|
| 149 |
diff --git a/app-text/podofo/podofo-0.9.6_pre20170629.ebuild b/app-text/podofo/podofo-0.9.6_pre20170629.ebuild |
| 150 |
deleted file mode 100644 |
| 151 |
index 186555f8192..00000000000 |
| 152 |
--- a/app-text/podofo/podofo-0.9.6_pre20170629.ebuild |
| 153 |
+++ /dev/null |
| 154 |
@@ -1,146 +0,0 @@ |
| 155 |
-# Copyright 1999-2017 Gentoo Foundation |
| 156 |
-# Distributed under the terms of the GNU General Public License v2 |
| 157 |
- |
| 158 |
-EAPI=6 |
| 159 |
-inherit cmake-utils flag-o-matic multilib toolchain-funcs |
| 160 |
- |
| 161 |
-DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format" |
| 162 |
-HOMEPAGE="https://sourceforge.net/projects/podofo/" |
| 163 |
-SRC_URI="mirror://gentoo/${P}.tar.xz" |
| 164 |
- |
| 165 |
-LICENSE="GPL-2 LGPL-2.1" |
| 166 |
-SLOT="0/${PV}" |
| 167 |
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" |
| 168 |
-IUSE="+boost idn libressl debug test +tools" |
| 169 |
-REQUIRED_USE="test? ( tools )" |
| 170 |
- |
| 171 |
-RDEPEND="dev-lang/lua:= |
| 172 |
- idn? ( net-dns/libidn:= ) |
| 173 |
- !libressl? ( dev-libs/openssl:0= ) |
| 174 |
- libressl? ( dev-libs/libressl:0= ) |
| 175 |
- media-libs/fontconfig:= |
| 176 |
- media-libs/freetype:2= |
| 177 |
- virtual/jpeg:0= |
| 178 |
- media-libs/libpng:0= |
| 179 |
- media-libs/tiff:0= |
| 180 |
- sys-libs/zlib:=" |
| 181 |
-DEPEND="${RDEPEND} |
| 182 |
- virtual/pkgconfig |
| 183 |
- boost? ( dev-util/boost-build ) |
| 184 |
- test? ( dev-util/cppunit )" |
| 185 |
- |
| 186 |
-DOCS="AUTHORS ChangeLog TODO" |
| 187 |
-PATCHES=( |
| 188 |
- "${FILESDIR}/${P}-openssl-1.1.patch" |
| 189 |
-) |
| 190 |
- |
| 191 |
-src_prepare() { |
| 192 |
- cmake-utils_src_prepare |
| 193 |
- local x sed_args |
| 194 |
- |
| 195 |
- # The 0.9.6 ABI is not necessarily stable, so make PODOFO_SOVERSION |
| 196 |
- # equal to ${PV}. |
| 197 |
- sed -e 's|${PODOFO_VERSION_PATCH}|\0_'${PV##*_}'|' -i CMakeLists.txt || die |
| 198 |
- |
| 199 |
- # bug 620934 - Disable linking with cppunit when possible, since it |
| 200 |
- # triggers errors with some older compilers. |
| 201 |
- use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die |
| 202 |
- |
| 203 |
- # bug 556962 |
| 204 |
- sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \ |
| 205 |
- test/unit/EncryptTest.cpp || die |
| 206 |
- |
| 207 |
- sed -i \ |
| 208 |
- -e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \ |
| 209 |
- -e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \ |
| 210 |
- CMakeLists.txt || die |
| 211 |
- |
| 212 |
- # Use pkg-config to find headers for bug #459404. |
| 213 |
- sed_args= |
| 214 |
- for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do |
| 215 |
- [[ ${x} == -I* ]] || continue |
| 216 |
- x=${x#-I} |
| 217 |
- if [[ -f ${x}/ft2build.h ]] ; then |
| 218 |
- sed_args+=" -e s:/usr/include/\\r\$:${x}:" |
| 219 |
- elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then |
| 220 |
- sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:" |
| 221 |
- fi |
| 222 |
- done |
| 223 |
- [[ -n ${sed_args} ]] && \ |
| 224 |
- { sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; } |
| 225 |
- |
| 226 |
- # Bug #439784: Add missing unistd include for close() and unlink(). |
| 227 |
- sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \ |
| 228 |
- test/unit/TestUtils.cpp || die |
| 229 |
- |
| 230 |
- # TODO: fix these test cases |
| 231 |
- # ColorTest.cpp:62:Assertion |
| 232 |
- # Test name: ColorTest::testDefaultConstructor |
| 233 |
- # expected exception not thrown |
| 234 |
- # - Expected: PdfError |
| 235 |
- sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \ |
| 236 |
- -e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \ |
| 237 |
- -e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \ |
| 238 |
- -e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \ |
| 239 |
- -e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \ |
| 240 |
- -e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \ |
| 241 |
- -e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \ |
| 242 |
- -e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \ |
| 243 |
- -i test/unit/ColorTest.h || die |
| 244 |
- |
| 245 |
- # ColorTest.cpp:42:Assertion |
| 246 |
- # Test name: ColorTest::testHexNames |
| 247 |
- # assertion failed |
| 248 |
- # - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A |
| 249 |
- sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \ |
| 250 |
- -i test/unit/ColorTest.h || die |
| 251 |
- |
| 252 |
- # Bug #352125: test failure, depending on installed fonts |
| 253 |
- # ##Failure Location unknown## : Error |
| 254 |
- # Test name: FontTest::testFonts |
| 255 |
- # uncaught exception of type PoDoFo::PdfError |
| 256 |
- # - ePdfError_UnsupportedFontFormat |
| 257 |
- sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \ |
| 258 |
- -i test/unit/FontTest.h || die |
| 259 |
- |
| 260 |
- # Test name: EncodingTest::testDifferencesEncoding |
| 261 |
- # equality assertion failed |
| 262 |
- # - Expected: 1 |
| 263 |
- # - Actual : 0 |
| 264 |
- sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \ |
| 265 |
- -i test/unit/EncodingTest.h || die |
| 266 |
- |
| 267 |
- # Bug #407015: fix to compile with Lua 5.2 |
| 268 |
- if has_version '>=dev-lang/lua-5.2' ; then |
| 269 |
- sed -e 's: lua_open(: luaL_newstate(:' \ |
| 270 |
- -e 's: luaL_getn(: lua_rawlen(:' -i \ |
| 271 |
- tools/podofocolor/luaconverter.cpp \ |
| 272 |
- tools/podofoimpose/planreader_lua.cpp || die |
| 273 |
- fi |
| 274 |
-} |
| 275 |
- |
| 276 |
-src_configure() { |
| 277 |
- |
| 278 |
- # Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()' |
| 279 |
- filter-flags -fvisibility-inlines-hidden |
| 280 |
- |
| 281 |
- mycmakeargs+=( |
| 282 |
- "-DPODOFO_BUILD_SHARED=1" |
| 283 |
- "-DPODOFO_HAVE_JPEG_LIB=1" |
| 284 |
- "-DPODOFO_HAVE_PNG_LIB=1" |
| 285 |
- "-DPODOFO_HAVE_TIFF_LIB=1" |
| 286 |
- "-DWANT_FONTCONFIG=1" |
| 287 |
- "-DUSE_STLPORT=0" |
| 288 |
- -DWANT_BOOST=$(usex boost ON OFF) |
| 289 |
- -DHAVE_LIBIDN=$(usex idn ON OFF) |
| 290 |
- -DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF) |
| 291 |
- -DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON) |
| 292 |
- ) |
| 293 |
- |
| 294 |
- cmake-utils_src_configure |
| 295 |
-} |
| 296 |
- |
| 297 |
-src_test() { |
| 298 |
- cd "${CMAKE_BUILD_DIR}"/test/unit |
| 299 |
- ./podofo-test --selftest || die "self test failed" |
| 300 |
-} |
Archives