Merge 71dc687 into d1bd9cb

opencor · Feb 19, 2019 · c61210f · c61210f
2 parents d1bd9cb + 71dc687
commit c61210f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 20 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.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/1983\">#1983</a>). Upgraded <a href=\"https://www.mesa3d.org/\">Mesa</a> to version 18.3.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/1994\">#1994</a>). Upgraded the <a href=\"http://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 4.1.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/1995\">#1995</a>)." }
+                       { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://riverbankcomputing.com/software/qscintilla/intro\">QScintilla</a> to version 2.11.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/1983\">#1983</a>). Upgraded <a href=\"https://libgit2.github.com/\">libgit2</a> to version 0.28.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/1993\">#1993</a>). Upgraded <a href=\"https://www.mesa3d.org/\">Mesa</a> to version 18.3.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/1994\">#1994</a>). Upgraded the <a href=\"http://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 4.1.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/1995\">#1995</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
@@ -379,7 +379,7 @@ bool PmrWorkspace::commit(const QString &pMessage)
         emitGitError(tr("An error occurred while trying to commit to the workspace (you must provide a message)."));
     }
 
-    git_buf_free(&message);
+    git_buf_dispose(&message);
 
     return res;
 }
@@ -902,7 +902,7 @@ void PmrWorkspace::stageFile(const QString &pPath, bool pStage)
                     git_tree *headTree;
 
                     if (!git_reference_peel(reinterpret_cast<git_object **>(&headTree),
-                                            head, GIT_OBJ_TREE)) {
+                                            head, GIT_OBJECT_TREE)) {
                         git_tree_entry *headEntry;
 
                         if (!git_tree_entry_bypath(&headEntry, headTree,
@@ -1138,7 +1138,7 @@ int PmrWorkspace::fetchheadForeachCallback(const char *pReferenceName,
 
                     const git_oid *commitId = git_commit_id(commit);
 
-                    if (git_reference_type(headReference) == GIT_REF_OID) {
+                    if (git_reference_type(headReference) == GIT_REFERENCE_DIRECT) {
                         res = !git_reference_set_target(&newHeadReference,
                                                         headReference,
                                                         commitId, LogMessage);
@@ -1346,7 +1346,7 @@ void PmrWorkspace::emitGitError(const QString &pMessage) const
 {
     // Let people know, through a warning, about our Git error
 
-    const git_error *gitError = giterr_last();
+    const git_error *gitError = git_error_last();
 
     if (gitError) {
         emit warning(tr("%1\n\nGit message: %2.").arg(pMessage)

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.27.7)
+set(PACKAGE_VERSION 0.28.1)
 
 # Version of our library
 
 set(MAJOR_LIBRARY_VERSION 0)
-set(MINOR_LIBRARY_VERSION 27)
-set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.${MINOR_LIBRARY_VERSION}.7)
+set(MINOR_LIBRARY_VERSION 28)
+set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.${MINOR_LIBRARY_VERSION}.1)
 
 # Git tag for our library
 
-set(GIT_TAG v0.27.7-opencor)
+set(GIT_TAG v0.28.1-opencor)
 
 # Release tag
 
-set(RELEASE_TAG v0.27.7-opencor)
+set(RELEASE_TAG v0.28.1-opencor)
 
 # Specify where our local package will be installed
 
@@ -67,31 +67,31 @@ if(USE_PREBUILT_LIBGIT2_PACKAGE)
     if(WIN32)
         if(RELEASE_MODE)
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} 57fbb0b509fd4bdaf3f0c9b395cc328c6f33d668
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} f2b078d21baafee084e4c19a14d937970948a989
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES c6958a9ee21ca4ca21fe015ee7e90aeb13b13790
-                                              72c013b089458d05292d410661336687ed0dd19b)
+                                  SHA1_VALUES c2ff3eed82448701bae0b061d67efb4d6f4d7d27
+                                              5c943fadcbf3de2aa42a39df104f9deb72d3bd35)
         else()
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} a739cae9c5b25d13e75d1621c93df14e468f8986
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 0f8b29ac1c39b89316aa1a0cf9c2dc14635f6973
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES aae2eb4f9a0eb67994881bab3d2bdecca68bbc4a
-                                              140c1cf315e4949dd3cdb4896e67035fba4a1d63)
+                                  SHA1_VALUES 30ee737368de083074fc009bd55183c74f4af26b
+                                              92c804d4f007c6d268636b2d72cff50e5aeaedcb)
         endif()
     elseif(APPLE)
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} 64477fdee83db9c1c7ad28a61a18395a1cefc5f1
+                              ${RELATIVE_PROJECT_SOURCE_DIR} 86186f65c06d0c4a447e05ae3d0e979a0db3e3fa
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 3c77f84f875e83deeb0f20a972b89815ab454b6c)
+                              SHA1_VALUES 485faf5db46b42a373fa230167eeacf1a747a152)
     else()
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} 712f964c2e42377e5e63900dc3cc76369f868571
+                              ${RELATIVE_PROJECT_SOURCE_DIR} e14928caa0a01d4b27fe476b8770b063d0c70db0
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 274f6a5b8e75bf4d3209afb4ecb60d8bc191fd6c)
+                              SHA1_VALUES 498dbbe4631ea9b2e6e8767e476cd7004590a2df)
     endif()
 else()
     # Ignore some warnings
@@ -132,6 +132,8 @@ else()
             -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
             ${DEFINE_STATIC_CRT_ARG}
             -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
+            -DOPENSSL_SSL_LIBRARY=${OPENSSL_SSL_LIBRARY}
+            -DOPENSSL_CRYPTO_LIBRARY=${OPENSSL_CRYPTO_LIBRARY}
             -DUSE_HTTPS=OpenSSL
             -DUSE_SSH=OFF
             -DWINHTTP=OFF