Fixed port of quirc - patch did no longer apply / modified to fix bui…

…ld (#15252) * Fixed port of quirc - patch did no longer apply / modified to fix build * Updated quirc to the latest version + removed obsolete patch-for-msvc.patch * update baseline * [quirc] Fix license file name Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
microsoft · Dec 29, 2020 · 3ddbba7 · 3ddbba7
1 parent ba1c3aa
commit 3ddbba7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 52 deletions.
diff --git a/ports/quirc/CONTROL b/ports/quirc/CONTROL
@@ -1,3 +1,4 @@
 Source: quirc
-Version: 1.1
+Version: 1.1
+Port-Version: 1
 Description: quirc is one of the C library available for scanning QR Codes
diff --git a/ports/quirc/patch-for-msvc.patch b/ports/quirc/patch-for-msvc.patch
diff --git a/ports/quirc/portfile.cmake b/ports/quirc/portfile.cmake
@@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO dlbeer/quirc
-    REF 2e8c4ce7bc45fbe137e50e338c297e265777e7dd # v1.1
-    SHA512 83eeab7c70c93477f9a7a2d3114e080ce831d27e035bb47c3fc114d5ede8852599c37af591af348dde1a870f65f8a860284e4a3e1e05585cb7948556b464f59c
+    REF 7e7ab596e4d0988faf1c12ae89c354b114181c40
+    SHA512 d10a783a33ffcc168a287b03250c5ac00b942ec724da641b13fe2ef3f456453b143146422b7e18129a75ce00f13d2d9e3097ac4620134d832de8be4adbbc61c2
     HEAD_REF master
-    PATCHES
-        patch-for-msvc.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@@ -18,10 +16,9 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
+
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-# Handle copyright
-file(COPY ${SOURCE_PATH}/license DESTINATION ${CURRENT_PACKAGES_DIR}/share/quirc)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/quirc/license ${CURRENT_PACKAGES_DIR}/share/quirc/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/quirc/copyright)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -1231,14 +1231,6 @@ quickfix:x64-uwp=fail
 quickfix:x64-windows-static=fail
 quickfix:x64-windows=fail
 quickfix:x86-windows=fail
-quirc:arm64-windows      = skip
-quirc:arm-uwp            = skip
-quirc:x64-linux          = skip
-quirc:x64-osx            = skip
-quirc:x64-uwp            = skip
-quirc:x64-windows        = skip
-quirc:x64-windows-static = skip
-quirc:x86-windows        = skip
 qwt:x64-osx=fail
 rabit:x64-osx=fail
 ragel:arm-uwp=fail