try to fix a hang on osx when invoking internal wallet

mhogomchungu · Jul 5, 2017 · edd5c6d · edd5c6d
1 parent f1d0f9a
commit edd5c6d
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -78,6 +78,19 @@ if( NOT DEFINED QT5 )
 	set( QT5 "true" )
 endif()
 
+if( APPLE )
+	set( QT5 "true" )
+endif()
+
+find_file( JSON_HEADER_PATH "nlohmann/json.hpp" )
+
+if( NOT JSON_HEADER_PATH )
+	set( JSON_HEADER_PATH "${PROJECT_SOURCE_DIR}/src/3rdParty/json/nlohmann/json.hpp" )
+endif()
+
+file( WRITE ${PROJECT_BINARY_DIR}/json.h "\n#include \"${JSON_HEADER_PATH}\"" )
+MESSAGE( STATUS "found json.hpp header file at: ${JSON_HEADER_PATH}" )
+
 find_file( GCRYPT_INCLUDE_FILE gcrypt.h )
 find_path( GCRYPT_INCLUDE_PATH gcrypt.h )
 
@@ -88,15 +101,15 @@ find_library( GCRYPT_LIBRARY gcrypt )
 if( NOT GCRYPT_INCLUDE_FILE )
 	MESSAGE( FATAL_ERROR "could not find gcrypt header file" )
 else()
-	MESSAGE( STATUS "found gcrypt header file: ${GCRYPT_INCLUDE_FILE}" )
+	MESSAGE( STATUS "found gcrypt header file at: ${GCRYPT_INCLUDE_FILE}" )
 endif()
 
 if( NOT GCRYPT_LIBRARY )
-	MESSAGE( FATAL_ERROR "could not find gcrypt library(libgcrypt.so)" )
+	MESSAGE( FATAL_ERROR "could not find gcrypt library" )
 else()
 	get_filename_component( GCRYPT_LIBRARY_PATH ${GCRYPT_LIBRARY} DIRECTORY )
 
-	MESSAGE( STATUS "found gcrypt library: ${GCRYPT_LIBRARY}" )
+	MESSAGE( STATUS "found gcrypt library at: ${GCRYPT_LIBRARY}" )
 	MESSAGE( STATUS "adding library search path of: ${GCRYPT_LIBRARY_PATH}" )
 
 endif()

diff --git a/changelog b/changelog
@@ -94,3 +94,7 @@ version 1.2.8
 -- Better mount/unmount events monitoring on OSX.
 -- Set it as a run time option(off by default) to support ecryptfs-simple backend that does not have suid bit set. A user
    will be asked to allow polkit support on first attempt.
+
+version 1.2.9
+-- Fix a crash on exit in OSX.
+-- Show all crypto options when creating Cryfs volume.
diff --git a/debian.upstream/BUILD_INSTRUCTIONS b/debian.upstream/BUILD_INSTRUCTIONS
@@ -34,7 +34,7 @@ HOW TO BUILD A SiriKali PACKAGE ON UBUNTU OR ANY OTHER DEBIAN BASED DISTRIBUTION
 
    ******************************************************************************************************
 
-   tar cf - . | xz -zf - > ../sirikali_1.2.8.orig.tar.xz
+   tar cf - . | xz -zf - > ../sirikali_1.2.9.orig.tar.xz
 
    ******************************************************************************************************
 

diff --git a/debian.upstream/changelog b/debian.upstream/changelog
@@ -1,3 +1,11 @@
+sirikali (1.2.9-1) UNRELEASED; urgency=low
+  [Mhogo Mchungu]
+  * New Features
+     -- Fix a crash on exit in OSX.
+     -- Show all crypto options when creating Cryfs volume.
+
+ -- Mhogo Mchungu <[email protected]>  Thu, 29 Jun 2017 16:38:48 +0000
+
 sirikali (1.2.8-1) UNRELEASED; urgency=low
   [Mhogo Mchungu]
   * New Features

diff --git 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.2.8" to SiriKali version you are building.
+ps: at step 5,replace "1.2.9" 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.2.8.tar ../SiriKali-1.2.8
-   xz    -z  ~/rpmbuild/SOURCES/SiriKali-1.2.8.tar
+   tar   -cf  ~/rpmbuild/SOURCES/SiriKali-1.2.9.tar ../SiriKali-1.2.9
+   xz    -z  ~/rpmbuild/SOURCES/SiriKali-1.2.9.tar
 
    ****************************************************************************************************************
 

diff --git a/rpm/sirikali.spec b/rpm/sirikali.spec
@@ -17,7 +17,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 Name:           SiriKali
-Version:        1.2.8
+Version:        1.2.9
 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/3rdParty/json/json.hpp → src/3rdParty/json/nlohmann/json.hpp b/src/3rdParty/json/json.hpp → src/3rdParty/json/nlohmann/json.hpp
diff --git a/src/3rdParty/lxqt_wallet/frontend/changepassworddialog.cpp b/src/3rdParty/lxqt_wallet/frontend/changepassworddialog.cpp
@@ -43,7 +43,8 @@ LXQt::Wallet::changePassWordDialog::changePassWordDialog( QWidget * parent,const
 
 	this->setFixedSize( this->size() ) ;
 
-	this->setWindowFlags( this->windowFlags() | Qt::WindowStaysOnTopHint ) ;
+	//this->setWindowFlags( this->windowFlags() | Qt::WindowStaysOnTopHint ) ;
+	this->setWindowFlags( this->windowFlags() ) ;
 
 	if( parent ){
 

diff --git a/src/3rdParty/lxqt_wallet/frontend/password_dialog.cpp b/src/3rdParty/lxqt_wallet/frontend/password_dialog.cpp
@@ -43,7 +43,8 @@ LXQt::Wallet::password_dialog::password_dialog( QWidget * parent,
 
 	this->setFixedSize( this->size() ) ;
 
-	this->setWindowFlags( this->windowFlags() | Qt::WindowStaysOnTopHint ) ;
+	//this->setWindowFlags( this->windowFlags() | Qt::WindowStaysOnTopHint ) ;
+	this->setWindowFlags( this->windowFlags() ) ;
 
 	if( parent ){
 

diff --git a/src/checkforupdates.cpp b/src/checkforupdates.cpp
@@ -30,7 +30,7 @@
 #include "siritask.h"
 #include "version.h"
 
-#include "3rdParty/json/json.hpp"
+#include "json.h"
 
 static QString _tr( const QStringList& l )
 {

diff --git a/src/mountinfo.cpp b/src/mountinfo.cpp
@@ -23,9 +23,9 @@
 
 #include <QMetaObject>
 
-mountinfo::mountinfo( QObject * parent,bool e,std::function< void() >&& stop ) :
+mountinfo::mountinfo( QObject * parent,bool e,std::function< void() >&& quit ) :
 	m_parent( parent ),
-	m_quit( std::move( stop ) ),
+	m_quit( std::move( quit ) ),
 	m_announceEvents( e ),
 	m_linux( utility::platformIsLinux() )
 {

diff --git a/src/sirikali.cpp b/src/sirikali.cpp
@@ -59,7 +59,7 @@
 #include "walletconfig.h"
 #include "plugins.h"
 
-#include "3rdParty/json/json.hpp"
+#include "json.h"
 
 sirikali::sirikali() :
 	m_secrets( this ),

diff --git a/src/siripolkit/zulupolkit.cpp b/src/siripolkit/zulupolkit.cpp
@@ -22,7 +22,7 @@
 #include "siriPolkit.h"
 #include "../task.h"
 #include "../utility2.h"
-#include "../3rdParty/json/json.hpp"
+#include "json.h"
 
 #include <termios.h>
 #include <memory>

diff --git a/src/utility.cpp b/src/utility.cpp
@@ -62,9 +62,8 @@
 #include "utility2.h"
 #include "install_prefix.h"
 #include "locale_path.h"
-#include "3rdParty/json/json.hpp"
 #include "plugins.h"
-
+#include "json.h"
 #include "readonlywarning.h"
 
 #include <sys/types.h>

diff --git a/src/utility.h b/src/utility.h
@@ -416,7 +416,7 @@ namespace utility
 			return ::Task::run< utility::Task >( [ exe ](){ return utility::Task( exe ) ; } ) ;
 		}
 		static void exec( const QString& exe,
-				  const QProcessEnvironment& env = QProcessEnvironment(),
+				  const QProcessEnvironment& env = utility::systemEnvironment(),
 				  std::function< void() > f = [](){} )
 		{
 			::Task::run< utility::Task >( [ = ](){ return utility::Task( exe,env,f ) ; } ).start() ;