summaryrefslogtreecommitdiff
path: root/media-gfx/exiv2/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-03-19 11:37:34 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-03-19 11:37:34 +0000
commitb7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree9fd110f9fc996e8a4213eeda994a8c112491b86d /media-gfx/exiv2/files
parent066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)
gentoo resync : 19.03.2019
Diffstat (limited to 'media-gfx/exiv2/files')
-rw-r--r--media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch83
-rw-r--r--media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch28
2 files changed, 0 insertions, 111 deletions
diff --git a/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch b/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch
deleted file mode 100644
index 05ea18d6eb0c..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch
+++ /dev/null
@@ -1,83 +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
-@@ -21,6 +21,10 @@
- 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 @@
- # ******************************************************************************
- # Man page
- INSTALL( FILES exiv2samples.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
-+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/doc/cmake_doc.sh b/doc/cmake_doc.sh
-index 44dd6760..5910a86d 100755
---- a/doc/cmake_doc.sh
-+++ b/doc/cmake_doc.sh
-@@ -16,7 +16,7 @@ if [ $# == 1 ]; then
- mv src/exv_conf.h.keep src/exv_conf.h
- fi
- mkdir -p src/bin/
-- cp -f "${CMAKE_BINARY_DIR}/bin/taglist" src/bin/
-+ cp -f "${CMAKE_BINARY_DIR}/samples/taglist" src/bin/
- make doc
- fi
-
diff --git a/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch b/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch
deleted file mode 100644
index 686b37ff8b60..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/CMakeLists.txt 2017-06-07 00:14:25.374608170 +0200
-+++ b/CMakeLists.txt 2017-06-07 00:17:00.680483299 +0200
-@@ -60,6 +60,7 @@
- OPTION( EXIV2_ENABLE_SSH "USE Libssh for SshIo" ON )
- SET ( EXIV2_ENABLE_DYNAMIC_RUNTIME OFF )
- ENDIF()
-+OPTION( EXIV2_ENABLE_TOOLS "Build exiv2 executable" ON )
-
- # set include path for FindXXX.cmake files
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/")
---- a/src/CMakeLists.txt 2017-06-07 00:14:25.368608098 +0200
-+++ b/src/CMakeLists.txt 2017-06-07 00:16:06.710831682 +0200
-@@ -317,10 +317,12 @@
-
- # ******************************************************************************
- # exiv2 application
--ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} )
-+IF(EXIV2_ENABLE_TOOLS)
-+ ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} )
- target_compile_definitions(exiv2 PRIVATE EXV_LOCALEDIR="${CMAKE_INSTALL_LOCALEDIR}" )
--TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} )
--INSTALL( TARGETS exiv2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} )
-+ INSTALL( TARGETS exiv2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-+ENDIF( EXIV2_ENABLE_TOOLS )
-
- # ******************************************************************************
- # connection test application