Commit 1292fc74 authored by Johan Ouwerkerk's avatar Johan Ouwerkerk

Make flatpak build again by copying a patch from Arch

Previously the flatpak would fail to build against a recent glib.c because fseeko.c was broken. Now it should be fixed.
parent b4b8b2d2
Pipeline #7790 passed with stage
in 10 minutes and 59 seconds
diff --git a/liboath/gl/fseeko.c b/liboath/gl/fseeko.c
index 67bb9ec..6adb80e 100644
--- a/liboath/gl/fseeko.c
+++ b/liboath/gl/fseeko.c
@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
#endif
/* These tests are based on fpurge.c. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_read_end == fp->_IO_read_ptr
&& fp->_IO_write_ptr == fp->_IO_write_base
&& fp->_IO_save_base == NULL)
@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
return -1;
}
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_flags &= ~_IO_EOF_SEEN;
fp->_offset = pos;
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
......@@ -41,6 +41,11 @@
"path": "flatpak/2fffce2a471f74a585939c84cce16ef3015e5d3d.diff",
"sha256": "4093d69a22af60fac339fcee22ff29c3b8418b76bc1286e5226505af884e0c21"
},
{
"type": "patch",
"path": "flatpak/oath-toolkit/fseeko.patch",
"sha256": "b93dc7bafe32a3477127e55b1c470063660b1f5c3f25622ea581b41502783020"
},
{
"type" : "shell",
"commands" : [ "autoreconf -vfi" ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment