* [gentoo-commits] repo/gentoo:master commit in: dev-lang/nprolog/, dev-lang/nprolog/files/
@ 2024-10-03 15:08 Maciej Barć
0 siblings, 0 replies; 2+ messages in thread
From: Maciej Barć @ 2024-10-03 15:08 UTC (permalink / raw
To: gentoo-commits
commit: 14ca378a00a5ea2ba252d6f6cd417315727763de
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 3 12:47:20 2024 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Oct 3 15:08:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14ca378a
dev-lang/nprolog: fix implicit addwstr
Closes: https://bugs.gentoo.org/939034
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-lang/nprolog/files/nprolog-3.22-ncursesw.patch | 13 +++++++++++++
dev-lang/nprolog/nprolog-3.22.ebuild | 10 ++++++++++
dev-lang/nprolog/nprolog-3.30.ebuild | 10 ++++++++++
3 files changed, 33 insertions(+)
diff --git a/dev-lang/nprolog/files/nprolog-3.22-ncursesw.patch b/dev-lang/nprolog/files/nprolog-3.22-ncursesw.patch
new file mode 100644
index 000000000000..695c055b3f17
--- /dev/null
+++ b/dev-lang/nprolog/files/nprolog-3.22-ncursesw.patch
@@ -0,0 +1,13 @@
+diff --git a/edlog.c b/edlog.c
+index 206e6a6..317a4ee 100644
+--- a/edlog.c
++++ b/edlog.c
+@@ -8,7 +8,7 @@
+ #define _XOPEN_SOURCE_EXTENDED
+ #define NCURSES_OPAQUE 1
+ #ifdef __linux__
+-#include <ncurses.h>
++#include <ncursesw/ncurses.h>
+ #else
+ #include <curses.h>
+ #endif
diff --git a/dev-lang/nprolog/nprolog-3.22.ebuild b/dev-lang/nprolog/nprolog-3.22.ebuild
index 40d3b000da40..39a1d076726e 100644
--- a/dev-lang/nprolog/nprolog-3.22.ebuild
+++ b/dev-lang/nprolog/nprolog-3.22.ebuild
@@ -22,8 +22,18 @@ fi
LICENSE="BSD-2"
SLOT="0"
+PATCHES=( "${FILESDIR}/${PN}-3.22-ncursesw.patch" )
+
DOCS=( README{,-ja}.md document )
+src_prepare() {
+ if [[ -f edlog ]] ; then
+ rm edlog || die
+ fi
+
+ default
+}
+
src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
}
diff --git a/dev-lang/nprolog/nprolog-3.30.ebuild b/dev-lang/nprolog/nprolog-3.30.ebuild
index 40d3b000da40..39a1d076726e 100644
--- a/dev-lang/nprolog/nprolog-3.30.ebuild
+++ b/dev-lang/nprolog/nprolog-3.30.ebuild
@@ -22,8 +22,18 @@ fi
LICENSE="BSD-2"
SLOT="0"
+PATCHES=( "${FILESDIR}/${PN}-3.22-ncursesw.patch" )
+
DOCS=( README{,-ja}.md document )
+src_prepare() {
+ if [[ -f edlog ]] ; then
+ rm edlog || die
+ fi
+
+ default
+}
+
src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/nprolog/, dev-lang/nprolog/files/
@ 2025-01-27 14:51 Maciej Barć
0 siblings, 0 replies; 2+ messages in thread
From: Maciej Barć @ 2025-01-27 14:51 UTC (permalink / raw
To: gentoo-commits
commit: e9c0968b659c65090f696be0191edf75871b1d38
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 14:06:05 2025 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 14:50:58 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9c0968b
dev-lang/nprolog: bump to 3.88
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-lang/nprolog/Manifest | 1 +
...og-3.88-makefile-CURSES_CFLAGS-edlog-rule.patch | 29 +++++++++++
dev-lang/nprolog/nprolog-3.88.ebuild | 60 ++++++++++++++++++++++
3 files changed, 90 insertions(+)
diff --git a/dev-lang/nprolog/Manifest b/dev-lang/nprolog/Manifest
index e232747f9ee4..54115b5d9db0 100644
--- a/dev-lang/nprolog/Manifest
+++ b/dev-lang/nprolog/Manifest
@@ -1 +1,2 @@
DIST nprolog-3.53.tar.gz 682333 BLAKE2B 827e6ff1b066e42fd10df8788a6752ef4df7692cc3d11ad6b1bb001b72d2e916997abae21e182c161ac1a1098362a2e8430a1b1500b4ad97ca74a00db19e70d2 SHA512 10de04a1737999203d23911b3c36ce506b112476238ec1c28bcade2a459cec6d8ac2310dd8ba3bd1af82aa390444ff5c37536585429faa7c12fa9ee154243087
+DIST nprolog-3.88.gh.tar.gz 1337137 BLAKE2B 0d8f8d5e8242e3ab172f0a1256252ef99b6daf76a77fb75710c0286d55aa02e79e78601ec4347e42d88411cc7528d4e3b041496df04335496b71fc41cb3573c6 SHA512 12ef940792a6c9cd44cafad5440829d43b0c4736732341172255733f163d48b189233b62288e4fd59d36e5a378742f783a0400c2c4dc3d6b06570143b06685db
diff --git a/dev-lang/nprolog/files/nprolog-3.88-makefile-CURSES_CFLAGS-edlog-rule.patch b/dev-lang/nprolog/files/nprolog-3.88-makefile-CURSES_CFLAGS-edlog-rule.patch
new file mode 100644
index 000000000000..d46620dbcbfb
--- /dev/null
+++ b/dev-lang/nprolog/files/nprolog-3.88-makefile-CURSES_CFLAGS-edlog-rule.patch
@@ -0,0 +1,29 @@
+From 6e47a272b0a9491436ac732272be13431ee51161 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Bar=C4=87?= <xgqt@gentoo.org>
+Date: Mon, 27 Jan 2025 14:33:14 +0100
+Subject: [PATCH 1/2] makefile: add CURSES_CFLAGS to edlog rule
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Maciej Barć <xgqt@gentoo.org>
+---
+ makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/makefile b/makefile
+index 0d0734d..c2458e0 100644
+--- a/makefile
++++ b/makefile
+@@ -47,7 +47,7 @@ $(EDLOG): $(EDLOG_OBJS)
+ $(CC) $(LDFLAGS) $^ -o $@ $(CURSES_LIBS)
+
+ edlog.o: edlog.c edlog.h term.h
+- $(CC) $(CFLAGS) -c edlog.c
++ $(CC) $(CFLAGS) -c edlog.c $(CURSES_CFLAGS)
+
+ install: $(NPL) $(EDLOG)
+ mkdir -p $(DEST)
+--
+2.45.3
+
diff --git a/dev-lang/nprolog/nprolog-3.88.ebuild b/dev-lang/nprolog/nprolog-3.88.ebuild
new file mode 100644
index 000000000000..439e10d62cbb
--- /dev/null
+++ b/dev-lang/nprolog/nprolog-3.88.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Interpreter and compiler to be compatible with Arity/Prolog32"
+HOMEPAGE="https://github.com/sasagawa888/nprolog/"
+
+if [[ "${PV}" == *9999* ]] ; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/sasagawa888/${PN}"
+else
+ SRC_URI="https://github.com/sasagawa888/${PN}/archive/refs/tags/%EF%BD%96${PV}.tar.gz
+ -> ${P}.gh.tar.gz"
+ S="${WORKDIR}/${PN}--${PV}"
+
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc"
+
+PATCHES=(
+ "${FILESDIR}/nprolog-3.22-ncursesw.patch"
+ "${FILESDIR}/nprolog-3.88-makefile-CURSES_CFLAGS-edlog-rule.patch"
+)
+
+DOCS=( README{,-ja}.md )
+
+src_prepare() {
+ if [[ -f edlog ]] ; then
+ rm edlog || die
+ fi
+
+ default
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ exeinto /usr/bin
+ doexe npl
+
+ insinto "/usr/share/${PN}"
+ doins -r example library
+
+ if use doc ; then
+ DOCS+=( document )
+
+ docompress -x "/usr/share/doc/${PF}/document"
+ fi
+
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-01-27 14:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-03 15:08 [gentoo-commits] repo/gentoo:master commit in: dev-lang/nprolog/, dev-lang/nprolog/files/ Maciej Barć
-- strict thread matches above, loose matches on Subject: below --
2025-01-27 14:51 Maciej Barć
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox