| 1 |
commit: 40e6223ba49d58c47a58e708b3419795f95ac95c |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 7 02:16:00 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 12 00:12:49 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e6223b |
| 7 |
|
| 8 |
app-office/libreoffice: Fix build with glibc-2.24 |
| 9 |
|
| 10 |
Gentoo-bug: 604176 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.3 |
| 13 |
|
| 14 |
.../libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch | 10 ++++++++++ |
| 15 |
app-office/libreoffice/libreoffice-5.2.5.1.ebuild | 3 +++ |
| 16 |
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 3 +++ |
| 17 |
app-office/libreoffice/libreoffice-5.3.0.3.ebuild | 3 +++ |
| 18 |
app-office/libreoffice/libreoffice-5.3.9999.ebuild | 3 +++ |
| 19 |
app-office/libreoffice/libreoffice-9999.ebuild | 3 +++ |
| 20 |
6 files changed, 25 insertions(+) |
| 21 |
|
| 22 |
diff --git a/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch b/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch |
| 23 |
new file mode 100644 |
| 24 |
index 0000000000..d714ff2074 |
| 25 |
--- /dev/null |
| 26 |
+++ b/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch |
| 27 |
@@ -0,0 +1,10 @@ |
| 28 |
+--- libreoffice-5.2.5.1.orig/desktop/unx/source/pagein.c 2017-01-11 16:54:33.000000000 -0800 |
| 29 |
++++ libreoffice-5.2.5.1/desktop/unx/source/pagein.c 2017-02-03 10:22:51.697673613 -0800 |
| 30 |
+@@ -26,6 +26,7 @@ |
| 31 |
+ #include <string.h> |
| 32 |
+ #include <sys/stat.h> |
| 33 |
+ #include <sys/types.h> |
| 34 |
++#include <sys/sysmacros.h> |
| 35 |
+ |
| 36 |
+ /* do_pagein */ |
| 37 |
+ static void do_pagein (const char * filename) |
| 38 |
|
| 39 |
diff --git a/app-office/libreoffice/libreoffice-5.2.5.1.ebuild b/app-office/libreoffice/libreoffice-5.2.5.1.ebuild |
| 40 |
index d104014a02..4da4a96eb6 100644 |
| 41 |
--- a/app-office/libreoffice/libreoffice-5.2.5.1.ebuild |
| 42 |
+++ b/app-office/libreoffice/libreoffice-5.2.5.1.ebuild |
| 43 |
@@ -245,6 +245,9 @@ PATCHES=( |
| 44 |
|
| 45 |
# not upstreamable stuff |
| 46 |
"${FILESDIR}/${PN}-5.2-system-pyuno.patch" |
| 47 |
+ |
| 48 |
+ # TODO: upstream |
| 49 |
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" |
| 50 |
) |
| 51 |
|
| 52 |
pkg_pretend() { |
| 53 |
|
| 54 |
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild |
| 55 |
index d104014a02..4da4a96eb6 100644 |
| 56 |
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild |
| 57 |
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild |
| 58 |
@@ -245,6 +245,9 @@ PATCHES=( |
| 59 |
|
| 60 |
# not upstreamable stuff |
| 61 |
"${FILESDIR}/${PN}-5.2-system-pyuno.patch" |
| 62 |
+ |
| 63 |
+ # TODO: upstream |
| 64 |
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" |
| 65 |
) |
| 66 |
|
| 67 |
pkg_pretend() { |
| 68 |
|
| 69 |
diff --git a/app-office/libreoffice/libreoffice-5.3.0.3.ebuild b/app-office/libreoffice/libreoffice-5.3.0.3.ebuild |
| 70 |
index 66fe06013a..9dc3f33d8a 100644 |
| 71 |
--- a/app-office/libreoffice/libreoffice-5.3.0.3.ebuild |
| 72 |
+++ b/app-office/libreoffice/libreoffice-5.3.0.3.ebuild |
| 73 |
@@ -245,6 +245,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 74 |
PATCHES=( |
| 75 |
# not upstreamable stuff |
| 76 |
"${FILESDIR}/${PN}-5.3-system-pyuno.patch" |
| 77 |
+ |
| 78 |
+ # TODO: upstream |
| 79 |
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" |
| 80 |
) |
| 81 |
|
| 82 |
pkg_pretend() { |
| 83 |
|
| 84 |
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild |
| 85 |
index b8cd07d14d..187b52ebe9 100644 |
| 86 |
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild |
| 87 |
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild |
| 88 |
@@ -244,6 +244,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 89 |
PATCHES=( |
| 90 |
# not upstreamable stuff |
| 91 |
"${FILESDIR}/${PN}-5.3-system-pyuno.patch" |
| 92 |
+ |
| 93 |
+ # TODO: upstream |
| 94 |
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" |
| 95 |
) |
| 96 |
|
| 97 |
pkg_pretend() { |
| 98 |
|
| 99 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 100 |
index e0e9d615e0..edc20fcdbb 100644 |
| 101 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 102 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 103 |
@@ -245,6 +245,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 104 |
PATCHES=( |
| 105 |
# not upstreamable stuff |
| 106 |
"${FILESDIR}/${PN}-5.3-system-pyuno.patch" |
| 107 |
+ |
| 108 |
+ # TODO: upstream |
| 109 |
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" |
| 110 |
) |
| 111 |
|
| 112 |
pkg_pretend() { |
Archives