From 914ebf0847301695f1df57c7bf257472f417ffe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= <ertugrulerata@gmail.com>
Date: Sat, 13 Oct 2018 22:29:15 +0300
Subject: [PATCH] flatpak update to 1.0.4

---
 hardware/virtualization/flatpak/actions.py    | 13 +++-----
 .../files/flatpak-1.0.0-glib_fix.patch        | 32 -------------------
 hardware/virtualization/flatpak/pspec.xml     | 17 ++++++++--
 3 files changed, 19 insertions(+), 43 deletions(-)
 delete mode 100644 hardware/virtualization/flatpak/files/flatpak-1.0.0-glib_fix.patch

diff --git a/hardware/virtualization/flatpak/actions.py b/hardware/virtualization/flatpak/actions.py
index 6045087cb1..9fd00f8b60 100644
--- a/hardware/virtualization/flatpak/actions.py
+++ b/hardware/virtualization/flatpak/actions.py
@@ -12,14 +12,11 @@ from pisi.actionsapi import get
 
 
 def setup():
-    shelltools.system("NOCONFIGURE=1 ./autogen.sh")
-    
-    autotools.configure("--with-priv-mode=setuid \
-                         --enable-xauth \
-                         --with-system-bubblewrap \
-                         --enable-docbook-docs \
-                         --disable-static \
-                         --enable-sandboxed-triggers")
+     autotools.configure("--with-priv-mode=setuid \
+                          --enable-xauth \
+                          --with-system-bubblewrap \
+                          --disable-static \
+                          --enable-sandboxed-triggers")
     
     pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
diff --git a/hardware/virtualization/flatpak/files/flatpak-1.0.0-glib_fix.patch b/hardware/virtualization/flatpak/files/flatpak-1.0.0-glib_fix.patch
deleted file mode 100644
index 77454ba7b7..0000000000
--- a/hardware/virtualization/flatpak/files/flatpak-1.0.0-glib_fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c
-index db4f3645..ac375694 100644
---- a/common/flatpak-utils.c
-+++ b/common/flatpak-utils.c
-@@ -5725,7 +5725,7 @@ flatpak_utils_ascii_string_to_unsigned (const gchar  *str,
-   if (str[0] == '\0')
-     {
-       g_set_error_literal (error,
--                           G_NUMBER_PARSER_ERROR, G_NUMBER_PARSER_ERROR_INVALID,
-+                           G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-                            _("Empty string is not a number"));
-       return FALSE;
-     }
-@@ -5751,7 +5751,7 @@ flatpak_utils_ascii_string_to_unsigned (const gchar  *str,
-       *end_ptr != '\0')
-     {
-       g_set_error (error,
--                   G_NUMBER_PARSER_ERROR, G_NUMBER_PARSER_ERROR_INVALID,
-+                   G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-                    _("“%s” is not an unsigned number"), str);
-       return FALSE;
-     }
-@@ -5761,7 +5761,7 @@ flatpak_utils_ascii_string_to_unsigned (const gchar  *str,
-       gchar *max_str = g_strdup_printf ("%" G_GUINT64_FORMAT, max);
- 
-       g_set_error (error,
--                   G_NUMBER_PARSER_ERROR, G_NUMBER_PARSER_ERROR_OUT_OF_BOUNDS,
-+                   G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-                    _("Number “%s” is out of bounds [%s, %s]"),
-                    str, min_str, max_str);
-       g_free (min_str);
-
diff --git a/hardware/virtualization/flatpak/pspec.xml b/hardware/virtualization/flatpak/pspec.xml
index 03ec719956..52a547b19a 100644
--- a/hardware/virtualization/flatpak/pspec.xml
+++ b/hardware/virtualization/flatpak/pspec.xml
@@ -11,7 +11,7 @@
         <License>LGPLv2</License>
         <Summary>Application distribution framework</Summary>
         <Description>Linux application sandboxing and distribution framework, formerly xdg-app</Description>
-        <Archive sha1sum="f09a3f1378695654e8a51506f7d7e5dc1d62af2e" type="targz">https://github.com/flatpak/flatpak/archive/1.0.0.tar.gz</Archive>
+        <Archive sha1sum="15f8ba295012bb0b0b109e9b07e46fa722e0d2f8" type="tarxz">https://github.com/flatpak/flatpak/releases/download/1.0.4/flatpak-1.0.4.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>util-linux</Dependency>
             <Dependency>gtk-doc</Dependency>
@@ -22,11 +22,13 @@
             <Dependency>dbus-devel</Dependency>
             <Dependency>json-glib-devel</Dependency>
             <Dependency>appstream-glib-devel</Dependency>
+            <Dependency>docbook-xsl</Dependency>
+            <Dependency>python-six</Dependency>
             <Dependency versionFrom="2018.8">ostree-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch level="1">bubblewrap_libglnx_submodule.patch</Patch>
-            <Patch>flatpak-1.0.0-glib_fix.patch</Patch>
+            <!--Patch level="1">bubblewrap_libglnx_submodule.patch</Patch-->
+            <!--Patch>flatpak-1.0.2-var_symlink_fix.diff</Patch-->
         </Patches>
     </Source>
 
@@ -61,7 +63,9 @@
             <Path fileType="man">/usr/share/man</Path>
             <Path fileType="locale">/usr/share/locale</Path>
             <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="doc">/usr/share/gtk-doc</Path>
             <Path fileType="data">/usr/share/gdm</Path>
+            <Path fileType="doc">/usr/share/zsh</Path>
         </Files>
         <AdditionalFiles>
             <AdditionalFile target="/etc/profile.d/flatpak-bindir.sh" permission="0644" owner="root">flatpak-bindir.sh</AdditionalFile>
@@ -94,6 +98,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2018-10-13</Date>
+            <Version>1.0.4</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2018-08-23</Date>
             <Version>1.0.0</Version>