| 1 |
commit: e0417a9f082d36abdd8e13f9579e08e47c51e1f6 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 27 20:05:06 2018 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 27 20:05:32 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0417a9f |
| 7 |
|
| 8 |
app-misc/gcal: Add build fix for glibc-2.28, bug 669334 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/669334 |
| 11 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 13 |
|
| 14 |
app-misc/gcal/files/gcal-4.1-glibc228.patch | 74 +++++++++++++++++++++++++++++ |
| 15 |
app-misc/gcal/gcal-4.1.ebuild | 4 +- |
| 16 |
2 files changed, 77 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/app-misc/gcal/files/gcal-4.1-glibc228.patch b/app-misc/gcal/files/gcal-4.1-glibc228.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..6e9b7c26eff |
| 21 |
--- /dev/null |
| 22 |
+++ b/app-misc/gcal/files/gcal-4.1-glibc228.patch |
| 23 |
@@ -0,0 +1,74 @@ |
| 24 |
+diff -ruN gcal-4.1.orig/lib/fseeko.c gcal-4.1/lib/fseeko.c |
| 25 |
+--- gcal-4.1.orig/lib/fseeko.c 2017-01-22 18:09:38.000000000 +0100 |
| 26 |
++++ gcal-4.1/lib/fseeko.c 2018-10-27 21:56:46.232442299 +0200 |
| 27 |
+@@ -1,9 +1,9 @@ |
| 28 |
+ /* An fseeko() function that, together with fflush(), is POSIX compliant. |
| 29 |
+- Copyright (C) 2007-2017 Free Software Foundation, Inc. |
| 30 |
++ Copyright (C) 2007-2018 Free Software Foundation, Inc. |
| 31 |
+ |
| 32 |
+ This program is free software; you can redistribute it and/or modify |
| 33 |
+ it under the terms of the GNU General Public License as published by |
| 34 |
+- the Free Software Foundation; either version 3, or (at your option) |
| 35 |
++ the Free Software Foundation; either version 2, or (at your option) |
| 36 |
+ any later version. |
| 37 |
+ |
| 38 |
+ This program is distributed in the hope that it will be useful, |
| 39 |
+@@ -12,7 +12,7 @@ |
| 40 |
+ GNU General Public License for more details. |
| 41 |
+ |
| 42 |
+ You should have received a copy of the GNU General Public License along |
| 43 |
+- with this program; if not, see <http://www.gnu.org/licenses/>. */ |
| 44 |
++ with this program; if not, see <https://www.gnu.org/licenses/>. */ |
| 45 |
+ |
| 46 |
+ #include <config.h> |
| 47 |
+ |
| 48 |
+@@ -33,9 +33,9 @@ |
| 49 |
+ #endif |
| 50 |
+ #if _GL_WINDOWS_64_BIT_OFF_T |
| 51 |
+ # undef fseeko |
| 52 |
+-# if HAVE__FSEEKI64 /* msvc, mingw64 */ |
| 53 |
++# if HAVE__FSEEKI64 && HAVE_DECL__FSEEKI64 /* msvc, mingw since msvcrt8.0, mingw64 */ |
| 54 |
+ # define fseeko _fseeki64 |
| 55 |
+-# else /* mingw */ |
| 56 |
++# else /* mingw before msvcrt8.0 */ |
| 57 |
+ # define fseeko fseeko64 |
| 58 |
+ # endif |
| 59 |
+ #endif |
| 60 |
+@@ -47,7 +47,8 @@ |
| 61 |
+ #endif |
| 62 |
+ |
| 63 |
+ /* These tests are based on fpurge.c. */ |
| 64 |
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
| 65 |
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 |
| 66 |
++ /* GNU libc, BeOS, Haiku, Linux libc5 */ |
| 67 |
+ if (fp->_IO_read_end == fp->_IO_read_ptr |
| 68 |
+ && fp->_IO_write_ptr == fp->_IO_write_base |
| 69 |
+ && fp->_IO_save_base == NULL) |
| 70 |
+@@ -80,7 +81,7 @@ |
| 71 |
+ #elif defined __minix /* Minix */ |
| 72 |
+ if (fp_->_ptr == fp_->_buf |
| 73 |
+ && (fp_->_ptr == NULL || fp_->_count == 0)) |
| 74 |
+-#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel */ |
| 75 |
++#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ |
| 76 |
+ if (fp_->_ptr == fp_->_base |
| 77 |
+ && (fp_->_ptr == NULL || fp_->_cnt == 0)) |
| 78 |
+ #elif defined __UCLIBC__ /* uClibc */ |
| 79 |
+@@ -123,7 +124,8 @@ |
| 80 |
+ return -1; |
| 81 |
+ } |
| 82 |
+ |
| 83 |
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
| 84 |
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 |
| 85 |
++ /* GNU libc, BeOS, Haiku, Linux libc5 */ |
| 86 |
+ fp->_flags &= ~_IO_EOF_SEEN; |
| 87 |
+ fp->_offset = pos; |
| 88 |
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ |
| 89 |
+@@ -150,7 +152,7 @@ |
| 90 |
+ fp_->_flags &= ~__SEOF; |
| 91 |
+ #elif defined __EMX__ /* emx+gcc */ |
| 92 |
+ fp->_flags &= ~_IOEOF; |
| 93 |
+-#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel */ |
| 94 |
++#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ |
| 95 |
+ fp_->_flag &= ~_IOEOF; |
| 96 |
+ #elif defined __MINT__ /* Atari FreeMiNT */ |
| 97 |
+ fp->__offset = pos; |
| 98 |
|
| 99 |
diff --git a/app-misc/gcal/gcal-4.1.ebuild b/app-misc/gcal/gcal-4.1.ebuild |
| 100 |
index 7f56acee8ca..cd7e657da4f 100644 |
| 101 |
--- a/app-misc/gcal/gcal-4.1.ebuild |
| 102 |
+++ b/app-misc/gcal/gcal-4.1.ebuild |
| 103 |
@@ -1,4 +1,4 @@ |
| 104 |
-# Copyright 1999-2018 Gentoo Foundation |
| 105 |
+# Copyright 1999-2018 Gentoo Authors |
| 106 |
# Distributed under the terms of the GNU General Public License v2 |
| 107 |
|
| 108 |
EAPI=6 |
| 109 |
@@ -24,6 +24,8 @@ RDEPEND="nls? ( virtual/libintl ) |
| 110 |
|
| 111 |
DOCS=( BUGS LIMITATIONS NEWS README THANKS TODO ) |
| 112 |
|
| 113 |
+PATCHES=( "${FILESDIR}/${P}-glibc228.patch" ) |
| 114 |
+ |
| 115 |
src_configure() { |
| 116 |
tc-export CC |
| 117 |
append-cppflags -D_GNU_SOURCE |
Archives