Merge d6b7883 into adde628

opencor · Oct 29, 2020 · 5f94ac3 · 5f94ac3
2 parents adde628 + d6b7883
commit 5f94ac3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -37,7 +37,7 @@ var jsonData = { "versions": [
                        }
                      ],
                      "changes": [
-                       { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://riverbankcomputing.com/software/qscintilla/intro\">QScintilla</a> to version 2.11.5 (see issue <a href=\"https://github.com/opencor/opencor/issues/2364\">#2364</a>). Upgraded the <a href=\"http://qwt.sourceforge.net/\">Qwt</a> library to version 6.1.5 (see issue <a href=\"https://github.com/opencor/opencor/issues/2365\">#2365</a>). Upgraded the <a href=\"https://openssl.org/\">OpenSSL</a> library to version 1.1.1h (see issue <a href=\"https://github.com/opencor/opencor/issues/2399\">#2399</a>). 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.4.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2407\">#2407</a>). Upgraded <a href=\"https://llvm.org/\">LLVM</a>+<a href=\"https://clang.llvm.org/\">Clang</a> to version 11.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2410\">#2410</a>)." }
+                       { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://riverbankcomputing.com/software/qscintilla/intro\">QScintilla</a> to version 2.11.5 (see issue <a href=\"https://github.com/opencor/opencor/issues/2364\">#2364</a>). Upgraded the <a href=\"http://qwt.sourceforge.net/\">Qwt</a> library to version 6.1.5 (see issue <a href=\"https://github.com/opencor/opencor/issues/2365\">#2365</a>). Upgraded the <a href=\"https://openssl.org/\">OpenSSL</a> library to version 1.1.1h (see issue <a href=\"https://github.com/opencor/opencor/issues/2399\">#2399</a>). 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.4.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2407\">#2407</a>). Upgraded <a href=\"https://llvm.org/\">LLVM</a>+<a href=\"https://clang.llvm.org/\">Clang</a> to version 11.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2410\">#2410</a>). Upgraded <a href=\"https://libgit2.github.com/\">libgit2</a> to version 1.1.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2414\">#2414</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
@@ -261,7 +261,7 @@ void PmrWorkspace::clone(const QString &pPath)
         cloned = false;
     }
 
-    git_strarray_free(&authorizationStrArray);
+    git_strarray_dispose(&authorizationStrArray);
 
     // Open ourselves in the given path and ask the workspace manager to keep
     // track of us, if we have been successfully cloned
@@ -1293,7 +1293,7 @@ bool PmrWorkspace::fetch()
         git_remote_free(gitRemote);
     }
 
-    git_strarray_free(&authorizationStrArray);
+    git_strarray_dispose(&authorizationStrArray);
 
     return res;
 }
@@ -1394,7 +1394,7 @@ void PmrWorkspace::push()
         git_remote_free(gitRemote);
     }
 
-    git_strarray_free(&authorizationStrArray);
+    git_strarray_dispose(&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 1.0.1)
+set(PACKAGE_VERSION 1.1.0)
 
 # Version of our library
 
 set(MAJOR_LIBRARY_VERSION 1)
-set(MINOR_LIBRARY_VERSION 0)
-set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.${MINOR_LIBRARY_VERSION}.1)
+set(MINOR_LIBRARY_VERSION 1)
+set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.${MINOR_LIBRARY_VERSION}.0)
 
 # Git tag for our library
 
-set(GIT_TAG v1.0.1-opencor)
+set(GIT_TAG v1.1.0-opencor)
 
 # Release tag
 
-set(RELEASE_TAG v1.0.1-opencor)
+set(RELEASE_TAG v1.1.0-opencor)
 
 # Specify where our local package will be installed
 
@@ -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} 99b3da1c7048b86e6ad88dc282194fcc1ba6c17b
+                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} d356e0ab92db0220bdcaefffac8a272b1ac296d2
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES dfa55ba8cd9494228060c72fd1ce9bbdb7ea197f
-                                              27f5cce4eadae122e4d372eeeb796add8ab93d77)
+                                  SHA1_VALUES 44e63abda24819f6db9308dcdd6a495fc3a6612f
+                                              5e9675101821a1a9828ce810ff989ded191355bc)
         else()
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} b17bee0ba74e4cfc8195b7608fb3fbc168786cc8
+                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 2807a694fe5a306ffa1b35baca0e7d05617135b5
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 6e42330135975b4643487de98d46d7c19022b7bf
-                                              f37f2382b856740d1cb42b262de7f77a67d694e2)
+                                  SHA1_VALUES d6e38d8144ba8550eedb5e458d75df30e447c680
+                                              0eeef9ad4e52926c9a3772cabe44e0c8ebafa18b)
         endif()
     elseif(APPLE)
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 870f483fc45caa334a06157a44986c5050308260
+                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 3d2fd560d08e5d11b7c8697cf12affee5b9b4691
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES c4a869805ce88c9fd562d106a9c4b8b13a6e7d50)
+                              SHA1_VALUES 2bf3a0031d5a6a0528543d7af7698c79c9af7ae9)
     else()
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} c1289908db4167e867a9e26b90522e544cdf5aa0
+                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} ce1dc4326f39e575d543148ae17032ddd6c01a47
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 3a40da4bb45430e3fd34cbb95573c105974e1f59)
+                              SHA1_VALUES c3c0ef0c25acdd40dcd68882ed7dc84a8e8a23a7)
     endif()
 else()
     # Ignore some warnings