Sophie

Sophie

distrib > Mageia > 6 > armv7hl > media > core-updates-src > by-pkgid > c5e60b5ea944c639550e89727e4d4c54 > files > 7

qdigidoc4-4.2.0-2.mga6.src.rpm

diff -uNr qdigidoc4-4.1.0/client/CMakeLists.txt qdigidoc4-4.1.0p/client/CMakeLists.txt
--- qdigidoc4-4.1.0/client/CMakeLists.txt	2018-11-15 12:25:35.000000000 +0200
+++ qdigidoc4-4.1.0p/client/CMakeLists.txt	2018-11-15 20:32:28.033454536 +0200
@@ -1,19 +1,19 @@
 set_app_name( PROGNAME qdigidoc4 )
 
-add_executable( TSLDownload TSLDownload.cpp )
-target_link_libraries( TSLDownload Qt5::Network )
-add_custom_command(
-	OUTPUT TSL.qrc
-	DEPENDS TSLDownload
-	COMMAND $<TARGET_FILE:TSLDownload> "${CMAKE_CURRENT_BINARY_DIR}" ${TSL_URL} ${TSL_INCLUDE}
-	WORKING_DIRECTORY ${_qt5Core_install_prefix}/bin
-)
+#add_executable( TSLDownload TSLDownload.cpp )
+#target_link_libraries( TSLDownload Qt5::Network )
+#add_custom_command(
+#	OUTPUT TSL.qrc
+#	DEPENDS TSLDownload
+#	COMMAND $<TARGET_FILE:TSLDownload> "${CMAKE_CURRENT_BINARY_DIR}" ${TSL_URL} ${TSL_INCLUDE}
+#	WORKING_DIRECTORY ${_qt5Core_install_prefix}/bin
+#)
 
 include_directories( ${CMAKE_SOURCE_DIR} )
 
 configure_file( translations/tr.qrc tr.qrc COPYONLY )
 qt5_add_translation( SOURCES translations/en.ts translations/et.ts translations/ru.ts )
-qt5_add_resources( SOURCES images/images.qrc fonts/fonts.qrc ${CMAKE_CURRENT_BINARY_DIR}/tr.qrc ${CMAKE_CURRENT_BINARY_DIR}/TSL.qrc )
+qt5_add_resources( SOURCES images/images.qrc fonts/fonts.qrc ${CMAKE_CURRENT_BINARY_DIR}/tr.qrc TSL.qrc )
 qt5_wrap_ui( SOURCES MainWindow.ui dialogs/AddRecipients.ui dialogs/CertificateHistory.ui dialogs/CertificateDetails.ui dialogs/FirstRun.ui dialogs/KeyDialog.ui dialogs/MobileDialog.ui dialogs/MobileProgress.ui 
 	dialogs/PinPopup.ui dialogs/PinUnblock.ui dialogs/RoleAddressDialog.ui dialogs/SettingsDialog.ui dialogs/SignatureDialog.ui dialogs/Updater.ui dialogs/WaitDialog.ui dialogs/WarningDialog.ui
 	widgets/Accordion.ui widgets/AccordionTitle.ui widgets/AddressItem.ui widgets/CardWidget.ui widgets/ContainerPage.ui widgets/FileItem.ui 
diff -uNr qdigidoc4-4.1.0/common/CMakeLists.txt qdigidoc4-4.1.0p/common/CMakeLists.txt
--- qdigidoc4-4.1.0/common/CMakeLists.txt	2018-11-15 12:28:57.000000000 +0200
+++ qdigidoc4-4.1.0p/common/CMakeLists.txt	2018-11-15 20:34:04.149857208 +0200
@@ -11,13 +11,13 @@
 	endif()
 	add_definitions( -DCONFIG_URL="${CONFIG_URL}" )
 	list( APPEND SOURCES Configuration.cpp )
-	file( DOWNLOAD ${CONFIG_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.json )
-	string( REPLACE ".json" ".rsa" RSA_URL ${CONFIG_URL} )
-	file( DOWNLOAD ${RSA_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.rsa )
-	string( REPLACE ".json" ".pub" PUB_URL ${CONFIG_URL} )
-	file( DOWNLOAD ${PUB_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.pub )
-	configure_file( config.qrc config.qrc COPYONLY )
-	qt5_add_resources( SOURCES ${CMAKE_CURRENT_BINARY_DIR}/config.qrc )
+	#file( DOWNLOAD ${CONFIG_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.json )
+	#string( REPLACE ".json" ".rsa" RSA_URL ${CONFIG_URL} )
+	#file( DOWNLOAD ${RSA_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.rsa )
+	#string( REPLACE ".json" ".pub" PUB_URL ${CONFIG_URL} )
+	#file( DOWNLOAD ${PUB_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.pub )
+	#configure_file( config.qrc config.qrc COPYONLY )
+	qt5_add_resources( SOURCES config.qrc )
 endif()
 
 configure_file( translations/common_tr.qrc common_tr.qrc COPYONLY )