Description: Adapt sysroot cgo calls to the new libostree async-progress API
 Newer libostree versions added an OstreeSysrootAsyncProgress* parameter (in
 second position) to ostree_sysroot_prepare_cleanup, ostree_sysroot_deploy_tree
 and ostree_sysroot_simple_write_deployment. Pass NULL for this optional
 progress parameter in the Go bindings to restore buildability against the
 current libostree-dev (2024.x).
Author: tangxiaofeng <tangxiaofeng@kylinos.cn>
Origin: other
Forwarded: not-needed
Last-Update: 2026-09-02

--- golang-github-sjoerdsimons-ostree-go-0.0~git20201014.8fae757.orig/pkg/otbuiltin/sysroot.go
+++ golang-github-sjoerdsimons-ostree-go-0.0~git20201014.8fae757/pkg/otbuiltin/sysroot.go
@@ -135,7 +135,7 @@ func (s *Sysroot) OriginNewFromRefspec(r
 
 func (s *Sysroot) PrepareCleanup(cancellable *glib.GCancellable) error {
 	var cerr *C.GError = nil
-	r := C.ostree_sysroot_prepare_cleanup(s.native(), cCancellable(cancellable), &cerr)
+	r := C.ostree_sysroot_prepare_cleanup(s.native(), nil, cCancellable(cancellable), &cerr)
 
 	if !gobool(r) {
 		return generateError(cerr)
@@ -159,7 +159,7 @@ func (s *Sysroot) DeployTree(osname, rev
 	}
 	coverrideKernelArgv[len(overrideKernelArgv)] = nil
 
-	r := C.ostree_sysroot_deploy_tree(s.native(), cosname, crevision,
+	r := C.ostree_sysroot_deploy_tree(s.native(), nil, cosname, crevision,
 		(*C.struct__GKeyFile)(unsafe.Pointer(origin.Native())),
 		providedMergeDeployment.native(),
 		(**C.char)(unsafe.Pointer(&coverrideKernelArgv[0])),
@@ -192,7 +192,7 @@ func (s *Sysroot) SimpleWriteDeployment(
 	cosname := C.CString(osname)
 	defer C.free(unsafe.Pointer(cosname))
 
-	r := C.ostree_sysroot_simple_write_deployment(s.native(),
+	r := C.ostree_sysroot_simple_write_deployment(s.native(), nil,
 		cosname,
 		newDeployment.native(),
 		mergeDeployment.native(),
