diff options
Diffstat (limited to 'app-editors/emacs')
| -rw-r--r-- | app-editors/emacs/Manifest | 4 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-24.3-r8.ebuild | 11 | ||||
| -rw-r--r-- | app-editors/emacs/files/emacs-24.3-glibc-2.28.patch | 15 |
3 files changed, 23 insertions, 7 deletions
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 3d9a59e..ae8fb8c 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -1,5 +1,5 @@ -DIST emacs-23.4-patches-21.tar.xz 19604 BLAKE2B 97327f2079c496c28122203d233a12199a3c11a8c4efb2107247a4ca4483b898467d73d19d4f0570ec7be2a49dc5f6bd1bc9ee0811f932e7deb6b1c4ca96e362 SHA512 135eda432de64200797456d594f7de811275a7adf792d10a1c3a51ca4bbbbaa3a2c682b9fd577c4d93fbce967ca08d4ac47eb45f031477c3e44c69c14d5d5b48 +DIST emacs-23.4-patches-23.tar.xz 19932 BLAKE2B 941d939d1a66af162016eb7f4a34a3a6d19736ecbd06e2499ccb0bf8806b2b3583de324308698b00d0b47a3d0b8a046e5d5dcb2d681c2bba90ec40b58b4e9855 SHA512 83e2cef7ebe07fc69806d01946c6e96fa0e92b363e9c6531992593eeb29413518217fef05bba48729356af7d1326c3667748185aad971a625daccb803b2bfe58 DIST emacs-24.3-patches-7.tar.xz 6484 BLAKE2B 42da9c01a6fc7fd44b9281f11e1aed9ccc7273533c6deeab54125cabad9ff25757c410f43e32f55e13fc0d5354688a4fdd7e5c05dd8a98e36d9cd1a87f414ce9 SHA512 6e3f6f053ad66e6d298b4fd904c57a6c2a03269ec53e9dfc56f834672a42c8f48eeb20a7ed1bcfb534eb62e0cca6e01b4a1663bebb046a0ce7325b732a378868 DIST emacs-24.3.tar.xz 35565352 BLAKE2B 12474f0d4fb99449bb226834aabcaa15aa4e6c3cd6382786959636d53ea1c9a9662cb158cd6c88589e2760bd3030c3970c919fe35967a90830b77fce9e315df8 SHA512 a1300fa10a9fba2db9735db3d01382bcda89ceec033976c4622796dfdf6d2748ed5fa73edf229182b368190c8acbf706810dd5f344542d2c0d294154bc2d0ca9 DIST emacs-24.4-patches-5.tar.xz 6000 BLAKE2B 5a36e15de2237e8c42bbc57038c301ad9548a24af08b072dcfd175f07950605804649c5c4c3fd3504a864bf314d6a742c588cad26b84a1c283de68e4adb139fd SHA512 0a337ad5b7601f5e453645d1fba99717328c6bc7a5505bcb4bd8e853179cf61be43eb6f3b9370edf0f44aa6485d4847c14554c1592ccc7da87b10dabaaa9d421 -DIST emacs-24.5-patches-4.tar.xz 13632 BLAKE2B 99e70f4ee32c1ba3a66b934de692437aaf0b83eb6fa841ce4569bc58e2bd12802890c2a8496375280c0ce8fa56515918dfdcbc958f349bc2472104e37ad1fcd1 SHA512 569c3a55aaf1102c0bae4ab25ee06372763cd2de8a54e26b3eefd54e585cf90b53c8ffe1ca48eb4fd312a340380fd3f2fcdb584697814bf429129b48fa56ffb5 +DIST emacs-24.5-patches-5.tar.xz 14796 BLAKE2B 3e097f9cdf96a8b0255ce69770f79259ac9bdddbf5aa77c381973e4348d0900ee6dc6ed4af26021811afbb14eff84bc2a370bc8e803d112476554d03b074ce66 SHA512 fe9f9c19ff760e61dcbf1828d4e9e2806c141b47372bdd736be8237183660a28e2ef86a97034d060e244ff81540a2503a1b47655ef84222fddacb3a87f0f34ae diff --git a/app-editors/emacs/emacs-24.3-r8.ebuild b/app-editors/emacs/emacs-24.3-r8.ebuild index 48fcc03..2210ead 100644 --- a/app-editors/emacs/emacs-24.3-r8.ebuild +++ b/app-editors/emacs/emacs-24.3-r8.ebuild @@ -9,9 +9,9 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" SRC_URI="mirror://gnu/emacs/${P}.tar.xz https://dev.gentoo.org/~ulm/emacs/${P}-patches-7.tar.xz - https://dev.gentoo.org/~ulm/emacs/${PN}-23.4-patches-21.tar.xz + https://dev.gentoo.org/~ulm/emacs/${PN}-23.4-patches-23.tar.xz https://dev.gentoo.org/~ulm/emacs/${PN}-24.4-patches-5.tar.xz - https://dev.gentoo.org/~ulm/emacs/${PN}-24.5-patches-4.tar.xz" + https://dev.gentoo.org/~ulm/emacs/${PN}-24.5-patches-5.tar.xz" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="24.3" @@ -101,9 +101,9 @@ S="${WORKDIR}/emacs-${FULL_VERSION}" src_unpack() { unpack ${P}.tar.xz - unpack ${PN}-23.4-patches-21.tar.xz; mv patch{,-23.4} || die + unpack ${PN}-23.4-patches-23.tar.xz; mv patch{,-23.4} || die unpack ${PN}-24.4-patches-5.tar.xz; mv patch{,-24.4} || die - unpack ${PN}-24.5-patches-4.tar.xz; mv patch{,-24.5} || die + unpack ${PN}-24.5-patches-5.tar.xz; mv patch{,-24.5} || die unpack ${P}-patches-7.tar.xz } @@ -116,7 +116,8 @@ src_prepare() { "${FILESDIR}"/${P}-jpeg-version.patch \ "${FILESDIR}"/${P}-giflib-5.patch \ "${FILESDIR}"/${P}-data-start.patch \ - "${FILESDIR}"/${P}-imagemagick-7.patch + "${FILESDIR}"/${P}-imagemagick-7.patch \ + "${FILESDIR}"/${P}-glibc-2.28.patch eapply_user # Fix filename reference in redirected man page diff --git a/app-editors/emacs/files/emacs-24.3-glibc-2.28.patch b/app-editors/emacs/files/emacs-24.3-glibc-2.28.patch new file mode 100644 index 0000000..1867a4c --- /dev/null +++ b/app-editors/emacs/files/emacs-24.3-glibc-2.28.patch @@ -0,0 +1,15 @@ +Fix compilation with glibc-2.28. +https://bugs.gentoo.org/681904 + +--- emacs-24.3-orig/configure.ac ++++ emacs-24.3/configure.ac +@@ -3597,7 +3597,8 @@ + dnl since the preprocessed output is accessible in "conftest.i". + AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ + #include <stdio.h> +-#if !defined (_IO_STDIO_H) && !defined (_STDIO_USES_IOSTREAM) ++#if !defined (_IO_STDIO_H) && !defined (_STDIO_USES_IOSTREAM) \ ++ && !defined _IO_EOF_SEEN && __GNU_LIBRARY__ != 1 + # error "stdio definitions not found" + #endif + ]], [[]])], emacs_pending_output=new, []) |