From eb279207a212c9ccfe5cd313472c2c497a2fba25 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Thu, 11 Oct 2018 17:03:02 +1300 Subject: [PATCH 1/6] Only build our libgit2 package (#1838). --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 142d92bd9e..6c45e97e07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,7 @@ option(USE_PREBUILT_QSCINTILLA_PACKAGE "Use the pre-built version of the QScinti option(USE_PREBUILT_QWT_PACKAGE "Use the pre-built version of the Qwt package" ON) option(USE_PREBUILT_SUNDIALS_PACKAGE "Use the pre-built version of the SUNDIALS package" ON) option(USE_PREBUILT_ZLIB_PACKAGE "Use the pre-built version of the zlib package" ON) +set(USE_PREBUILT_LIBGIT2_PACKAGE OFF) if(ENABLE_TEST_PLUGINS) option(USE_PREBUILT_ZINC_PACKAGE "Use the pre-built version of the Zinc package" ON) @@ -933,6 +934,9 @@ set(PLUGINS widget/MathMLViewerWidget widget/WebViewerWidget ) +set(PLUGINS + thirdParty/libgit2 +) if(ENABLE_TEST_PLUGINS) list(APPEND PLUGINS From ff02f1ff42398f393d01b2e93526b4575fef861d Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Thu, 11 Oct 2018 17:05:05 +1300 Subject: [PATCH 2/6] libgit2: upgraded to version 0.27.5 (#1838). --- src/plugins/thirdParty/libgit2/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/thirdParty/libgit2/CMakeLists.txt b/src/plugins/thirdParty/libgit2/CMakeLists.txt index 62c3992686..74bbd72eac 100644 --- 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.4) +set(PACKAGE_VERSION 0.27.5) # Version of our library set(MAJOR_LIBRARY_VERSION 0) set(MINOR_LIBRARY_VERSION 27) -set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.${MINOR_LIBRARY_VERSION}.4) +set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.${MINOR_LIBRARY_VERSION}.5) # Git tag for our library -set(GIT_TAG v0.27.4-opencor) +set(GIT_TAG v0.27.5-opencor) # Release tag -set(RELEASE_TAG v0.27.4-opencor) +set(RELEASE_TAG v0.27.5-opencor) # Specify where our local package will be installed From c093529d88a7d4891dd147028b5b704a8033ccff Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Thu, 11 Oct 2018 18:22:10 +1300 Subject: [PATCH 3/6] Only build our libgit2 package (#1838). --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c45e97e07..bf38d53c76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -935,6 +935,9 @@ set(PLUGINS widget/WebViewerWidget ) set(PLUGINS + thirdParty/zlib + thirdParty/OpenSSL + thirdParty/libgit2 ) From b76125d3fbdc894005b558210d762e9bc229f9c1 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Thu, 11 Oct 2018 18:30:36 +1300 Subject: [PATCH 4/6] libgit2: binaries for version 0.27.5 (#1838). --- src/plugins/thirdParty/libgit2/CMakeLists.txt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/plugins/thirdParty/libgit2/CMakeLists.txt b/src/plugins/thirdParty/libgit2/CMakeLists.txt index 74bbd72eac..6639a5c4a7 100644 --- a/src/plugins/thirdParty/libgit2/CMakeLists.txt +++ b/src/plugins/thirdParty/libgit2/CMakeLists.txt @@ -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} f397eb34f2782e9e8a203a2615b1bf5a6259d2f2 + ${RELATIVE_PROJECT_SOURCE_DIR} b5a91d1262e01b61aed27957626cdc4bc328a8a3 RELEASE_TAG ${RELEASE_TAG} SHA1_FILES ${SHA1_FILES} - SHA1_VALUES 0ea1db160cf63aeb35df5086299637724f9a3ec8 - f48b55b979460c04c5f0ffc3d97949b0a6f850ae) + SHA1_VALUES b95c2275dcd19489143891b6642ca71325f716f0 + 21ff47e1a9a1764e661a689be4eb62e77d71504d) else() retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION} - ${RELATIVE_PROJECT_SOURCE_DIR} 1da01704d51a0810a61c70bc5832ffb87164eb7f + ${RELATIVE_PROJECT_SOURCE_DIR} 831ccb9308405b233fc415b51a1fe4d1f3217e77 RELEASE_TAG ${RELEASE_TAG} SHA1_FILES ${SHA1_FILES} - SHA1_VALUES fcd088299f3093a912b7b9dde73220dcee39b7ed - c44002312f4d4287a8c433c21d481fc75c35db09) + SHA1_VALUES 4c432c407626a79a095cbc1c9254f09c9ea5801d + f41381dd32f24502f26d5db6c8b4dbdcb1d472e0) endif() elseif(APPLE) retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION} - ${RELATIVE_PROJECT_SOURCE_DIR} e05d41a62d21bb1bc92a252535f5f446ac30bced + ${RELATIVE_PROJECT_SOURCE_DIR} 19c787c10301683d4a070fe6b669b6b8c4e57ba7 RELEASE_TAG ${RELEASE_TAG} SHA1_FILES ${SHA1_FILES} - SHA1_VALUES 085e6fe42b790612c5b7660ce9c6a2c314c6ba2e) + SHA1_VALUES cfab074d71ca0b496cdf7cd179f84ec67ace6141) else() retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION} - ${RELATIVE_PROJECT_SOURCE_DIR} 78a07bce57a351fc3ab3c29946738e641e9b1991 + ${RELATIVE_PROJECT_SOURCE_DIR} fd6569a0631c9ad3b8444fd9bfcddc243c43a8c9 RELEASE_TAG ${RELEASE_TAG} SHA1_FILES ${SHA1_FILES} - SHA1_VALUES 26810453ec618a59bcf551fa773c8e798d0879af) + SHA1_VALUES dbe0d551379c28c7c2f421c76967bc25314df029) endif() else() # Ignore some warnings From ac736fc25ea205dd450c7621349cd99b14614899 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Thu, 11 Oct 2018 18:30:58 +1300 Subject: [PATCH 5/6] Slight update to our download page (#1838). --- doc/downloads/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/downloads/index.js b/doc/downloads/index.js index 444160ffc0..611c8f2bd9 100644 --- a/doc/downloads/index.js +++ b/doc/downloads/index.js @@ -38,7 +38,7 @@ var jsonData = { "versions": [ ], "changes": [ { "change": "Simulation Experiment view: now have two reset buttons rather than one with a drop-down menu (see issue #1835)." }, - { "change": "Third-party libraries: upgraded QScintilla to version 2.10.8 (see issue #1833)." } + { "change": "Third-party libraries: upgraded QScintilla to version 2.10.8 (see issue #1833). Upgraded libgit2 to version 0.27.5 (see issue #1838)." } ] }, { "major": 0, "minor": 4, "patch": 1, "day": 20, "month": 5, "year": 2015, "type": 0, From f94173c3f966d0d2b8611d024d73356e047ed188 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Thu, 11 Oct 2018 18:33:07 +1300 Subject: [PATCH 6/6] Stop building only our libgit2 package (#1838). --- CMakeLists.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bf38d53c76..142d92bd9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,6 @@ option(USE_PREBUILT_QSCINTILLA_PACKAGE "Use the pre-built version of the QScinti option(USE_PREBUILT_QWT_PACKAGE "Use the pre-built version of the Qwt package" ON) option(USE_PREBUILT_SUNDIALS_PACKAGE "Use the pre-built version of the SUNDIALS package" ON) option(USE_PREBUILT_ZLIB_PACKAGE "Use the pre-built version of the zlib package" ON) -set(USE_PREBUILT_LIBGIT2_PACKAGE OFF) if(ENABLE_TEST_PLUGINS) option(USE_PREBUILT_ZINC_PACKAGE "Use the pre-built version of the Zinc package" ON) @@ -934,12 +933,6 @@ set(PLUGINS widget/MathMLViewerWidget widget/WebViewerWidget ) -set(PLUGINS - thirdParty/zlib - thirdParty/OpenSSL - - thirdParty/libgit2 -) if(ENABLE_TEST_PLUGINS) list(APPEND PLUGINS