From d8838109f55ffecd2e68bfcf348bc2688a7facdb Mon Sep 17 00:00:00 2001
From: Felix Krull <f_krull@gmx.de>
Date: Tue, 25 Aug 2020 19:54:35 +0200
Subject: [PATCH] Switch ostree source to git

---
 rust-bindings/rust/Dockerfile | 14 ++++++++------
 rust-bindings/rust/Makefile   |  7 +++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/rust-bindings/rust/Dockerfile b/rust-bindings/rust/Dockerfile
index 99baf7b2..2849b5a6 100644
--- a/rust-bindings/rust/Dockerfile
+++ b/rust-bindings/rust/Dockerfile
@@ -1,17 +1,19 @@
 FROM registry.fedoraproject.org/fedora:latest
 
-RUN dnf install -y curl gcc make tar xz 'dnf-command(builddep)'
+RUN dnf install -y gcc git make 'dnf-command(builddep)'
 RUN dnf builddep -y ostree
 
-ARG OSTREE_VER
-ENV OSTREE_SRC=https://github.com/ostreedev/ostree/releases/download/v${OSTREE_VER}/libostree-${OSTREE_VER}.tar.xz
+ARG OSTREE_REPO
+ARG OSTREE_VERSION
 RUN mkdir /src && \
     cd /src && \
-    curl -L -o /ostree.tar.xz ${OSTREE_SRC} && \
-    tar -xa --strip-components=1 -f /ostree.tar.xz && \
-    rm -r /ostree.tar.xz
+    git init . && \
+    git fetch --depth 1 $OSTREE_REPO $OSTREE_VERSION && \
+    git checkout FETCH_HEAD && \
+    git submodule update --init
 RUN mkdir /build && \
     cd /build && \
+    NOCONFIGURE=1 /src/autogen.sh && \
     /src/configure \
         --with-openssl \
         --with-curl \
diff --git a/rust-bindings/rust/Makefile b/rust-bindings/rust/Makefile
index a5b5b695..0b4e863e 100644
--- a/rust-bindings/rust/Makefile
+++ b/rust-bindings/rust/Makefile
@@ -1,7 +1,8 @@
 GIR_REPO := https://github.com/gtk-rs/gir.git
 GIR_VERSION := 2d1ffab19eb5f9a2f0d7a294dbf07517dab4d989
+OSTREE_REPO := https://github.com/ostreedev/ostree
+OSTREE_VERSION := v2020.4
 RUSTDOC_STRIPPER_VERSION := 0.1.13
-OSTREE_VER := 2020.4
 
 all: gir
 
@@ -49,7 +50,9 @@ gir-files:
 
 gir-files/OSTree-1.0.gir:
 	podman build \
-		--build-arg OSTREE_VER=$(OSTREE_VER) \
+		--pull \
+		--build-arg OSTREE_REPO=$(OSTREE_REPO) \
+		--build-arg OSTREE_VERSION=$(OSTREE_VERSION) \
 		-t ostree-build \
 		.
 	podman run \