Fix compilation by taking libzip version into account

pblottiere · pblottiere · commit 2d660a1e253d · 2017-07-31T11:09:14.000+01:00
diff --git a/src/core/qgsziputils.cpp b/src/core/qgsziputils.cpp
@@ -141,7 +141,12 @@ bool QgsZipUtils::zip( const QString &zipFilename, const QStringList &files )
       zip_source *src = zip_source_file( z, file.toStdString().c_str(), 0, 0 );
       if ( src != NULL )
       {
-        if ( zip_file_add( z, fileInfo.fileName().toStdString().c_str(), src, 0 ) == -1 )
+#if LIBZIP_VERSION_MAJOR < 1
+        int rc = ( int ) zip_add( z, fileInfo.fileName().toStdString().c_str(), src );
+#else
+        int rc = ( int ) zip_file_add( z, fileInfo.fileName().toStdString().c_str(), src, 0 );
+#endif
+        if ( rc == -1 )
         {
           QString err = QObject::tr( "Error adding file: '%1'" ).arg( zip_strerror( z ) );
           QgsMessageLog::logMessage( err, QStringLiteral( "QgsZipUtils" ) );

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,12 @@ bool QgsZipUtils::zip( const QString &zipFilename, const QStringList &files )`
`141`	`141`	`zip_source *src = zip_source_file( z, file.toStdString().c_str(), 0, 0 );`
`142`	`142`	`if ( src != NULL )`
`143`	`143`	`{`
`144`		`- if ( zip_file_add( z, fileInfo.fileName().toStdString().c_str(), src, 0 ) == -1 )`
	`144`	`+#if LIBZIP_VERSION_MAJOR < 1`
	`145`	`+ int rc = ( int ) zip_add( z, fileInfo.fileName().toStdString().c_str(), src );`
	`146`	`+#else`
	`147`	`+ int rc = ( int ) zip_file_add( z, fileInfo.fileName().toStdString().c_str(), src, 0 );`
	`148`	`+#endif`
	`149`	`+ if ( rc == -1 )`
`145`	`150`	`{`
`146`	`151`	`QString err = QObject::tr( "Error adding file: '%1'" ).arg( zip_strerror( z ) );`
`147`	`152`	`QgsMessageLog::logMessage( err, QStringLiteral( "QgsZipUtils" ) );`