Skip to content

Commit

Permalink
sys-apps/flatpak: Glib fix for 1.0.0
Browse files Browse the repository at this point in the history
Issue #20
  • Loading branch information
fosero committed Aug 22, 2018
1 parent b3adeeb commit f4ae4a5
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 0 deletions.
32 changes: 32 additions & 0 deletions sys-apps/flatpak/files/flatpak-1.0.0-glib_fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
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);

4 changes: 4 additions & 0 deletions sys-apps/flatpak/flatpak-1.0.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ SLOT="0"
KEYWORDS="amd64"
IUSE="doc gnome gtk introspection policykit seccomp"

PATCHES=(
"${FILESDIR}/${P}-glib_fix.patch"
)

RDEPEND="
>=sys-fs/libostree-2018.7
>=net-libs/libsoup-2.4
Expand Down

0 comments on commit f4ae4a5

Please sign in to comment.