Upgrades for 2018.06.12

4 files changed, 32 insertions, 45 deletions

diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL
index 085efe481..30bcd9692 100644
--- a/ports/exiv2/CONTROL
+++ b/ports/exiv2/CONTROL
@@ -1,4 +1,4 @@
 Source: exiv2
-Version: 2018-05-17
+Version: 2018-06-12
 Build-Depends: zlib, expat, libiconv
 Description: Image metadata library and tools http://www.exiv2.org
diff --git a/ports/exiv2/iconv.patch b/ports/exiv2/iconv.patch
new file mode 100644
index 000000000..27bedd314
--- /dev/null
+++ b/ports/exiv2/iconv.patch
@@ -0,0 +1,28 @@
+diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake

+index e220e2f..992b887 100644

+--- a/cmake/findDependencies.cmake

++++ b/cmake/findDependencies.cmake

+@@ -50,7 +50,7 @@ if( EXIV2_ENABLE_NLS )

+     # the manual check in cmake/generateConfigFile.cmake

+ endif( )

+ 

+-find_package(Iconv)

++find_package(unofficial-iconv CONFIG REQUIRED)

+ if( ICONV_FOUND )

+     message ( "-- ICONV_INCLUDE_DIR : " ${Iconv_INCLUDE_DIR} )

+     message ( "-- ICONV_LIBRARIES : " ${Iconv_LIBRARY} )

+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt

+index 91469b6..4c51068 100644

+--- a/src/CMakeLists.txt

++++ b/src/CMakeLists.txt

+@@ -274,8 +274,8 @@ if( EXIV2_ENABLE_NLS )

+     target_link_libraries( exiv2lib PRIVATE  ${LIBINTL_LIBRARIES} )

+ endif()

+ 

+-if( ICONV_FOUND )

+-    target_link_libraries( exiv2lib PRIVATE Iconv::Iconv )

++if( ICONV_FOUND OR 1 )

++    target_link_libraries( exiv2lib PRIVATE unofficial::iconv::libiconv )

+ endif()

+ 

+ 

diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake
index c4c3173d2..ac6cbf738 100644
--- a/ports/exiv2/portfile.cmake
+++ b/ports/exiv2/portfile.cmake
@@ -3,14 +3,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Exiv2/exiv2
-    REF 4b24e011dc485102a68a8809621e718fc77830a2
-    SHA512 acd192c585a074fae3308cce9355e735165142dc19c4a1ab6040fe4e686aa199f30d664eb2b450fe297c9ce0b027952bf784e8aea18c893d80b28e331bf48839
+    REF 341de4500ab993103c215bfb07d43d4a08654ac4
+    SHA512 b03102a8349050239ae558bbad7ffffb60c555dc9d81cb6c43f0ace5b8cc3a725b75816122f29406678696ca2a280da4d883c7b76fb751bdb0eafd343dda8fcc
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH "${SOURCE_PATH}"
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-iconv.patch"
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/iconv.patch"
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/exiv2/use-iconv.patch b/ports/exiv2/use-iconv.patch
deleted file mode 100644
index 4305ec550..000000000
--- a/ports/exiv2/use-iconv.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/config/FindIconv.cmake b/config/FindIconv.cmake
-index 15a0e39..53718bf 100644
---- a/config/FindIconv.cmake
-+++ b/config/FindIconv.cmake
-@@ -36,12 +36,13 @@ if(NOT ICONV_INCLUDE_DIR STREQUAL "ICONV_INCLUDE_DIR-NOTFOUND")
- endif()
- 
- if(NOT ICONV_IN_GLIBC)
--    find_library(ICONV_LIBRARY NAMES iconv)
-+    find_library(ICONV_LIBRARY NAMES iconv libiconv)
-     set(ICONV_TEST ${ICONV_LIBRARY})
- else()
-     set(ICONV_TEST "In glibc")
- endif()
- 
-+set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
- set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
- check_cxx_source_compiles(
-     "#include <iconv.h>
-@@ -59,7 +60,8 @@ else(ICONV_FOUND)
-   set(ICONV_LIBRARIES)
- endif(ICONV_FOUND)
- 
--if(ICONV_FOUND)  
-+if(ICONV_FOUND)
-+    set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
-     set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
-     check_cxx_source_compiles(
-         "#include <iconv.h>
-@@ -69,6 +71,7 @@ if(ICONV_FOUND)
-          }"
-         ICONV_ACCEPTS_NONCONST_INPUT)
- 
-+    set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
-     set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
-     check_cxx_source_compiles(
-         "#include <iconv.h>