Merge 8db859d into 8bf7a1e

opencor · Jun 4, 2020 · be3c4e2 · be3c4e2
2 parents 8bf7a1e + 8db859d
commit be3c4e2
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 25 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -40,7 +40,7 @@ var jsonData = { "versions": [
                        { "change": "<strong>Python support:</strong> make it possible to retrieve the type of a <code>DataStoreVariable</code> object (see issue <a href=\"https://github.com/opencor/opencor/issues/2336\">#2336</a>)." },
                        { "change": "<strong>CellML Annotation view:</strong> use the new <a href=\"https://identifiers.org/\">identifiers.org</a> platform (see issue <a href=\"https://github.com/opencor/opencor/issues/2190\">#2190</a>)." },
                        { "change": "<strong>Simulation Experiment view:</strong> fixed a couple of GUI glitches (see issue <a href=\"https://github.com/opencor/opencor/issues/2332\">#2332</a>)." },
-                       { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://riverbankcomputing.com/software/qscintilla/intro\">QScintilla</a> to version 2.11.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/2307\">#2307</a>). Upgraded <a href=\"https://llvm.org/\">LLVM</a>+<a href=\"https://clang.llvm.org/\">Clang</a> to version 10.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2314\">#2314</a>). Upgraded the <a href=\"https://openssl.org/\">OpenSSL</a> library to version 1.1.1g (see issue <a href=\"https://github.com/opencor/opencor/issues/2326\">#2326</a>). Upgraded <a href=\"https://jquery.com/\">jQuery</a> to version 3.5.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/2338\">#2338</a>). Upgraded <a href=\"https://mesa3d.org/\">Mesa</a> to version 20.0.7 (see issue <a href=\"https://github.com/opencor/opencor/issues/2342\">#2342</a>). Upgraded the <a href=\"https://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 5.3.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2344\">#2344</a>). Upgraded <a href=\"https://libgit2.github.com/\">libgit2</a> to version 0.28.5 (see issue <a href=\"https://github.com/opencor/opencor/issues/2346\">#2346</a>)." }
+                       { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://riverbankcomputing.com/software/qscintilla/intro\">QScintilla</a> to version 2.11.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/2307\">#2307</a>). Upgraded <a href=\"https://llvm.org/\">LLVM</a>+<a href=\"https://clang.llvm.org/\">Clang</a> to version 10.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2314\">#2314</a>). Upgraded the <a href=\"https://openssl.org/\">OpenSSL</a> library to version 1.1.1g (see issue <a href=\"https://github.com/opencor/opencor/issues/2326\">#2326</a>). Upgraded <a href=\"https://jquery.com/\">jQuery</a> to version 3.5.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/2338\">#2338</a>). Upgraded <a href=\"https://mesa3d.org/\">Mesa</a> to version 20.0.7 (see issue <a href=\"https://github.com/opencor/opencor/issues/2342\">#2342</a>). Upgraded the <a href=\"https://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 5.3.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2344\">#2344</a>). Upgraded <a href=\"https://libgit2.github.com/\">libgit2</a> to version 1.0.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/2348\">#2348</a>)." }
                      ]
                    },
                    { "major": 0, "minor": 5, "patch": 0, "day": 15, "month": 10, "year": 2016, "type": 0, "license": 1,

diff --git a/src/plugins/support/PMRSupport/src/pmrworkspace.cpp b/src/plugins/support/PMRSupport/src/pmrworkspace.cpp
@@ -48,6 +48,7 @@ along with this program. If not, see <https://gnu.org/licenses>.
     #include "git2/remote.h"
     #include "git2/repository.h"
     #include "git2/signature.h"
+    #include "git2/status.h"
 #include "libgit2end.h"
 
 //==============================================================================
@@ -241,7 +242,7 @@ void PmrWorkspace::clone(const QString &pPath)
 
     setGitAuthorization(&authorizationStrArray);
 
-    git_clone_init_options(&cloneOptions, GIT_CLONE_OPTIONS_VERSION);
+    git_clone_options_init(&cloneOptions, GIT_CLONE_OPTIONS_VERSION);
 
     cloneOptions.fetch_opts.callbacks.certificate_check = certificateCheckCallback;
     cloneOptions.fetch_opts.callbacks.payload = this;
@@ -616,7 +617,7 @@ void PmrWorkspace::refreshStatus()
     if (isOpen()) {
         git_status_options statusOptions;
 
-        git_status_init_options(&statusOptions, GIT_STATUS_OPTIONS_VERSION);
+        git_status_options_init(&statusOptions, GIT_STATUS_OPTIONS_VERSION);
 
         statusOptions.flags =  GIT_STATUS_OPT_INCLUDE_UNTRACKED
                               |GIT_STATUS_OPT_INCLUDE_UNMODIFIED
@@ -994,7 +995,7 @@ StagedFiles PmrWorkspace::stagedFiles()
     if (git_repository_index(&index, mGitRepository) == GIT_OK) {
         git_status_options statusOptions;
 
-        git_status_init_options(&statusOptions, GIT_STATUS_OPTIONS_VERSION);
+        git_status_options_init(&statusOptions, GIT_STATUS_OPTIONS_VERSION);
 
         statusOptions.flags =  GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX
                               |GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY;
@@ -1131,7 +1132,7 @@ int PmrWorkspace::fetchheadForeachCallback(const char *pReferenceName,
 
             git_checkout_options checkoutOptions;
 
-            git_checkout_init_options(&checkoutOptions, GIT_CHECKOUT_OPTIONS_VERSION);
+            git_checkout_options_init(&checkoutOptions, GIT_CHECKOUT_OPTIONS_VERSION);
 
             checkoutOptions.checkout_strategy =  GIT_CHECKOUT_SAFE
                                                 |GIT_CHECKOUT_RECREATE_MISSING
@@ -1212,7 +1213,7 @@ int PmrWorkspace::fetchheadForeachCallback(const char *pReferenceName,
 
                 git_merge_options mergeOptions;
 
-                git_merge_init_options(&mergeOptions, GIT_MERGE_OPTIONS_VERSION);
+                git_merge_options_init(&mergeOptions, GIT_MERGE_OPTIONS_VERSION);
 
                 res = git_merge(gitRepository,
                                 const_cast<const git_annotated_commit **>(&remoteCommitHead),
@@ -1261,7 +1262,7 @@ bool PmrWorkspace::fetch()
     git_strarray authorizationStrArray = { nullptr, 0 };
     git_remote_callbacks remoteCallbacks;
 
-    git_fetch_init_options(&fetchOptions, GIT_FETCH_OPTIONS_VERSION);
+    git_fetch_options_init(&fetchOptions, GIT_FETCH_OPTIONS_VERSION);
 
     setGitAuthorization(&authorizationStrArray);
 
@@ -1364,7 +1365,7 @@ void PmrWorkspace::push()
     git_strarray authorizationStrArray = { nullptr, 0 };
     git_remote_callbacks remoteCallbacks;
 
-    git_push_init_options(&pushOptions, GIT_PUSH_OPTIONS_VERSION);
+    git_push_options_init(&pushOptions, GIT_PUSH_OPTIONS_VERSION);
 
     setGitAuthorization(&authorizationStrArray);
 

diff --git a/src/plugins/thirdParty/libgit2/CMakeLists.txt b/src/plugins/thirdParty/libgit2/CMakeLists.txt
@@ -3,21 +3,21 @@ project(libgit2Plugin)
 # Name and version of our package
 
 set(PACKAGE_NAME libgit2)
-set(PACKAGE_VERSION 0.28.5)
+set(PACKAGE_VERSION 1.0.1)
 
 # Version of our library
 
-set(MAJOR_LIBRARY_VERSION 0)
-set(MINOR_LIBRARY_VERSION 28)
-set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.${MINOR_LIBRARY_VERSION}.5)
+set(MAJOR_LIBRARY_VERSION 1)
+set(MINOR_LIBRARY_VERSION 0)
+set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.${MINOR_LIBRARY_VERSION}.1)
 
 # Git tag for our library
 
-set(GIT_TAG v0.28.5-opencor)
+set(GIT_TAG v1.0.1-opencor)
 
 # Release tag
 
-set(RELEASE_TAG v0.28.5-opencor)
+set(RELEASE_TAG v1.0.1-opencor)
 
 # Specify where our local package will be installed
 
@@ -33,7 +33,7 @@ elseif(APPLE)
     set(SHARED_LIBRARY ${CMAKE_SHARED_LIBRARY_PREFIX}git2.${MINOR_LIBRARY_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
     set(IMPORT_LIBRARY ${SHARED_LIBRARY})
 else()
-    set(SHARED_LIBRARY ${CMAKE_SHARED_LIBRARY_PREFIX}git2${CMAKE_SHARED_LIBRARY_SUFFIX}.${MINOR_LIBRARY_VERSION})
+    set(SHARED_LIBRARY ${CMAKE_SHARED_LIBRARY_PREFIX}git2${CMAKE_SHARED_LIBRARY_SUFFIX}.${MAJOR_LIBRARY_VERSION}.${MINOR_LIBRARY_VERSION})
     set(IMPORT_LIBRARY ${SHARED_LIBRARY})
 endif()
 
@@ -65,31 +65,31 @@ if(USE_PREBUILT_LIBGIT2_PACKAGE)
     if(WIN32)
         if(RELEASE_MODE)
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 712c9ee0817ebb3c48fc02e16964323cdd32aaac
+                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 99b3da1c7048b86e6ad88dc282194fcc1ba6c17b
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 40f2f3f5986eebb1534597c58159a1b2c7e88cad
-                                              f7b4d7ff693beab13bba073221d90c11b4a2e685)
+                                  SHA1_VALUES dfa55ba8cd9494228060c72fd1ce9bbdb7ea197f
+                                              27f5cce4eadae122e4d372eeeb796add8ab93d77)
         else()
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 67ff42e6f60f588a306f89f07b52e7452e72ad24
+                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} b17bee0ba74e4cfc8195b7608fb3fbc168786cc8
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES a51f1484b33f7e3b2841e5822b39f1100eb3adbd
-                                              5b0b056e05ee88db574b613b04139c95c8375776)
+                                  SHA1_VALUES 6e42330135975b4643487de98d46d7c19022b7bf
+                                              f37f2382b856740d1cb42b262de7f77a67d694e2)
         endif()
     elseif(APPLE)
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 36fd4c99f2c33f946c92ed4604aa1b4ce87c5a75
+                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 3b7eded9638921deb79cf7799f071d5ca0013679
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 2ec9118b6f91c9843800cb9892707e7a3c00c9dd)
+                              SHA1_VALUES 2dfe843431d36ceddccbdce314aaed6a64c041ed)
     else()
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} be9dc2de3c9888e59e72212e337cb8bcf59bdea0
+                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} c1289908db4167e867a9e26b90522e544cdf5aa0
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES d2f3c159058738cf335070bd41172ab13567fcdc)
+                              SHA1_VALUES 3a40da4bb45430e3fd34cbb95573c105974e1f59)
     endif()
 else()
     # Ignore some warnings