media-gfx/exiv2: remove unused patch(es)
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>
Sun, 4 Aug 2019 10:13:32 +0000 (12:13 +0200)
committerAndreas Sturmlechner <asturm@gentoo.org>
Sun, 4 Aug 2019 18:38:49 +0000 (20:38 +0200)
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12615
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
media-gfx/exiv2/files/exiv2-0.27.0-doc.patch [deleted file]
media-gfx/exiv2/files/exiv2-0.27.0-fix-pkgconfig.patch [deleted file]
media-gfx/exiv2/files/exiv2-0.27.0-png-broken-icc-profile.patch [deleted file]

diff --git a/media-gfx/exiv2/files/exiv2-0.27.0-doc.patch b/media-gfx/exiv2/files/exiv2-0.27.0-doc.patch
deleted file mode 100644 (file)
index a57da03..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From f8f63a8b4033549d47384c6e2b1972ae1a2775fc Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Wed, 2 Jan 2019 10:28:57 +0100
-Subject: [PATCH] cmake: Use correct installation dir for generated docs
-
-Fixes #623
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
----
- cmake/generateDoc.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/generateDoc.cmake b/cmake/generateDoc.cmake
-index a3aea727..16823946 100644
---- a/cmake/generateDoc.cmake
-+++ b/cmake/generateDoc.cmake
-@@ -21,7 +21,7 @@ macro(generate_documentation DOX_CONFIG_FILE)
-     set(DOXY_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/doxy.config")
-     add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG})
--    install(DIRECTORY "${PROJECT_BINARY_DIR}/doc/html/" DESTINATION "share/doc/lib${PROJECT_NAME}")
-+    install(DIRECTORY "${PROJECT_BINARY_DIR}/doc/html/" DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
- endmacro()
--- 
-2.20.1
-
diff --git a/media-gfx/exiv2/files/exiv2-0.27.0-fix-pkgconfig.patch b/media-gfx/exiv2/files/exiv2-0.27.0-fix-pkgconfig.patch
deleted file mode 100644 (file)
index 5fc430e..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-From e706cca19027dbdf53aeac2041ecce9ccb313c17 Mon Sep 17 00:00:00 2001
-From: Luis Diaz Mas <piponazo@gmail.com>
-Date: Sat, 12 Jan 2019 13:39:12 +0100
-Subject: [PATCH] Fixes in .pc file for being compatible with more
- distributions
-
----
- cmake/exiv2.pc.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/exiv2.pc.in b/cmake/exiv2.pc.in
-index e477696d5..9018472be 100644
---- a/cmake/exiv2.pc.in
-+++ b/cmake/exiv2.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/lib
--includedir=${prefix}/include
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
- Name: exiv2
- Description: @PROJECT_DESCRIPTION@
diff --git a/media-gfx/exiv2/files/exiv2-0.27.0-png-broken-icc-profile.patch b/media-gfx/exiv2/files/exiv2-0.27.0-png-broken-icc-profile.patch
deleted file mode 100644 (file)
index ae0a0ee..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/pngimage.cpp b/src/pngimage.cpp
-index 90844d09..b5b0cd24 100644
---- a/src/pngimage.cpp
-+++ b/src/pngimage.cpp
-@@ -501,7 +501,20 @@ namespace Exiv2 {
-                 }
-                 else if (!memcmp(cheaderBuf.pData_ + 4, "iCCP", 4))
-                 {
--                    zlibToDataBuf(cdataBuf.pData_ +12+1,dataOffset-13,iccProfile_); // +1 = 'compressed' flag
-+                    // The ICC profile name can vary from 1-79 characters.
-+                    uint32_t iccOffset = 0;
-+                    while (iccOffset < 80 && iccOffset < dataOffset) {
-+
-+                        const byte* profileName = cdataBuf.pData_ + iccOffset;
-+                        ++iccOffset;
-+
-+                        if (*profileName == 0x00)
-+                            break;
-+                    }
-+
-+                    ++iccOffset; // +1 = 'compressed' flag
-+
-+                    zlibToDataBuf(cdataBuf.pData_ +iccOffset,dataOffset-iccOffset,iccProfile_);
- #ifdef DEBUG
-                     std::cout << "Exiv2::PngImage::readMetadata: Found iCCP chunk length: " << dataOffset  << std::endl;
-                     std::cout << "Exiv2::PngImage::readMetadata: iccProfile.size_ : " << iccProfile_.size_ << std::endl;
-@@ -662,6 +675,7 @@ namespace Exiv2 {
-                         // calculate CRC
-                         uLong   tmp = crc32(0L, Z_NULL, 0);
-+                        tmp         = crc32(tmp, (const Bytef*)type             ,typeLen);
-                         tmp         = crc32(tmp, (const Bytef*)header           ,headerLen);
-                         tmp         = crc32(tmp, (const Bytef*)compressed.pData_,compressed.size_);
-                         byte    crc[4];