From 796cae72cf9ed18ba01256ac1f83a686a2a76036 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 20 Nov 2017 18:45:28 +0000 Subject: gentoo resync : 20.11.2017 --- media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch | 71 ---------------- .../exiv2/files/exiv2-0.25-fix-install-dirs.patch | 64 -------------- .../exiv2/files/exiv2-0.25-fix-without-zlib.patch | 22 ----- .../files/exiv2-0.25-fvisibility-hidden.patch | 19 ----- .../exiv2/files/exiv2-0.25-hide-symbols.patch | 97 ---------------------- .../exiv2/files/exiv2-0.25-tools-optional.patch | 27 ------ 6 files changed, 300 deletions(-) delete mode 100644 media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch delete mode 100644 media-gfx/exiv2/files/exiv2-0.25-fix-install-dirs.patch delete mode 100644 media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch delete mode 100644 media-gfx/exiv2/files/exiv2-0.25-fvisibility-hidden.patch delete mode 100644 media-gfx/exiv2/files/exiv2-0.25-hide-symbols.patch delete mode 100644 media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch (limited to 'media-gfx/exiv2/files') diff --git a/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch b/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch deleted file mode 100644 index e2bf677b5125..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- a/CMakeLists.txt 2015-07-19 16:04:35.363628707 +0200 -+++ b/CMakeLists.txt 2015-07-19 16:28:31.051680136 +0200 -@@ -216,9 +216,7 @@ - ADD_SUBDIRECTORY( xmpsdk ) - ADD_SUBDIRECTORY( src ) - --IF( EXIV2_ENABLE_BUILD_SAMPLES ) -- ADD_SUBDIRECTORY( samples ) --ENDIF( EXIV2_ENABLE_BUILD_SAMPLES ) -+ADD_SUBDIRECTORY( samples ) - - IF( EXIV2_ENABLE_BUILD_PO ) - ADD_SUBDIRECTORY( po ) ---- a/samples/CMakeLists.txt 2015-07-19 16:04:35.360628744 +0200 -+++ b/samples/CMakeLists.txt 2015-07-19 16:30:46.415987850 +0200 -@@ -20,7 +20,11 @@ - endif() - include_directories("${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src") - --SET( SAMPLES addmoddel.cpp -+SET( SAMPLES taglist.cpp ) -+ -+IF( EXIV2_ENABLE_BUILD_SAMPLES ) -+ SET( SAMPLES ${SAMPLES} -+ addmoddel.cpp - convert-test.cpp - easyaccess-test.cpp - exifcomment.cpp -@@ -38,7 +42,6 @@ - mmap-test.cpp - prevtest.cpp - stringto-test.cpp -- taglist.cpp - tiff-test.cpp - werror-test.cpp - write-test.cpp -@@ -47,6 +50,7 @@ - xmpparser-test.cpp - xmpsample.cpp - ) -+ENDIF() - - FOREACH(entry ${SAMPLES}) - STRING( REPLACE ".cpp" "" target ${entry}) -@@ -63,6 +67,7 @@ - SET( MC_SRC ${MC_SRC} ../src/getopt_win32.c ) - ENDIF( MSVC ) - -+IF( EXIV2_ENABLE_BUILD_SAMPLES ) - SET( MC_SRC ${MC_SRC} metacopy.cpp ../src/utils.cpp ) - ADD_EXECUTABLE( metacopy ${MC_SRC} ) - TARGET_LINK_LIBRARIES( metacopy exiv2lib ) -@@ -79,6 +84,7 @@ - SET_TARGET_PROPERTIES( exiv2json PROPERTIES OUTPUT_NAME exiv2json ) - TARGET_LINK_LIBRARIES( exiv2json exiv2lib ) - INSTALL( TARGETS exiv2json ${INSTALL_TARGET_STANDARD_ARGS} ) -+ENDIF() - - # That's all Folks! - ## ---- a/doc/templates/Makefile 2015-07-19 16:50:50.589933604 +0200 -+++ b/doc/templates/Makefile 2015-07-19 16:51:07.686719864 +0200 -@@ -143,7 +143,7 @@ - xmp_mwg-rs \ - xmp_mwg-kw - --TAGLIST = ../../bin/taglist -+TAGLIST = ../../src/bin/taglist - - # ********************************************************************** - # ====================================================================== 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 deleted file mode 100644 index bca79dd4d471..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.25-fix-install-dirs.patch +++ /dev/null @@ -1,64 +0,0 @@ -USE GNUInstallDirs to fix man page and multilib install - -See also: http://dev.exiv2.org/issues/1125 -Patch based on: http://pkgs.fedoraproject.org/cgit/exiv2.git/tree/exiv2-0.25-cmake_LIB_SUFFIX.patch - ---- b/config/CMakeChecks.txt 2015-07-19 14:23:11.606686135 +0200 -+++ b/config/CMakeChecks.txt 2015-06-22 08:41:22.913094633 -0500 -@@ -37,6 +37,8 @@ - INCLUDE( CheckCSourceCompiles ) - INCLUDE( CheckCXXSourceCompiles ) - -+INCLUDE( GNUInstallDirs ) -+ - INCLUDE( FindIconv ) - - SET( STDC_HEADERS ON ) -@@ -289,9 +291,9 @@ - - IF( NOT MSVC ) - CONFIGURE_FILE( config/exiv2.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc @ONLY ) -- INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION lib/pkgconfig ) -+ INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) - CONFIGURE_FILE( config/exiv2.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm) -- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm DESTINATION lib/pkgconfig ) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) - ENDIF( NOT MSVC ) - - # ****************************************************************************** ---- a/src/CMakeLists.txt 2015-07-19 14:06:54.104906589 +0200 -+++ b/src/CMakeLists.txt 2015-07-19 14:12:37.982607526 +0200 -@@ -321,7 +321,7 @@ - - # ****************************************************************************** - # Man page --INSTALL( FILES exiv2.1 DESTINATION man/man1 ) -+INSTALL( FILES exiv2.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 ) - - # That's all Folks! - ## ---- a/CMakeLists.txt 2015-06-15 10:32:21.000000000 -0500 -+++ b/CMakeLists.txt 2015-06-22 08:48:19.486245765 -0500 -@@ -25,7 +25,7 @@ if( POLICY CMP0042 ) - else() - SET(CMAKE_MACOSX_RPATH 1) - endif() --SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") -+#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") - - - SET( PACKAGE_COPYRIGHT "Andreas Huggel" ) -@@ -156,10 +156,10 @@ INCLUDE( config/CMakeChecks.txt ) - - SET( INSTALL_TARGET_STANDARD_ARGS - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) --SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") -+#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") - - ## - # add sources from XMPSDK directory 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 deleted file mode 100644 index c6d435d68bb8..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix exiv2.hpp if built with PNG support disabled (--without-zlib) - -Fixed upstream in >=0.26 - -See also: http://dev.exiv2.org/issues/1103 -Gentoo bug 1: https://bugs.gentoo.org/show_bug.cgi?id=552046 -Gentoo bug 2: https://bugs.gentoo.org/show_bug.cgi?id=535836 - -Index: exiv2.hpp -=================================================================== ---- a/include/exiv2/exiv2.hpp (revision 3887) -+++ b/include/exiv2/exiv2.hpp (revision 3888) -@@ -52,7 +52,9 @@ - #include "mrwimage.hpp" - #include "orfimage.hpp" - #include "pgfimage.hpp" -+#ifdef EXV_HAVE_LIBZ - #include "pngimage.hpp" -+#endif - #include "preview.hpp" - #include "properties.hpp" - #include "psdimage.hpp" diff --git a/media-gfx/exiv2/files/exiv2-0.25-fvisibility-hidden.patch b/media-gfx/exiv2/files/exiv2-0.25-fvisibility-hidden.patch deleted file mode 100644 index 26c5c1d39d74..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.25-fvisibility-hidden.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: CMakeLists.txt -=================================================================== ---- a/xmpsdk/CMakeLists.txt (revision 3974) -+++ b/xmpsdk/CMakeLists.txt (revision 3975) -@@ -20,6 +20,14 @@ - ENDIF(NOT MSVC AND NOT CYGWIN AND NOT MSYS) - ENDFOREACH() - -+if(NOT MSVC) -+ # http://stackoverflow.com/questions/10046114/in-cmake-how-can-i-test-if-the-compiler-is-clang -+ if ( NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang") -+ # 1123 - hide xmpsdk symbols -+ add_definitions( -fvisibility=hidden -fvisibility-inlines-hidden ) -+ endif() -+endif() -+ - IF( EXIV2_ENABLE_XMP AND EXIV2_ENABLE_LIBXMP ) - ADD_LIBRARY( xmp STATIC ${XMPSRC} ) - GET_TARGET_PROPERTY( XMPLIB xmp LOCATION ) diff --git a/media-gfx/exiv2/files/exiv2-0.25-hide-symbols.patch b/media-gfx/exiv2/files/exiv2-0.25-hide-symbols.patch deleted file mode 100644 index 7c8613db5e82..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.25-hide-symbols.patch +++ /dev/null @@ -1,97 +0,0 @@ -Index: a/samples/CMakeLists.txt -=================================================================== ---- a/samples/CMakeLists.txt (revision 3972) -+++ b/samples/CMakeLists.txt (revision 3973) -@@ -52,7 +52,7 @@ - STRING( REPLACE ".cpp" "" target ${entry}) - ADD_EXECUTABLE( ${target} ${target}.cpp ) - ADD_TEST( ${target}_test ${target} ) -- TARGET_LINK_LIBRARIES( ${target} exiv2lib ) -+ TARGET_LINK_LIBRARIES( ${target} PRIVATE exiv2lib ${EXPAT_LIBRARIES}) - #INSTALL( TARGETS ${target} ${INSTALL_TARGET_STANDARD_ARGS} ) - ENDFOREACH(entry ${SAMPLES}) - -Index: a/src/CMakeLists.txt -=================================================================== ---- a/src/CMakeLists.txt (revision 3972) -+++ b/src/CMakeLists.txt (revision 3973) -@@ -240,20 +240,20 @@ - - if ( MSVC ) - source_group("Header Files" FILES ${LIBEXIV2_HDR} ) -- TARGET_LINK_LIBRARIES( exiv2lib ${EXPAT_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${EXPAT_LIBRARIES} ) - source_group("Header Files" FILES ${LIBCURL_HDR} ) -- TARGET_LINK_LIBRARIES( exiv2lib ${CURL_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${CURL_LIBRARIES} ) - source_group("Header Files" FILES ${SSH_HDR} ) -- TARGET_LINK_LIBRARIES( exiv2lib ${SSH_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${SSH_LIBRARIES} ) - else() - if ( NOT MINGW ) -- TARGET_LINK_LIBRARIES( exiv2lib dl ${EXPAT_LIBRARIES} ) -- TARGET_LINK_LIBRARIES( exiv2lib dl ${CURL_LIBRARIES} ) -- TARGET_LINK_LIBRARIES( exiv2lib dl ${SSH_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${EXPAT_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${CURL_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${SSH_LIBRARIES} ) - else() -- TARGET_LINK_LIBRARIES( exiv2lib ${EXPAT_LIBRARIES} ) -- TARGET_LINK_LIBRARIES( exiv2lib ${CURL_LIBRARIES} ) -- TARGET_LINK_LIBRARIES( exiv2lib ${SSH_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${EXPAT_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${CURL_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${SSH_LIBRARIES} ) - endif() - endif() - -@@ -262,33 +262,33 @@ - if ( MSVC ) - LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH}/$(ConfigurationName)) - endif(MSVC) -- TARGET_LINK_LIBRARIES( exiv2lib xmp ) -+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE xmp ) - ENDIF() - - IF( EXIV2_ENABLE_PNG ) - IF( ZLIB_FOUND ) - IF( MSVC ) - if ( EXIV2_ENABLE_SHARED ) -- TARGET_LINK_LIBRARIES( exiv2lib optimized ${ZLIB_LIBRARIES} debug ${ZLIB_LIBRARIES}d ) -+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE optimized ${ZLIB_LIBRARIES}.lib debug ${ZLIB_LIBRARIES}d.lib ) - else() -- TARGET_LINK_LIBRARIES( exiv2lib optimized zlibstatic.lib debug zlibstaticd.lib ) -+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE optimized zlibstatic.lib debug zlibstaticd.lib ) - endif() - ELSE() -- TARGET_LINK_LIBRARIES( exiv2lib ${ZLIB_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${ZLIB_LIBRARIES} ) - ENDIF() - ENDIF() - ENDIF() - - IF( EXIV2_ENABLE_NLS ) -- TARGET_LINK_LIBRARIES( exiv2lib ${LIBINTL_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${LIBINTL_LIBRARIES} ) - ENDIF( EXIV2_ENABLE_NLS ) - - IF( ICONV_FOUND ) -- TARGET_LINK_LIBRARIES( exiv2lib ${ICONV_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${ICONV_LIBRARIES} ) - ENDIF( ICONV_FOUND ) - - IF (CYGWIN OR MINGW) -- TARGET_LINK_LIBRARIES( exiv2lib psapi ) -+ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE psapi ) - ENDIF(CYGWIN OR MINGW) - - -@@ -303,7 +303,7 @@ - # ****************************************************************************** - # connection test application - ADD_EXECUTABLE( conntest ${CONNTEST} ) --TARGET_LINK_LIBRARIES( conntest exiv2lib ) -+TARGET_LINK_LIBRARIES( conntest PRIVATE exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRARIES}) - - # ****************************************************************************** - # exifprint application diff --git a/media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch b/media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch deleted file mode 100644 index 2bb030a4c4f2..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/CMakeLists.txt 2015-06-15 17:32:21.000000000 +0200 -+++ b/CMakeLists.txt 2015-10-04 14:37:05.319679836 +0200 -@@ -55,6 +55,7 @@ - OPTION( EXIV2_ENABLE_WEBREADY "Build webready support into library" OFF ) - OPTION( EXIV2_ENABLE_CURL "USE Libcurl for HttpIo" ON ) - OPTION( EXIV2_ENABLE_SSH "USE Libssh for SshIo" ON ) -+OPTION( EXIV2_ENABLE_TOOLS "Build exiv2 executable" ON ) - - IF( MINGW OR UNIX ) - IF ( CMAKE_CXX_COMPILER STREQUAL "g++" OR CMAKE_C_COMPILER STREQUAL "gcc" ) ---- a/src/CMakeLists.txt 2015-06-14 11:12:19.000000000 +0200 -+++ b/src/CMakeLists.txt 2015-10-04 14:33:27.784399402 +0200 -@@ -296,9 +296,11 @@ - - # ****************************************************************************** - # exiv2 application --ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ) --TARGET_LINK_LIBRARIES( exiv2 exiv2lib ) --INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} ) -+IF( EXIV2_ENABLE_TOOLS ) -+ ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ) -+ TARGET_LINK_LIBRARIES( exiv2 exiv2lib ) -+ INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} ) -+ENDIF( EXIV2_ENABLE_TOOLS ) - - # ****************************************************************************** - # connection test application -- cgit v1.2.3