summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-09-18 02:34:19 +0100
committerSam James <sam@gentoo.org>2022-09-18 02:34:19 +0100
commit7184d0d1b3e808e77232f9334120fc68e010e5d2 (patch)
treeb50e094ed8b8ade1ea68a81b039fd912d6ebefd9 /app-text/expander
parentsci-electronics/xcircuit: add github upstream metadata (diff)
downloadgentoo-7184d0d1b3e808e77232f9334120fc68e010e5d2.tar.gz
gentoo-7184d0d1b3e808e77232f9334120fc68e010e5d2.tar.bz2
gentoo-7184d0d1b3e808e77232f9334120fc68e010e5d2.zip
app-text/expander: EAPI 8, fix implicit func. declarations
Closes: https://bugs.gentoo.org/870898 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-text/expander')
-rw-r--r--app-text/expander/expander-2.05-r3.ebuild (renamed from app-text/expander/expander-2.0.5-r2.ebuild)16
-rw-r--r--app-text/expander/files/expander-2.05-clang15.patch60
-rw-r--r--app-text/expander/files/expander-2.05-gentoo.patch (renamed from app-text/expander/files/expander-2.0.5-gentoo.patch)0
3 files changed, 69 insertions, 7 deletions
diff --git a/app-text/expander/expander-2.0.5-r2.ebuild b/app-text/expander/expander-2.05-r3.ebuild
index 6684a72038d5..ee8a110a01e6 100644
--- a/app-text/expander/expander-2.0.5-r2.ebuild
+++ b/app-text/expander/expander-2.05-r3.ebuild
@@ -1,21 +1,23 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit toolchain-funcs
DESCRIPTION="Expander is a utility that acts as a filter for text editors"
HOMEPAGE="http://www.nedit.org"
-SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_2.05.tar.gz"
+SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_${PV}.tar.gz"
+S="${WORKDIR}"/${PN}
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-clang15.patch
+)
src_compile() {
emake -C src CC="$(tc-getCC)"
@@ -35,7 +37,7 @@ src_install() {
pkg_postinst() {
elog
- elog "Instructions for using expander with NEdit are in /usr/share/doc/${PF}/INSTALL"
- elog "Macro, definition and template files can be found in /usr/share/${P}"
+ elog "Instructions for using expander with NEdit are in ${EROOT}/usr/share/doc/${PF}/INSTALL"
+ elog "Macro, definition and template files can be found in ${EROOT}/usr/share/${P}"
elog
}
diff --git a/app-text/expander/files/expander-2.05-clang15.patch b/app-text/expander/files/expander-2.05-clang15.patch
new file mode 100644
index 000000000000..a7ae9bed3ddf
--- /dev/null
+++ b/app-text/expander/files/expander-2.05-clang15.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/870898
+--- a/src/align_columns.c
++++ b/src/align_columns.c
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <ctype.h>
++#include <unistd.h>
+
+ /*============================================================================*/
+ /* SYMBOL DEFINITIONS */
+--- a/src/align_comments.c
++++ b/src/align_comments.c
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <ctype.h>
++#include <unistd.h>
+
+ /*===========================================================================*/
+ /* SYMBOL DEFINITIONS */
+--- a/src/boxcomment.c
++++ b/src/boxcomment.c
+@@ -59,6 +59,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <unistd.h>
+
+ /*============================================================================*/
+ /* SYMBOL DEFINITIONS */
+--- a/src/expander.c
++++ b/src/expander.c
+@@ -114,6 +114,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <ctype.h>
++#include <unistd.h>
+
+ /*==========================================================================*/
+ /* MACRO DEFINITIONS */
+@@ -1264,7 +1265,7 @@ bool_t locate_definition(
+ bool_t ignore_definition = FALSE;
+ int i;
+ char line[ MAXBUF ];
+- static level = 0;
++ static int level = 0;
+
+ /*---------------------
+ * Recursion protection.
+--- a/src/where_is.c
++++ b/src/where_is.c
+@@ -54,6 +54,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <unistd.h>
+
+ typedef int bool_t;
+
diff --git a/app-text/expander/files/expander-2.0.5-gentoo.patch b/app-text/expander/files/expander-2.05-gentoo.patch
index 460a8164cee5..460a8164cee5 100644
--- a/app-text/expander/files/expander-2.0.5-gentoo.patch
+++ b/app-text/expander/files/expander-2.05-gentoo.patch