Update Xalan-C 1.12 (#976)

IB-6609 Signed-off-by: Raul Metsma <raul@metsma.ee>
open-eid · Sep 27, 2021 · 5971e54 · 5971e54
1 parent 1f848cf
commit 5971e54
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -142,7 +142,7 @@ target_compile_definitions(${PROGNAME} PRIVATE MOBILEID_URL="${MOBILEID_URL}" SM
 if( APPLE )
 	target_sources( ${PROGNAME} PRIVATE Application_mac.mm MacMenuBar.cpp dialogs/CertificateDetails_mac.mm Diagnostics_unix.cpp)
 	set_source_files_properties( Application_mac.mm dialogs/CertificateDetails_mac.mm PROPERTIES COMPILE_FLAGS "-fobjc-arc" )
-    set_source_files_properties( LdapSearch.cpp PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" )
+	set_source_files_properties( LdapSearch.cpp PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" )
 	target_link_libraries( ${PROGNAME} "-framework Security" "-framework Quartz" "-framework Cocoa" "-fobjc-arc")
 	add_custom_command( TARGET ${PROGNAME} POST_BUILD
 		COMMAND cp -a ${PKCS11_MODULE} $<TARGET_FILE_DIR:${PROGNAME}>
@@ -246,8 +246,8 @@ elseif(WIN32)
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libssl-1_1${OPENSSL_SUFFIX}.dll appx
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/zlib1.dll appx
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/xerces-c_3_2.dll appx
-		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/XalanMessages_1_11.dll appx
-		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/Xalan-C_1_11.dll appx
+		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/XalanMessages_1_12.dll appx
+		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/Xalan-C_1_12.dll appx
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/xsec_2_0.dll appx
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/digidocpp.dll appx
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/digidocpp.conf appx

diff --git a/qdigidoc4.wxs b/qdigidoc4.wxs
@@ -130,8 +130,8 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
           <Component Id="Base" Guid="6976e89e-e815-444a-9b1f-5ee63cfe230d">
             <File Source="$(var.libs_path)\zlib1.dll"/>
             <File Source="$(var.libs_path)\xerces-c_3_2.dll"/>
-            <File Source="$(var.libs_path)\XalanMessages_1_11.dll"/>
-            <File Source="$(var.libs_path)\Xalan-C_1_11.dll"/>
+            <File Source="$(var.libs_path)\XalanMessages_1_12.dll"/>
+            <File Source="$(var.libs_path)\Xalan-C_1_12.dll"/>
             <File Source="$(var.libs_path)\xsec_2_0.dll"/>
             <File Source="$(var.libs_path)\digidocpp.dll"/>
             <File Source="$(var.libs_path)\digidoc-tool.exe"/>