From 765f6d6c31d1512c72885f518fe7b0d9b2115098 Mon Sep 17 00:00:00 2001 From: ink Date: Tue, 1 Oct 2019 07:41:50 +0300 Subject: [PATCH] this commit marks the release point of version 1.4.0 --- CMakeLists.txt | 26 +++++++++++++------------- rpm/BUILD_INSTRUCTIONS | 6 +++--- rpm/sirikali.spec | 2 +- src/sirikali.appdata.xml | 1 + src/win.cpp | 1 + 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b414aba..c76badb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,18 @@ set_property( GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS ON ) project( sirikali ) -set( PGR_VERSION "1.3.9" ) +set( PGR_VERSION "1.4.0" ) + +file( WRITE ${PROJECT_BINARY_DIR}/version.h " +#ifndef THIS_VERSION +#define THIS_VERSION \"${PGR_VERSION}\" +#endif +\n +#ifndef SIRIKALI_VERSION +#define SIRIKALI_VERSION +#define VERSION_STRING \"Version : ${PGR_VERSION} (Compiled with Qt ${Qt5Core_VERSION})\\nCopyright: 2016-2019 Francis Banyikwa,mhogomchungu@gmail.com\\nLicense : GPLv2+\" +#endif +\n" ) add_definitions( -Wextra -Wall -pedantic ) @@ -125,17 +136,6 @@ message( STATUS "Found Qt5Widgets, version ${Qt5Widgets_VERSION}" ) message( STATUS "Found Qt5Core, version ${Qt5Core_VERSION}" ) message( STATUS "Found Qt5Network, version ${Qt5Network_VERSION}" ) -file( WRITE ${PROJECT_BINARY_DIR}/version.h " -#ifndef THIS_VERSION -#define THIS_VERSION \"${PGR_VERSION}\" -#endif -\n -#ifndef SIRIKALI_VERSION -#define SIRIKALI_VERSION -#define VERSION_STRING \"Version : ${PGR_VERSION} (Compiled with Qt ${Qt5Core_VERSION})\\nCopyright: 2016-2019 Francis Banyikwa,mhogomchungu@gmail.com\\nLicense : GPLv2+\" -#endif -\n" ) - pkg_check_modules( MCHUNGU_NETWORK mhogomchungu_network ) pkg_check_modules( MCHUNGU_TASK mhogomchungu_task ) @@ -463,7 +463,7 @@ NoDisplay=false StartupNotify=true Terminal=false Type=Application -MimeType=inode/directory:1; +MimeType=inode/directory; Categories=Security;Utility;Qt;X-MandrivaLinux-System-FileTools;\n") install( FILES ${PROJECT_BINARY_DIR}/io.github.mhogomchungu.sirikali.desktop diff --git a/rpm/BUILD_INSTRUCTIONS b/rpm/BUILD_INSTRUCTIONS index b1165753..ee0de632 100644 --- a/rpm/BUILD_INSTRUCTIONS +++ b/rpm/BUILD_INSTRUCTIONS @@ -1,6 +1,6 @@ ps: copy and paste all given commands to make sure you dont mistype them. -ps: at step 5,replace "1.3.9" to SiriKali version you are building. +ps: at step 5,replace "1.4.0" to SiriKali version you are building. ps: these instructions assumes rpm build directory is at "~/rpmbuild". Modify the paths in step 5 if they are different in your distribution. @@ -32,8 +32,8 @@ ps: these instructions assumes rpm build directory is at "~/rpmbuild". **************************************************************************************************************** rpmdev-setuptree - tar -cf ~/rpmbuild/SOURCES/SiriKali-1.3.9.tar ../SiriKali-1.3.9 - xz -z ~/rpmbuild/SOURCES/SiriKali-1.3.9.tar + tar -cf ~/rpmbuild/SOURCES/SiriKali-1.4.0.tar ../SiriKali-1.4.0 + xz -z ~/rpmbuild/SOURCES/SiriKali-1.4.0.tar **************************************************************************************************************** diff --git a/rpm/sirikali.spec b/rpm/sirikali.spec index 6b331421..2848a1a0 100644 --- a/rpm/sirikali.spec +++ b/rpm/sirikali.spec @@ -17,7 +17,7 @@ # along with this program. If not, see . Name: SiriKali -Version: 1.3.9 +Version: 1.4.0 Release: 0 Summary: SiriKali is a Qt/C++ GUI front end to encfs,cryfs,gocryptfs,ecryptfs and securefs. License: GPL-2.0+ diff --git a/src/sirikali.appdata.xml b/src/sirikali.appdata.xml index 072ef9e5..883de4d2 100644 --- a/src/sirikali.appdata.xml +++ b/src/sirikali.appdata.xml @@ -34,6 +34,7 @@ + diff --git a/src/win.cpp b/src/win.cpp index f244b016..12eeff4f 100644 --- a/src/win.cpp +++ b/src/win.cpp @@ -35,6 +35,7 @@ static const char * _backEndTimedOut = "SiriKali::Windows::BackendTimedOut" ; #ifdef Q_OS_WIN #include + class regOpenKey{ public: regOpenKey( const char * subKey,HKEY hkey = HKEY_LOCAL_MACHINE )