From d52a8c7acf7e8cce9853d4aa4a9951be95149b79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= <ertugrulerata@gmail.com>
Date: Sat, 13 Oct 2018 22:09:42 +0300
Subject: [PATCH] ostree fix build with new toolchain

---
 hardware/virtualization/ostree/actions.py            |  3 ---
 ...isable_werror_implicit_funtion_declaraction.patch | 11 +++++++++++
 hardware/virtualization/ostree/pspec.xml             | 12 +++++++-----
 3 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 hardware/virtualization/ostree/files/disable_werror_implicit_funtion_declaraction.patch

diff --git a/hardware/virtualization/ostree/actions.py b/hardware/virtualization/ostree/actions.py
index b7ca0dc4ea..d631540ee8 100644
--- a/hardware/virtualization/ostree/actions.py
+++ b/hardware/virtualization/ostree/actions.py
@@ -15,12 +15,10 @@ def setup():
     shelltools.system("env NOCONFIGURE=1 ./autogen.sh")
     
     autotools.configure("--disable-silent-rules \
-                         --enable-gtk-doc \
                          --without-selinux \
                          --with-curl \
                          --with-openssl \
                          --disable-static \
-                         --enable-installed-tests=exclusive \
                          --enable-trivial-httpd-cmdline \
                          --disable-http2 \
                          --without-dracut \
@@ -28,7 +26,6 @@ def setup():
 
     pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
-
 def build():
     autotools.make()
 
diff --git a/hardware/virtualization/ostree/files/disable_werror_implicit_funtion_declaraction.patch b/hardware/virtualization/ostree/files/disable_werror_implicit_funtion_declaraction.patch
new file mode 100644
index 0000000000..8a601edf8c
--- /dev/null
+++ b/hardware/virtualization/ostree/files/disable_werror_implicit_funtion_declaraction.patch
@@ -0,0 +1,11 @@
+diff -Nuar libostree-2018.8.orig/configure.ac libostree-2018.8/configure.ac
+--- libostree-2018.8.orig/configure.ac	2018-08-22 16:53:53.000000000 +0300
++++ libostree-2018.8/configure.ac	2018-10-13 21:50:43.341668859 +0300
+@@ -35,7 +35,6 @@
+   -Werror=empty-body \
+   -Werror=strict-prototypes \
+   -Werror=missing-prototypes \
+-  -Werror=implicit-function-declaration \
+   "-Werror=format=2 -Werror=format-security -Werror=format-nonliteral" \
+   -Werror=pointer-arith -Werror=init-self \
+   -Werror=missing-declarations \
diff --git a/hardware/virtualization/ostree/pspec.xml b/hardware/virtualization/ostree/pspec.xml
index 3f845825e4..07544ec5f0 100644
--- a/hardware/virtualization/ostree/pspec.xml
+++ b/hardware/virtualization/ostree/pspec.xml
@@ -12,9 +12,8 @@
         <IsA>app:console</IsA>
         <Summary>Operating system and container binary deployment and upgrades</Summary>
         <Description>OSTree is a tool for managing bootable, immutable, versioned filesystem trees</Description>
-        <Archive sha1sum="3248dda7bf73007f8bae0cf3c6007a425994a307" type="targz">https://github.com/ostreedev/ostree/archive/v2018.8.tar.gz</Archive>
+        <Archive sha1sum="c8dabfe09e987a15d99e4723be23f23da9f7bbb3" type="tarxz">https://github.com/ostreedev/ostree/releases/download/v2018.8/libostree-2018.8.tar.xz</Archive>
         <BuildDependencies>
-            <Dependency>gtk-doc</Dependency>
             <Dependency>glib2-devel</Dependency>
             <Dependency>xz-devel</Dependency>
             <Dependency>zlib-devel</Dependency>
@@ -32,7 +31,7 @@
             <Dependency>gnutls-devel</Dependency-->
         </BuildDependencies>
         <Patches>
-            <Patch level="1">bsdiff_libglnx_submodule.patch</Patch>
+            <Patch level="1">disable_werror_implicit_funtion_declaraction.patch</Patch>
         </Patches>
     </Source>
 
@@ -40,6 +39,9 @@
         <Name>ostree</Name>
         <RuntimeDependencies>
             <Dependency>xz</Dependency>
+            <Dependency>curl</Dependency>
+            <Dependency>avahi-glib</Dependency>
+            <Dependency>avahi-libs</Dependency>
             <Dependency>zlib</Dependency>
             <Dependency>fuse</Dependency>
             <Dependency>glib2</Dependency>
@@ -48,8 +50,7 @@
             <Dependency>libarchive</Dependency>
             <Dependency>libgpg-error</Dependency>
             <Dependency>libutil-linux</Dependency>
-            <Dependency>openssl</Dependency>
-            <Dependency>libgcc</Dependency>            
+            <Dependency>openssl</Dependency>         
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
@@ -70,6 +71,7 @@
         <RuntimeDependencies>
             <Dependency release="current">ostree</Dependency>
             <Dependency>xz-devel</Dependency>
+            <Dependency>curl-devel</Dependency>
             <Dependency>zlib-devel</Dependency>
             <Dependency>fuse-devel</Dependency>
             <Dependency>glib2-devel</Dependency>