summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild10
-rw-r--r--changelog3
-rw-r--r--libncurses.5-dev.pkg/control1
-rw-r--r--libncurses.6-dev.pkg/control1
-rw-r--r--libtinfow.5.pkg/control9
-rw-r--r--libtinfow.5.pkg/files2
-rw-r--r--libtinfow.6.pkg/control8
-rw-r--r--libtinfow.6.pkg/files2
8 files changed, 4 insertions, 32 deletions
diff --git a/build b/build
index 8bddaf2..beacb0a 100755
--- a/build
+++ b/build
@@ -16,22 +16,20 @@ common_opts = \
--with-cxx-shared \
--without-debug \
--without-profile \
+ --with-termlib=tinfo \
+ --with-ticlib=tic \
--disable-termcap \
--enable-symlinks \
--enable-const
build_ncurses_opts = $(common_opts) \
--with-install-prefix="$${PWD}/dest-ncurses" \
- --enable-overwrite \
- --with-termlib=tinfo \
- --with-ticlib=tic
+ --enable-overwrite
build_ncursesw_opts = $(common_opts) \
--with-install-prefix="$${PWD}/dest-ncursesw" \
--includedir=/usr/include/ncursesw \
--without-progs \
--disable-overwrite \
- --enable-widec \
- --with-termlib=tinfow \
- --with-ticlib=ticw
+ --enable-widec
build_ncurses_legacy_opts = $(build_ncurses_opts) \
--with-install-prefix="$${PWD}/dest-ncurses-legacy" \
--with-abi-version=$(legacy_abi_ver)
diff --git a/changelog b/changelog
index 11b74f3..0760348 100644
--- a/changelog
+++ b/changelog
@@ -2,9 +2,6 @@ ncurses (6.1+20190630-2) trunk
* ncurses-dbg: Actually include debugging symbols (normally always excluded
from the shared libraries by upstream).
- * libtinfow.5, libtinfow.6: New binary packages to provide wide-character
- terminfo libraries. Fixes segmentation fault in termattrs_sp() with
- libncursesw.6.
-- Patrick McDermott <patrick.mcdermott@libiquity.com> Sat, 06 Jul 2019 16:24:35 -0400
diff --git a/libncurses.5-dev.pkg/control b/libncurses.5-dev.pkg/control
index 7b19d13..c3cd4d0 100644
--- a/libncurses.5-dev.pkg/control
+++ b/libncurses.5-dev.pkg/control
@@ -6,7 +6,6 @@ Depends: ncurses-common (= ${Source-Version}),
libncurses++.5 (= ${Binary-Version}),
libncurses++w.5 (= ${Binary-Version}),
libtinfo.5 (= ${Binary-Version}),
- libtinfow.5 (= ${Binary-Version}),
Description: curses library (legacy ABI) - development files
${Common-Description}
.
diff --git a/libncurses.6-dev.pkg/control b/libncurses.6-dev.pkg/control
index 6df7928..318a0f6 100644
--- a/libncurses.6-dev.pkg/control
+++ b/libncurses.6-dev.pkg/control
@@ -6,7 +6,6 @@ Depends: ncurses-common (= ${Source-Version}),
libncurses++.6 (= ${Binary-Version}),
libncurses++w.6 (= ${Binary-Version}),
libtinfo.6 (= ${Binary-Version}),
- libtinfow.6 (= ${Binary-Version}),
Description: curses library - development files
${Common-Description}
.
diff --git a/libtinfow.5.pkg/control b/libtinfow.5.pkg/control
deleted file mode 100644
index 061a998..0000000
--- a/libtinfow.5.pkg/control
+++ /dev/null
@@ -1,9 +0,0 @@
-Architecture: any
-Platform: all
-Depends: ncurses-common (= ${Source-Version}), terminfo-linux [any-linux-any],
- ${Shlib-Depends}
-Description: curses terminfo library with wide character support (legacy ABI)
- ${Common-Description}
- .
- This package provides the terminfo (legacy ABI) shared library with wide
- character support.
diff --git a/libtinfow.5.pkg/files b/libtinfow.5.pkg/files
deleted file mode 100644
index ce5d9f8..0000000
--- a/libtinfow.5.pkg/files
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/lib/*/libtinfow.so.*
-/usr/lib/*/libticw.so.*
diff --git a/libtinfow.6.pkg/control b/libtinfow.6.pkg/control
deleted file mode 100644
index 429d564..0000000
--- a/libtinfow.6.pkg/control
+++ /dev/null
@@ -1,8 +0,0 @@
-Architecture: any
-Platform: all
-Depends: ncurses-common (= ${Source-Version}), terminfo-linux [any-linux-any],
- ${Shlib-Depends}
-Description: curses terminfo library with wide character support
- ${Common-Description}
- .
- This package provides the terminfo shared library with wide character support.
diff --git a/libtinfow.6.pkg/files b/libtinfow.6.pkg/files
deleted file mode 100644
index ce5d9f8..0000000
--- a/libtinfow.6.pkg/files
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/lib/*/libtinfow.so.*
-/usr/lib/*/libticw.so.*