From 19f1c54856b9980e6f978bff38b3d1b96304ceeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Mon, 10 Jun 2024 15:13:36 +0200 Subject: [PATCH] chore: Upgrade libshumate and protobuf-c dependencies --- build-aux/org.gnome.Fractal.Devel.json | 60 ++++++++++++++++++-------- 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/build-aux/org.gnome.Fractal.Devel.json b/build-aux/org.gnome.Fractal.Devel.json index b3d39c09..80825b9a 100644 --- a/build-aux/org.gnome.Fractal.Devel.json +++ b/build-aux/org.gnome.Fractal.Devel.json @@ -39,30 +39,55 @@ }, "modules": [ { - "name" : "protobuf", - "buildsystem" : "autotools", - "config-opts": [ "DIST_LANG=cpp" ], - "cleanup" : [ + "name": "abseil", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-DCMAKE_CXX_STANDARD=17", + "-DCMAKE_POSITION_INDEPENDENT_CODE=ON", + "-DBUILD_SHARED_LIBS=ON", + "-DABSL_PROPAGATE_CXX_STD=ON" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/abseil/abseil-cpp.git", + "tag": "20240116.2", + "commit": "d7aaad83b488fd62bd51c81ecf16cd938532cc0a" + } + ] + }, + { + "name": "protobuf", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-DCMAKE_POSITION_INDEPENDENT_CODE=ON", + "-Dprotobuf_ABSL_PROVIDER=package", + "-Dprotobuf_BUILD_SHARED_LIBS=ON", + "-Dprotobuf_BUILD_TESTS=OFF" + ], + "cleanup": [ "/bin/protoc*", "/lib/libprotoc*", "/lib/libprotobuf-lite*" ], - "sources" : [ + "sources": [ { - "type" : "archive", - "url" : "https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protobuf-all-3.17.3.tar.gz", - "sha256" : "77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2" + "type": "git", + "url": "https://github.com/protocolbuffers/protobuf.git", + "tag": "v25.3", + "commit": "4a2aef570deb2bfb8927426558701e8bfc26f2a4" } ] }, { - "name" : "protobuf-c", - "buildsystem" : "autotools", - "sources" : [ + "name": "protobuf-c", + "buildsystem": "autotools", + "sources": [ { - "type" : "archive", - "url" : "https://github.com/protobuf-c/protobuf-c/releases/download/v1.4.0/protobuf-c-1.4.0.tar.gz", - "sha256" : "26d98ee9bf18a6eba0d3f855ddec31dbe857667d269bc0b6017335572f85bbcb" + "type": "git", + "url": "https://github.com/protobuf-c/protobuf-c.git", + "tag": "v1.5.0", + "commit": "8c201f6e47a53feaab773922a743091eb6c8972a" } ] }, @@ -77,9 +102,10 @@ ], "sources": [ { - "type": "archive", - "url": "https://download.gnome.org/sources/libshumate/1.2/libshumate-1.2.0.tar.xz", - "sha256": "4f8413a707cd00f84cee39ca49f58c48fc436f008ea80d6532ac37dafd0ba96b" + "type": "git", + "url": "https://gitlab.gnome.org/GNOME/libshumate.git", + "tag": "1.2.2", + "commit": "fab290f36bb7043fe6107308ff4f91c80492aa11" } ] },