wip

XmacsLabs · Jan 16, 2024 · ecace82 · ecace82
1 parent da90315
commit ecace82
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/Plugins/Git/git.cpp b/src/Plugins/Git/git.cpp
@@ -23,8 +23,12 @@ libgit2_version () {
 
 static void
 show_git_last_error (int error) {
+#if (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR <= 27)
+  const git_error* e= giterr_last ();
+#else
   const git_error* e= git_error_last ();
-  debug_io << "libgit2 error " << error << "/" << e->klass << ": " << e->message
+#endif
+  debug_io << "libgit2 error " << error // << "/" << e->klass << ": " << e->message
            << LF;
 }
 

diff --git a/xmake-requires.lock b/xmake-requires.lock
@@ -55,15 +55,15 @@
         ["libjpeg#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "bdce2febf9d26219840fe93f2e6b9ff676d565f7",
+                commit = "4008de50367abe3554f52460fc5f09a744073cec",
                 url = "https://gitee.com/tboox/xmake-repo.git"
             },
             version = "1.5.2"
         },
         ["libpng#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "bdce2febf9d26219840fe93f2e6b9ff676d565f7",
+                commit = "4008de50367abe3554f52460fc5f09a744073cec",
                 url = "https://gitee.com/tboox/xmake-repo.git"
             },
             version = "1.6.36"
@@ -74,7 +74,7 @@
         ["openssl#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "bdce2febf9d26219840fe93f2e6b9ff676d565f7",
+                commit = "4008de50367abe3554f52460fc5f09a744073cec",
                 url = "https://gitee.com/tboox/xmake-repo.git"
             },
             version = "1.1.1d"
@@ -90,7 +90,7 @@
         ["pkg-config#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "bdce2febf9d26219840fe93f2e6b9ff676d565f7",
+                commit = "4008de50367abe3554f52460fc5f09a744073cec",
                 url = "https://gitee.com/tboox/xmake-repo.git"
             },
             version = "0.29"
@@ -114,7 +114,7 @@
         ["zlib#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "bdce2febf9d26219840fe93f2e6b9ff676d565f7",
+                commit = "4008de50367abe3554f52460fc5f09a744073cec",
                 url = "https://gitee.com/tboox/xmake-repo.git"
             },
             version = "1.2.11"

diff --git a/xmake/packages.lua b/xmake/packages.lua
@@ -148,7 +148,7 @@ function add_requires_of_mogan()
     end
 
     -- package: libgit2
-    if is_plat ("linux") and using_apt() and (not (linuxos.name() == "uos")) then
+    if is_plat ("linux") and using_apt() then
         add_requires("apt::libgit2-dev", {alias="libgit2"})
     elseif not is_plat("wasm") then
         add_requires("libgit2 "..LIBGIT2_VERSION, {system=false})