* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libvterm/files/, dev-libs/libvterm/
@ 2023-09-11 0:54 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-09-11 0:54 UTC (permalink / raw
To: gentoo-commits
commit: 8b140405dc0efdab2a482a4993dbff88fa340dad
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Sun Sep 10 12:51:24 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 00:53:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b140405
dev-libs/libvterm: add 0.3.3
Needed for new neovim.
Bug: https://bugs.gentoo.org/913912
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32708
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/libvterm/Manifest | 1 +
.../libvterm/files/libvterm-0.3.3-slibtool.patch | 102 +++++++++++++++++++++
dev-libs/libvterm/libvterm-0.3.3.ebuild | 43 +++++++++
3 files changed, 146 insertions(+)
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index 7c3016c59f13..ae74e3979919 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -1,4 +1,5 @@
DIST libvterm-0.1.4.tar.gz 69122 BLAKE2B 4f0acc9ec6755c4a840e5df6c32c44e12c5316b5c5918d0e8eada19d819736c3e5b9090b468e32b3141a7fbb5ba226e365be27d6d1d9ca22f9f5e365fc3971c2 SHA512 90b5d47417e3f469df5c6574a27d12bd6bd1571d17cab7c4ac0ee61b1dbcb6361987f6fdfd11e314ea32f8958ec165c319a34d0f77288947c7cbc11de697d524
DIST libvterm-0.3.1.tar.gz 79344 BLAKE2B 2732bc477fb339945c1a9242a8265d182891d507c0dec71371a9e7010434dad0d35152fdeaa32bbf50fdd4bd138bb42e8d95a9771c704d693032e32d37a87452 SHA512 1f4bbee8847a9c8cfab3831a3512b866eb0f90f7d3600c4583d2e1eac18458f21bf5ca4fe4b067b27920a04aa7eac5dd2d4a62f6b7ebd56a417fed60d421853d
DIST libvterm-0.3.2.tar.gz 79471 BLAKE2B c7347257c6cf6bd7b5203a43004eb9fd2c00660f113788fc15f4b29f9224e30017bb24cfe2bc35a7890ca0131ffad37dcfa88104404e8fdce8bbe8cfb8296222 SHA512 aaff71a1c43eff1842cfc1bfd47936ea2c51e75a41506bb0e36860f8f497d198539c10f86c7febc86b3dea8c0de54b03580d59b170176a4207dc411ae59cb035
+DIST libvterm-0.3.3.tar.gz 80024 BLAKE2B 5778533079a467ab3073e150b24a0c7d9fd2249969ed2666df897d6e4a9688bc386a5696fd3a5ce144f196587ad7c86f7980981e81da83e5f68c572da70423f4 SHA512 0117f71988d2c3c1b5e46d0778ce491a8ab9033f3afc9a9905b6d52d0e2adb59ee101667826281470e4c9de5178cbe966f4ecb2c7673e9644c7ca3508491bb49
DIST libvterm-0.3.tar.gz 83861 BLAKE2B a2e8e9d80698880d87f9d26977a4e3dec7b520c3096d0ca6f7823254eeebe51666380ed2a5c05c923dd8b138f15c87e671fdfb03e5511c01711e112cdda9867a SHA512 2a7b6831476465d6a9f7c792406f4e3c4eca0c3dbce4b7031f2646c87e33692128a3d3ce27e1541403772cc0b5eface7bd41325e1e5300c3915bfc0bac97a896
diff --git a/dev-libs/libvterm/files/libvterm-0.3.3-slibtool.patch b/dev-libs/libvterm/files/libvterm-0.3.3-slibtool.patch
new file mode 100644
index 000000000000..f439a1febc89
--- /dev/null
+++ b/dev-libs/libvterm/files/libvterm-0.3.3-slibtool.patch
@@ -0,0 +1,102 @@
+Author: orbea <orbea@riseup.net>
+Date: Tue Aug 29 16:56:23 2023 -0700
+Subject: [PATCH] build: Add a minimal configures script
+
+When building libvterm with slibtool using the rlibtool symlink the
+build will fail when the generated libtool is not found. This file is
+required with rlibtool so that the build can determine if the build
+should be shared, static or both.
+
+This can be solved by adding a minimal configure script.
+
+The build steps are now:
+
+autoreconf -fi
+./configure
+make
+make install
+
+Gentoo Bug: https://bugs.gentoo.org/779034
+diff --git a/Makefile b/Makefile.in
+similarity index 88%
+rename from Makefile
+rename to Makefile.in
+index 41b08ed..763c8c4 100644
+--- a/Makefile
++++ b/Makefile.in
+@@ -1,13 +1,13 @@
+-ifeq ($(shell uname),Darwin)
+- LIBTOOL ?= glibtool
+-else
+- LIBTOOL ?= libtool
+-endif
++top_builddir = @top_builddir@
++
++LIBTOOL = @LIBTOOL@
+
+ ifneq ($(VERBOSE),1)
+ LIBTOOL +=--quiet
+ endif
+
++CC = @CC@
++
+ override CFLAGS +=-Wall -Iinclude -std=c99 -Wpedantic
+
+ ifeq ($(shell uname),SunOS)
+@@ -36,17 +36,21 @@ INCFILES=$(TBLFILES:.tbl=.inc)
+
+ HFILES_INT=$(sort $(wildcard src/*.h)) $(HFILES)
+
++VERSION_MAJOR=@VERSION_MAJOR@
++VERSION_MINOR=@VERSION_MINOR@
++
+ VERSION_CURRENT=0
+ VERSION_REVISION=0
+ VERSION_AGE=0
+
+-VERSION=0.3.3
++VERSION=@PACKAGE_VERSION@
+
+-PREFIX=/usr/local
+-BINDIR=$(PREFIX)/bin
+-LIBDIR=$(PREFIX)/lib
+-INCDIR=$(PREFIX)/include
+-MANDIR=$(PREFIX)/share/man
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++BINDIR=@bindir@
++LIBDIR=@libdir@
++INCDIR=@includedir@
++MANDIR=@mandir@
+ MAN3DIR=$(MANDIR)/man3
+
+ all: $(LIBRARY) $(BINFILES)
+@@ -70,7 +74,7 @@ src/encoding.lo: $(INCFILES)
+
+ bin/%: bin/%.c $(LIBRARY)
+ @echo CC $<
+- @$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $< -lvterm $(LDFLAGS)
++ @$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+
+ t/harness.lo: t/harness.c $(HFILES)
+ @echo CC $<
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..34292fd
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,14 @@
++m4_define([version_major], [0])
++m4_define([version_minor], [3])
++
++AC_INIT([libvterm], [version_major.version_minor])
++AC_CONFIG_FILES([Makefile])
++
++LT_INIT
++
++AC_SUBST([top_builddir], [$abs_builddir])
++
++AC_SUBST([VERSION_MAJOR], [version_major])
++AC_SUBST([VERSION_MINOR], [version_minor])
++
++AC_OUTPUT
diff --git a/dev-libs/libvterm/libvterm-0.3.3.ebuild b/dev-libs/libvterm/libvterm-0.3.3.ebuild
new file mode 100644
index 000000000000..c368ca342d20
--- /dev/null
+++ b/dev-libs/libvterm/libvterm-0.3.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
+HOMEPAGE="https://www.leonerd.org.uk/code/libvterm/"
+SRC_URI="https://launchpad.net/libvterm/trunk/v0.3/+download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+
+BDEPEND="
+ dev-lang/perl
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.3.3-slibtool.patch # 779034
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_compile() {
+ emake VERBOSE=1
+}
+
+src_test() {
+ emake VERBOSE=1 test
+}
+
+src_install() {
+ emake VERBOSE=1 DESTDIR="${D}" install
+
+ find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
+ find "${ED}" -name '*.a' -delete || die
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libvterm/files/, dev-libs/libvterm/
@ 2022-10-01 1:29 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-10-01 1:29 UTC (permalink / raw
To: gentoo-commits
commit: 7ca331f7ccf11b82794e3871db1d9cc1b1c2efa9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 1 01:20:48 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 01:29:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ca331f7
dev-libs/libvterm: drop 0.2, 0.2-r1
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/libvterm/Manifest | 1 -
.../libvterm/files/libvterm-0.2-slibtool.patch | 103 ---------------------
dev-libs/libvterm/libvterm-0.2-r1.ebuild | 40 --------
dev-libs/libvterm/libvterm-0.2.ebuild | 42 ---------
4 files changed, 186 deletions(-)
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index 115db5509890..251907a5c150 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -1,3 +1,2 @@
DIST libvterm-0.1.4.tar.gz 69122 BLAKE2B 4f0acc9ec6755c4a840e5df6c32c44e12c5316b5c5918d0e8eada19d819736c3e5b9090b468e32b3141a7fbb5ba226e365be27d6d1d9ca22f9f5e365fc3971c2 SHA512 90b5d47417e3f469df5c6574a27d12bd6bd1571d17cab7c4ac0ee61b1dbcb6361987f6fdfd11e314ea32f8958ec165c319a34d0f77288947c7cbc11de697d524
-DIST libvterm-0.2.tar.gz 79712 BLAKE2B db17d15550a595652368edd7ee0ccab2a69effa79677a23d6ee94731fc05d685df0de843d2e953cd59d2077922e72834d7ab09eaf5260aed869d9511cfd224a7 SHA512 bc99ae4fbdc165ced92c10fb0168ae6da2ed702208064616fefcd42aba71c57b7d42a08bc5b0e7e1ebda8cc4b5682d16059bdd2edfb12fbd8ac97527e854b14c
DIST libvterm-0.3.tar.gz 83861 BLAKE2B a2e8e9d80698880d87f9d26977a4e3dec7b520c3096d0ca6f7823254eeebe51666380ed2a5c05c923dd8b138f15c87e671fdfb03e5511c01711e112cdda9867a SHA512 2a7b6831476465d6a9f7c792406f4e3c4eca0c3dbce4b7031f2646c87e33692128a3d3ce27e1541403772cc0b5eface7bd41325e1e5300c3915bfc0bac97a896
diff --git a/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch b/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch
deleted file mode 100644
index 5f6356da2761..000000000000
--- a/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From: orbea <orbea@riseup.net>
-Date: Thu, 14 Jul 2022 13:18:26 -0700
-Subject: [PATCH] build: Add a minimal configures script
-
-When building libvterm with slibtool using the rlibtool symlink the
-build will fail when the generated libtool is not found. This file is
-required with rlibtool so that the build can determine if the build
-should be shared, static or both.
-
-This can be solved by adding a minimal configure script.
-
-The build steps are now:
-
-autoreconf -fi
-./configure
-make
-make install
-
-diff --git a/Makefile b/Makefile.in
-similarity index 90%
-rename from Makefile
-rename to Makefile.in
-index e3c1c39..70e7ca2 100644
---- a/Makefile
-+++ b/Makefile.in
-@@ -1,13 +1,13 @@
--ifeq ($(shell uname),Darwin)
-- LIBTOOL ?= glibtool
--else
-- LIBTOOL ?= libtool
--endif
-+top_builddir = @top_builddir@
-+
-+LIBTOOL = @LIBTOOL@
-
- ifneq ($(VERBOSE),1)
- LIBTOOL +=--quiet
- endif
-
-+CC = @CC@
-+
- override CFLAGS +=-Wall -Iinclude -std=c99 -Wpedantic
-
- ifeq ($(shell uname),SunOS)
-@@ -36,20 +36,21 @@ INCFILES=$(TBLFILES:.tbl=.inc)
-
- HFILES_INT=$(sort $(wildcard src/*.h)) $(HFILES)
-
--VERSION_MAJOR=0
--VERSION_MINOR=2
-+VERSION_MAJOR=@VERSION_MAJOR@
-+VERSION_MINOR=@VERSION_MINOR@
-
- VERSION_CURRENT=0
- VERSION_REVISION=0
- VERSION_AGE=0
-
--VERSION=$(VERSION_MAJOR).$(VERSION_MINOR)
-+VERSION=@PACKAGE_VERSION@
-
--PREFIX=/usr/local
--BINDIR=$(PREFIX)/bin
--LIBDIR=$(PREFIX)/lib
--INCDIR=$(PREFIX)/include
--MANDIR=$(PREFIX)/share/man
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+BINDIR=@bindir@
-+LIBDIR=@libdir@
-+INCDIR=@includedir@
-+MANDIR=@mandir@
- MAN3DIR=$(MANDIR)/man3
-
- all: $(LIBRARY) $(BINFILES)
-@@ -73,7 +74,7 @@ src/encoding.lo: $(INCFILES)
-
- bin/%: bin/%.c $(LIBRARY)
- @echo CC $<
-- @$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $< -lvterm $(LDFLAGS)
-+ @$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
-
- t/harness.lo: t/harness.c $(HFILES)
- @echo CC $<
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..39f7767
---- /dev/null
-+++ b/configure.ac
-@@ -0,0 +1,14 @@
-+m4_define([version_major], [0])
-+m4_define([version_minor], [2])
-+
-+AC_INIT([libvterm], [version_major.version_minor])
-+AC_CONFIG_FILES([Makefile])
-+
-+LT_INIT
-+
-+AC_SUBST([top_builddir], [$abs_builddir])
-+
-+AC_SUBST([VERSION_MAJOR], [version_major])
-+AC_SUBST([VERSION_MINOR], [version_minor])
-+
-+AC_OUTPUT
diff --git a/dev-libs/libvterm/libvterm-0.2-r1.ebuild b/dev-libs/libvterm/libvterm-0.2-r1.ebuild
deleted file mode 100644
index 3e8037c9ec7b..000000000000
--- a/dev-libs/libvterm/libvterm-0.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
-HOMEPAGE="https://www.leonerd.org.uk/code/libvterm/"
-SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-# Fedora have a revert patch for now:
-# https://src.fedoraproject.org/rpms/libvterm/blob/rawhide/f/libvterm-0.2-fix-resize-buffer.patch
-# so let's see if 0.2.1 is any better or if this is actually needed for us?
-#KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
-
-BDEPEND="
- dev-lang/perl
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-slibtool.patch # 779034
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_compile() {
- emake VERBOSE=1
-}
-
-src_install() {
- emake VERBOSE=1 DESTDIR="${D}" install
- find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
-}
diff --git a/dev-libs/libvterm/libvterm-0.2.ebuild b/dev-libs/libvterm/libvterm-0.2.ebuild
deleted file mode 100644
index 84e1e689e51e..000000000000
--- a/dev-libs/libvterm/libvterm-0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
-HOMEPAGE="https://www.leonerd.org.uk/code/libvterm/"
-SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-# Fedora have a revert patch for now:
-# https://src.fedoraproject.org/rpms/libvterm/blob/rawhide/f/libvterm-0.2-fix-resize-buffer.patch
-# so let's see if 0.2.1 is any better or if this is actually needed for us?
-#KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
-
-BDEPEND="
- dev-lang/perl
- sys-devel/libtool
- virtual/pkgconfig
-"
-RDEPEND="!dev-libs/libvterm-neovim"
-
-src_compile() {
- tc-export CC
-
- append-cflags -fPIC
- emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
- emake \
- VERBOSE=1 \
- PREFIX="${EPREFIX}/usr" \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- DESTDIR="${D}" install
-
- find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-11 0:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-11 0:54 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libvterm/files/, dev-libs/libvterm/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-10-01 1:29 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox