mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-libs/libvterm: drop 0.2, 0.2-r1
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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"
|
||||
}
|
||||
@@ -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"
|
||||
}
|
||||
Reference in New Issue
Block a user