| 1 |
commit: cdb23e8b3608be50daebdeb5d904b179a58d8339 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 19 15:23:00 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 19 15:23:34 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb23e8b |
| 7 |
|
| 8 |
media-gfx/exiv2: Security cleanup |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/621028 |
| 11 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
| 12 |
|
| 13 |
media-gfx/exiv2/Manifest | 1 - |
| 14 |
media-gfx/exiv2/exiv2-0.25-r2.ebuild | 127 --------------------- |
| 15 |
media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch | 71 ------------ |
| 16 |
.../exiv2/files/exiv2-0.25-fix-install-dirs.patch | 64 ----------- |
| 17 |
.../exiv2/files/exiv2-0.25-fix-without-zlib.patch | 22 ---- |
| 18 |
.../files/exiv2-0.25-fvisibility-hidden.patch | 19 --- |
| 19 |
.../exiv2/files/exiv2-0.25-hide-symbols.patch | 97 ---------------- |
| 20 |
.../exiv2/files/exiv2-0.25-tools-optional.patch | 27 ----- |
| 21 |
8 files changed, 428 deletions(-) |
| 22 |
|
| 23 |
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest |
| 24 |
index f37e0231887..44859a8fee7 100644 |
| 25 |
--- a/media-gfx/exiv2/Manifest |
| 26 |
+++ b/media-gfx/exiv2/Manifest |
| 27 |
@@ -1,2 +1 @@ |
| 28 |
-DIST exiv2-0.25.tar.gz 5434325 SHA256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 SHA512 08d4e655ffdde715e0214f4bef01d55aba9b8ba517456a60e254a0f8541c20479e407545db28ca90a69dee8def6941fdd88f9a557fb382ebebe49e363aca8e8e WHIRLPOOL f9e7a6947dac5870e0574253b8c1cb1e7d31a916a9e1c4417c73168046c0b4bed90b9c77253444604163bcf6dca204dab92a52cb03bdcb0f85c807327623f8ac |
| 29 |
DIST exiv2-0.26_p20171104.tar.gz 28368697 SHA256 f7a46c0b1d3d3c30518202e62dbe086029f584a064bbb531a0ab11270a454007 SHA512 6f6a884d7978e54dceb9ce45248cd0425ff469887c85ef52b0e38cb755970f69fce96b4b5317c8e8070b833f72ca214696042aac71292a6f9c3440f6a369d474 WHIRLPOOL 7baf5fcde327b2e1decde48f44b616f98fab7c65d22ee5e94e0b356fad4d7950c116db17a94b3c91954ac1565c3fe2853b83262c0a4597744dea708b304dce09 |
| 30 |
|
| 31 |
diff --git a/media-gfx/exiv2/exiv2-0.25-r2.ebuild b/media-gfx/exiv2/exiv2-0.25-r2.ebuild |
| 32 |
deleted file mode 100644 |
| 33 |
index 5f2ca76c7da..00000000000 |
| 34 |
--- a/media-gfx/exiv2/exiv2-0.25-r2.ebuild |
| 35 |
+++ /dev/null |
| 36 |
@@ -1,127 +0,0 @@ |
| 37 |
-# Copyright 1999-2017 Gentoo Foundation |
| 38 |
-# Distributed under the terms of the GNU General Public License v2 |
| 39 |
- |
| 40 |
-EAPI=5 |
| 41 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 42 |
- |
| 43 |
-inherit eutils cmake-multilib python-any-r1 |
| 44 |
- |
| 45 |
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" |
| 46 |
-HOMEPAGE="http://www.exiv2.org/" |
| 47 |
-SRC_URI="http://www.exiv2.org/${P}.tar.gz" |
| 48 |
- |
| 49 |
-LICENSE="GPL-2" |
| 50 |
-SLOT="0/14" |
| 51 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
| 52 |
-IUSE_LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi" |
| 53 |
-IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${IUSE_LINGUAS})" |
| 54 |
- |
| 55 |
-RDEPEND=" |
| 56 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
| 57 |
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) |
| 58 |
- png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) |
| 59 |
- webready? ( |
| 60 |
- net-libs/libssh[${MULTILIB_USEDEP}] |
| 61 |
- net-misc/curl[${MULTILIB_USEDEP}] |
| 62 |
- ) |
| 63 |
- xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] ) |
| 64 |
-" |
| 65 |
- |
| 66 |
-DEPEND="${RDEPEND} |
| 67 |
- doc? ( |
| 68 |
- app-doc/doxygen |
| 69 |
- dev-libs/libxslt |
| 70 |
- virtual/pkgconfig |
| 71 |
- media-gfx/graphviz |
| 72 |
- ${PYTHON_DEPS} |
| 73 |
- ) |
| 74 |
- nls? ( sys-devel/gettext ) |
| 75 |
-" |
| 76 |
- |
| 77 |
-DOCS=( README doc/ChangeLog doc/cmd.txt ) |
| 78 |
- |
| 79 |
-PATCHES=( |
| 80 |
- "${FILESDIR}/${PN}-0.25-fix-install-dirs.patch" |
| 81 |
- "${FILESDIR}/${PN}-0.25-fix-without-zlib.patch" |
| 82 |
- "${FILESDIR}/${PN}-0.25-hide-symbols.patch" |
| 83 |
- "${FILESDIR}/${PN}-0.25-fvisibility-hidden.patch" |
| 84 |
- # TODO: Take to upstream |
| 85 |
- "${FILESDIR}/${PN}-0.25-fix-docs.patch" |
| 86 |
- "${FILESDIR}/${PN}-0.25-tools-optional.patch" |
| 87 |
-) |
| 88 |
- |
| 89 |
-pkg_setup() { |
| 90 |
- use doc && python-any-r1_pkg_setup |
| 91 |
-} |
| 92 |
- |
| 93 |
-src_prepare() { |
| 94 |
- rm -r msvc* build || die "Failed to remove msvc dirs" |
| 95 |
- |
| 96 |
- if [[ ${PV} != *9999 ]] ; then |
| 97 |
- if [[ -d po ]] ; then |
| 98 |
- pushd po > /dev/null || die |
| 99 |
- for lang in *.po; do |
| 100 |
- if ! has ${lang%.po} ${LINGUAS} ; then |
| 101 |
- rm -rf ${lang} || die |
| 102 |
- fi |
| 103 |
- done |
| 104 |
- popd > /dev/null || die |
| 105 |
- else |
| 106 |
- die "Failed to prepare LINGUAS - po directory moved?" |
| 107 |
- fi |
| 108 |
- fi |
| 109 |
- |
| 110 |
- # convert docs to UTF-8 |
| 111 |
- local i |
| 112 |
- for i in doc/cmd.txt; do |
| 113 |
- einfo "Converting "${i}" to UTF-8" |
| 114 |
- iconv -f LATIN1 -t UTF-8 "${i}" > "${i}.tmp" || die |
| 115 |
- mv -f "${i}.tmp" "${i}" || die |
| 116 |
- done |
| 117 |
- |
| 118 |
- if use doc; then |
| 119 |
- einfo "Updating doxygen config" |
| 120 |
- doxygen &>/dev/null -u config/Doxyfile || die |
| 121 |
- fi |
| 122 |
- |
| 123 |
- cmake-utils_src_prepare |
| 124 |
-} |
| 125 |
- |
| 126 |
-multilib_src_configure() { |
| 127 |
- local mycmakeargs=( |
| 128 |
- -DEXIV2_ENABLE_BUILD_PO=YES |
| 129 |
- -DEXIV2_ENABLE_BUILD_SAMPLES=NO |
| 130 |
- -DEXIV2_ENABLE_CURL=$(usex webready) |
| 131 |
- -DEXIV2_ENABLE_NLS=$(usex nls) |
| 132 |
- -DEXIV2_ENABLE_PNG=$(usex png) |
| 133 |
- -DEXIV2_ENABLE_SSH=$(usex webready) |
| 134 |
- -DEXIV2_ENABLE_WEBREADY=$(usex webready) |
| 135 |
- -DEXIV2_ENABLE_XMP=$(usex xmp) |
| 136 |
- -DEXIV2_ENABLE_LIBXMP=NO |
| 137 |
- $(multilib_is_native_abi || \ |
| 138 |
- echo -DEXIV2_ENABLE_TOOLS=NO) |
| 139 |
- ) |
| 140 |
- |
| 141 |
- cmake-utils_src_configure |
| 142 |
-} |
| 143 |
- |
| 144 |
-multilib_src_compile() { |
| 145 |
- cmake-utils_src_compile |
| 146 |
- |
| 147 |
- if multilib_is_native_abi; then |
| 148 |
- use doc && emake -j1 doc |
| 149 |
- fi |
| 150 |
-} |
| 151 |
- |
| 152 |
-multilib_src_install_all() { |
| 153 |
- einstalldocs |
| 154 |
- prune_libtool_files --all |
| 155 |
- |
| 156 |
- use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} |
| 157 |
- use doc && dodoc -r "${S}"/doc/html |
| 158 |
- |
| 159 |
- if use examples; then |
| 160 |
- docinto examples |
| 161 |
- dodoc samples/*.cpp |
| 162 |
- fi |
| 163 |
-} |
| 164 |
|
| 165 |
diff --git a/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch b/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch |
| 166 |
deleted file mode 100644 |
| 167 |
index e2bf677b512..00000000000 |
| 168 |
--- a/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch |
| 169 |
+++ /dev/null |
| 170 |
@@ -1,71 +0,0 @@ |
| 171 |
---- a/CMakeLists.txt 2015-07-19 16:04:35.363628707 +0200 |
| 172 |
-+++ b/CMakeLists.txt 2015-07-19 16:28:31.051680136 +0200 |
| 173 |
-@@ -216,9 +216,7 @@ |
| 174 |
- ADD_SUBDIRECTORY( xmpsdk ) |
| 175 |
- ADD_SUBDIRECTORY( src ) |
| 176 |
- |
| 177 |
--IF( EXIV2_ENABLE_BUILD_SAMPLES ) |
| 178 |
-- ADD_SUBDIRECTORY( samples ) |
| 179 |
--ENDIF( EXIV2_ENABLE_BUILD_SAMPLES ) |
| 180 |
-+ADD_SUBDIRECTORY( samples ) |
| 181 |
- |
| 182 |
- IF( EXIV2_ENABLE_BUILD_PO ) |
| 183 |
- ADD_SUBDIRECTORY( po ) |
| 184 |
---- a/samples/CMakeLists.txt 2015-07-19 16:04:35.360628744 +0200 |
| 185 |
-+++ b/samples/CMakeLists.txt 2015-07-19 16:30:46.415987850 +0200 |
| 186 |
-@@ -20,7 +20,11 @@ |
| 187 |
- endif() |
| 188 |
- include_directories("${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src") |
| 189 |
- |
| 190 |
--SET( SAMPLES addmoddel.cpp |
| 191 |
-+SET( SAMPLES taglist.cpp ) |
| 192 |
-+ |
| 193 |
-+IF( EXIV2_ENABLE_BUILD_SAMPLES ) |
| 194 |
-+ SET( SAMPLES ${SAMPLES} |
| 195 |
-+ addmoddel.cpp |
| 196 |
- convert-test.cpp |
| 197 |
- easyaccess-test.cpp |
| 198 |
- exifcomment.cpp |
| 199 |
-@@ -38,7 +42,6 @@ |
| 200 |
- mmap-test.cpp |
| 201 |
- prevtest.cpp |
| 202 |
- stringto-test.cpp |
| 203 |
-- taglist.cpp |
| 204 |
- tiff-test.cpp |
| 205 |
- werror-test.cpp |
| 206 |
- write-test.cpp |
| 207 |
-@@ -47,6 +50,7 @@ |
| 208 |
- xmpparser-test.cpp |
| 209 |
- xmpsample.cpp |
| 210 |
- ) |
| 211 |
-+ENDIF() |
| 212 |
- |
| 213 |
- FOREACH(entry ${SAMPLES}) |
| 214 |
- STRING( REPLACE ".cpp" "" target ${entry}) |
| 215 |
-@@ -63,6 +67,7 @@ |
| 216 |
- SET( MC_SRC ${MC_SRC} ../src/getopt_win32.c ) |
| 217 |
- ENDIF( MSVC ) |
| 218 |
- |
| 219 |
-+IF( EXIV2_ENABLE_BUILD_SAMPLES ) |
| 220 |
- SET( MC_SRC ${MC_SRC} metacopy.cpp ../src/utils.cpp ) |
| 221 |
- ADD_EXECUTABLE( metacopy ${MC_SRC} ) |
| 222 |
- TARGET_LINK_LIBRARIES( metacopy exiv2lib ) |
| 223 |
-@@ -79,6 +84,7 @@ |
| 224 |
- SET_TARGET_PROPERTIES( exiv2json PROPERTIES OUTPUT_NAME exiv2json ) |
| 225 |
- TARGET_LINK_LIBRARIES( exiv2json exiv2lib ) |
| 226 |
- INSTALL( TARGETS exiv2json ${INSTALL_TARGET_STANDARD_ARGS} ) |
| 227 |
-+ENDIF() |
| 228 |
- |
| 229 |
- # That's all Folks! |
| 230 |
- ## |
| 231 |
---- a/doc/templates/Makefile 2015-07-19 16:50:50.589933604 +0200 |
| 232 |
-+++ b/doc/templates/Makefile 2015-07-19 16:51:07.686719864 +0200 |
| 233 |
-@@ -143,7 +143,7 @@ |
| 234 |
- xmp_mwg-rs \ |
| 235 |
- xmp_mwg-kw |
| 236 |
- |
| 237 |
--TAGLIST = ../../bin/taglist |
| 238 |
-+TAGLIST = ../../src/bin/taglist |
| 239 |
- |
| 240 |
- # ********************************************************************** |
| 241 |
- # ====================================================================== |
| 242 |
|
| 243 |
diff --git a/media-gfx/exiv2/files/exiv2-0.25-fix-install-dirs.patch b/media-gfx/exiv2/files/exiv2-0.25-fix-install-dirs.patch |
| 244 |
deleted file mode 100644 |
| 245 |
index bca79dd4d47..00000000000 |
| 246 |
--- a/media-gfx/exiv2/files/exiv2-0.25-fix-install-dirs.patch |
| 247 |
+++ /dev/null |
| 248 |
@@ -1,64 +0,0 @@ |
| 249 |
-USE GNUInstallDirs to fix man page and multilib install |
| 250 |
- |
| 251 |
-See also: http://dev.exiv2.org/issues/1125 |
| 252 |
-Patch based on: http://pkgs.fedoraproject.org/cgit/exiv2.git/tree/exiv2-0.25-cmake_LIB_SUFFIX.patch |
| 253 |
- |
| 254 |
---- b/config/CMakeChecks.txt 2015-07-19 14:23:11.606686135 +0200 |
| 255 |
-+++ b/config/CMakeChecks.txt 2015-06-22 08:41:22.913094633 -0500 |
| 256 |
-@@ -37,6 +37,8 @@ |
| 257 |
- INCLUDE( CheckCSourceCompiles ) |
| 258 |
- INCLUDE( CheckCXXSourceCompiles ) |
| 259 |
- |
| 260 |
-+INCLUDE( GNUInstallDirs ) |
| 261 |
-+ |
| 262 |
- INCLUDE( FindIconv ) |
| 263 |
- |
| 264 |
- SET( STDC_HEADERS ON ) |
| 265 |
-@@ -289,9 +291,9 @@ |
| 266 |
- |
| 267 |
- IF( NOT MSVC ) |
| 268 |
- CONFIGURE_FILE( config/exiv2.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc @ONLY ) |
| 269 |
-- INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION lib/pkgconfig ) |
| 270 |
-+ INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) |
| 271 |
- CONFIGURE_FILE( config/exiv2.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm) |
| 272 |
-- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm DESTINATION lib/pkgconfig ) |
| 273 |
-+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) |
| 274 |
- ENDIF( NOT MSVC ) |
| 275 |
- |
| 276 |
- # ****************************************************************************** |
| 277 |
---- a/src/CMakeLists.txt 2015-07-19 14:06:54.104906589 +0200 |
| 278 |
-+++ b/src/CMakeLists.txt 2015-07-19 14:12:37.982607526 +0200 |
| 279 |
-@@ -321,7 +321,7 @@ |
| 280 |
- |
| 281 |
- # ****************************************************************************** |
| 282 |
- # Man page |
| 283 |
--INSTALL( FILES exiv2.1 DESTINATION man/man1 ) |
| 284 |
-+INSTALL( FILES exiv2.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 ) |
| 285 |
- |
| 286 |
- # That's all Folks! |
| 287 |
- ## |
| 288 |
---- a/CMakeLists.txt 2015-06-15 10:32:21.000000000 -0500 |
| 289 |
-+++ b/CMakeLists.txt 2015-06-22 08:48:19.486245765 -0500 |
| 290 |
-@@ -25,7 +25,7 @@ if( POLICY CMP0042 ) |
| 291 |
- else() |
| 292 |
- SET(CMAKE_MACOSX_RPATH 1) |
| 293 |
- endif() |
| 294 |
--SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") |
| 295 |
-+#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") |
| 296 |
- |
| 297 |
- |
| 298 |
- SET( PACKAGE_COPYRIGHT "Andreas Huggel" ) |
| 299 |
-@@ -156,10 +156,10 @@ INCLUDE( config/CMakeChecks.txt ) |
| 300 |
- |
| 301 |
- SET( INSTALL_TARGET_STANDARD_ARGS |
| 302 |
- RUNTIME DESTINATION bin |
| 303 |
-- LIBRARY DESTINATION lib |
| 304 |
-- ARCHIVE DESTINATION lib |
| 305 |
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 306 |
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 307 |
- ) |
| 308 |
--SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") |
| 309 |
-+#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") |
| 310 |
- |
| 311 |
- ## |
| 312 |
- # add sources from XMPSDK directory |
| 313 |
|
| 314 |
diff --git a/media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch b/media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch |
| 315 |
deleted file mode 100644 |
| 316 |
index c6d435d68bb..00000000000 |
| 317 |
--- a/media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch |
| 318 |
+++ /dev/null |
| 319 |
@@ -1,22 +0,0 @@ |
| 320 |
-Fix exiv2.hpp if built with PNG support disabled (--without-zlib) |
| 321 |
- |
| 322 |
-Fixed upstream in >=0.26 |
| 323 |
- |
| 324 |
-See also: http://dev.exiv2.org/issues/1103 |
| 325 |
-Gentoo bug 1: https://bugs.gentoo.org/show_bug.cgi?id=552046 |
| 326 |
-Gentoo bug 2: https://bugs.gentoo.org/show_bug.cgi?id=535836 |
| 327 |
- |
| 328 |
-Index: exiv2.hpp |
| 329 |
-=================================================================== |
| 330 |
---- a/include/exiv2/exiv2.hpp (revision 3887) |
| 331 |
-+++ b/include/exiv2/exiv2.hpp (revision 3888) |
| 332 |
-@@ -52,7 +52,9 @@ |
| 333 |
- #include "mrwimage.hpp" |
| 334 |
- #include "orfimage.hpp" |
| 335 |
- #include "pgfimage.hpp" |
| 336 |
-+#ifdef EXV_HAVE_LIBZ |
| 337 |
- #include "pngimage.hpp" |
| 338 |
-+#endif |
| 339 |
- #include "preview.hpp" |
| 340 |
- #include "properties.hpp" |
| 341 |
- #include "psdimage.hpp" |
| 342 |
|
| 343 |
diff --git a/media-gfx/exiv2/files/exiv2-0.25-fvisibility-hidden.patch b/media-gfx/exiv2/files/exiv2-0.25-fvisibility-hidden.patch |
| 344 |
deleted file mode 100644 |
| 345 |
index 26c5c1d39d7..00000000000 |
| 346 |
--- a/media-gfx/exiv2/files/exiv2-0.25-fvisibility-hidden.patch |
| 347 |
+++ /dev/null |
| 348 |
@@ -1,19 +0,0 @@ |
| 349 |
-Index: CMakeLists.txt |
| 350 |
-=================================================================== |
| 351 |
---- a/xmpsdk/CMakeLists.txt (revision 3974) |
| 352 |
-+++ b/xmpsdk/CMakeLists.txt (revision 3975) |
| 353 |
-@@ -20,6 +20,14 @@ |
| 354 |
- ENDIF(NOT MSVC AND NOT CYGWIN AND NOT MSYS) |
| 355 |
- ENDFOREACH() |
| 356 |
- |
| 357 |
-+if(NOT MSVC) |
| 358 |
-+ # http://stackoverflow.com/questions/10046114/in-cmake-how-can-i-test-if-the-compiler-is-clang |
| 359 |
-+ if ( NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang") |
| 360 |
-+ # 1123 - hide xmpsdk symbols |
| 361 |
-+ add_definitions( -fvisibility=hidden -fvisibility-inlines-hidden ) |
| 362 |
-+ endif() |
| 363 |
-+endif() |
| 364 |
-+ |
| 365 |
- IF( EXIV2_ENABLE_XMP AND EXIV2_ENABLE_LIBXMP ) |
| 366 |
- ADD_LIBRARY( xmp STATIC ${XMPSRC} ) |
| 367 |
- GET_TARGET_PROPERTY( XMPLIB xmp LOCATION ) |
| 368 |
|
| 369 |
diff --git a/media-gfx/exiv2/files/exiv2-0.25-hide-symbols.patch b/media-gfx/exiv2/files/exiv2-0.25-hide-symbols.patch |
| 370 |
deleted file mode 100644 |
| 371 |
index 7c8613db5e8..00000000000 |
| 372 |
--- a/media-gfx/exiv2/files/exiv2-0.25-hide-symbols.patch |
| 373 |
+++ /dev/null |
| 374 |
@@ -1,97 +0,0 @@ |
| 375 |
-Index: a/samples/CMakeLists.txt |
| 376 |
-=================================================================== |
| 377 |
---- a/samples/CMakeLists.txt (revision 3972) |
| 378 |
-+++ b/samples/CMakeLists.txt (revision 3973) |
| 379 |
-@@ -52,7 +52,7 @@ |
| 380 |
- STRING( REPLACE ".cpp" "" target ${entry}) |
| 381 |
- ADD_EXECUTABLE( ${target} ${target}.cpp ) |
| 382 |
- ADD_TEST( ${target}_test ${target} ) |
| 383 |
-- TARGET_LINK_LIBRARIES( ${target} exiv2lib ) |
| 384 |
-+ TARGET_LINK_LIBRARIES( ${target} PRIVATE exiv2lib ${EXPAT_LIBRARIES}) |
| 385 |
- #INSTALL( TARGETS ${target} ${INSTALL_TARGET_STANDARD_ARGS} ) |
| 386 |
- ENDFOREACH(entry ${SAMPLES}) |
| 387 |
- |
| 388 |
-Index: a/src/CMakeLists.txt |
| 389 |
-=================================================================== |
| 390 |
---- a/src/CMakeLists.txt (revision 3972) |
| 391 |
-+++ b/src/CMakeLists.txt (revision 3973) |
| 392 |
-@@ -240,20 +240,20 @@ |
| 393 |
- |
| 394 |
- if ( MSVC ) |
| 395 |
- source_group("Header Files" FILES ${LIBEXIV2_HDR} ) |
| 396 |
-- TARGET_LINK_LIBRARIES( exiv2lib ${EXPAT_LIBRARIES} ) |
| 397 |
-+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${EXPAT_LIBRARIES} ) |
| 398 |
- source_group("Header Files" FILES ${LIBCURL_HDR} ) |
| 399 |
-- TARGET_LINK_LIBRARIES( exiv2lib ${CURL_LIBRARIES} ) |
| 400 |
-+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${CURL_LIBRARIES} ) |
| 401 |
- source_group("Header Files" FILES ${SSH_HDR} ) |
| 402 |
-- TARGET_LINK_LIBRARIES( exiv2lib ${SSH_LIBRARIES} ) |
| 403 |
-+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${SSH_LIBRARIES} ) |
| 404 |
- else() |
| 405 |
- if ( NOT MINGW ) |
| 406 |
-- TARGET_LINK_LIBRARIES( exiv2lib dl ${EXPAT_LIBRARIES} ) |
| 407 |
-- TARGET_LINK_LIBRARIES( exiv2lib dl ${CURL_LIBRARIES} ) |
| 408 |
-- TARGET_LINK_LIBRARIES( exiv2lib dl ${SSH_LIBRARIES} ) |
| 409 |
-+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${EXPAT_LIBRARIES} ) |
| 410 |
-+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${CURL_LIBRARIES} ) |
| 411 |
-+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${SSH_LIBRARIES} ) |
| 412 |
- else() |
| 413 |
-- TARGET_LINK_LIBRARIES( exiv2lib ${EXPAT_LIBRARIES} ) |
| 414 |
-- TARGET_LINK_LIBRARIES( exiv2lib ${CURL_LIBRARIES} ) |
| 415 |
-- TARGET_LINK_LIBRARIES( exiv2lib ${SSH_LIBRARIES} ) |
| 416 |
-+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${EXPAT_LIBRARIES} ) |
| 417 |
-+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${CURL_LIBRARIES} ) |
| 418 |
-+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${SSH_LIBRARIES} ) |
| 419 |
- endif() |
| 420 |
- endif() |
| 421 |
- |
| 422 |
-@@ -262,33 +262,33 @@ |
| 423 |
- if ( MSVC ) |
| 424 |
- LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH}/$(ConfigurationName)) |
| 425 |
- endif(MSVC) |
| 426 |
-- TARGET_LINK_LIBRARIES( exiv2lib xmp ) |
| 427 |
-+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE xmp ) |
| 428 |
- ENDIF() |
| 429 |
- |
| 430 |
- IF( EXIV2_ENABLE_PNG ) |
| 431 |
- IF( ZLIB_FOUND ) |
| 432 |
- IF( MSVC ) |
| 433 |
- if ( EXIV2_ENABLE_SHARED ) |
| 434 |
-- TARGET_LINK_LIBRARIES( exiv2lib optimized ${ZLIB_LIBRARIES} debug ${ZLIB_LIBRARIES}d ) |
| 435 |
-+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE optimized ${ZLIB_LIBRARIES}.lib debug ${ZLIB_LIBRARIES}d.lib ) |
| 436 |
- else() |
| 437 |
-- TARGET_LINK_LIBRARIES( exiv2lib optimized zlibstatic.lib debug zlibstaticd.lib ) |
| 438 |
-+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE optimized zlibstatic.lib debug zlibstaticd.lib ) |
| 439 |
- endif() |
| 440 |
- ELSE() |
| 441 |
-- TARGET_LINK_LIBRARIES( exiv2lib ${ZLIB_LIBRARIES} ) |
| 442 |
-+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${ZLIB_LIBRARIES} ) |
| 443 |
- ENDIF() |
| 444 |
- ENDIF() |
| 445 |
- ENDIF() |
| 446 |
- |
| 447 |
- IF( EXIV2_ENABLE_NLS ) |
| 448 |
-- TARGET_LINK_LIBRARIES( exiv2lib ${LIBINTL_LIBRARIES} ) |
| 449 |
-+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${LIBINTL_LIBRARIES} ) |
| 450 |
- ENDIF( EXIV2_ENABLE_NLS ) |
| 451 |
- |
| 452 |
- IF( ICONV_FOUND ) |
| 453 |
-- TARGET_LINK_LIBRARIES( exiv2lib ${ICONV_LIBRARIES} ) |
| 454 |
-+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${ICONV_LIBRARIES} ) |
| 455 |
- ENDIF( ICONV_FOUND ) |
| 456 |
- |
| 457 |
- IF (CYGWIN OR MINGW) |
| 458 |
-- TARGET_LINK_LIBRARIES( exiv2lib psapi ) |
| 459 |
-+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE psapi ) |
| 460 |
- ENDIF(CYGWIN OR MINGW) |
| 461 |
- |
| 462 |
- |
| 463 |
-@@ -303,7 +303,7 @@ |
| 464 |
- # ****************************************************************************** |
| 465 |
- # connection test application |
| 466 |
- ADD_EXECUTABLE( conntest ${CONNTEST} ) |
| 467 |
--TARGET_LINK_LIBRARIES( conntest exiv2lib ) |
| 468 |
-+TARGET_LINK_LIBRARIES( conntest PRIVATE exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRARIES}) |
| 469 |
- |
| 470 |
- # ****************************************************************************** |
| 471 |
- # exifprint application |
| 472 |
|
| 473 |
diff --git a/media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch b/media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch |
| 474 |
deleted file mode 100644 |
| 475 |
index 2bb030a4c4f..00000000000 |
| 476 |
--- a/media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch |
| 477 |
+++ /dev/null |
| 478 |
@@ -1,27 +0,0 @@ |
| 479 |
---- a/CMakeLists.txt 2015-06-15 17:32:21.000000000 +0200 |
| 480 |
-+++ b/CMakeLists.txt 2015-10-04 14:37:05.319679836 +0200 |
| 481 |
-@@ -55,6 +55,7 @@ |
| 482 |
- OPTION( EXIV2_ENABLE_WEBREADY "Build webready support into library" OFF ) |
| 483 |
- OPTION( EXIV2_ENABLE_CURL "USE Libcurl for HttpIo" ON ) |
| 484 |
- OPTION( EXIV2_ENABLE_SSH "USE Libssh for SshIo" ON ) |
| 485 |
-+OPTION( EXIV2_ENABLE_TOOLS "Build exiv2 executable" ON ) |
| 486 |
- |
| 487 |
- IF( MINGW OR UNIX ) |
| 488 |
- IF ( CMAKE_CXX_COMPILER STREQUAL "g++" OR CMAKE_C_COMPILER STREQUAL "gcc" ) |
| 489 |
---- a/src/CMakeLists.txt 2015-06-14 11:12:19.000000000 +0200 |
| 490 |
-+++ b/src/CMakeLists.txt 2015-10-04 14:33:27.784399402 +0200 |
| 491 |
-@@ -296,9 +296,11 @@ |
| 492 |
- |
| 493 |
- # ****************************************************************************** |
| 494 |
- # exiv2 application |
| 495 |
--ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ) |
| 496 |
--TARGET_LINK_LIBRARIES( exiv2 exiv2lib ) |
| 497 |
--INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} ) |
| 498 |
-+IF( EXIV2_ENABLE_TOOLS ) |
| 499 |
-+ ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ) |
| 500 |
-+ TARGET_LINK_LIBRARIES( exiv2 exiv2lib ) |
| 501 |
-+ INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} ) |
| 502 |
-+ENDIF( EXIV2_ENABLE_TOOLS ) |
| 503 |
- |
| 504 |
- # ****************************************************************************** |
| 505 |
- # connection test application |
Archives