Upgrade to 6.3.
Change to upstream provided mirror for relases. Switch to new valid PGP key 19882D92DDA4C400C22C0D56CC2AF4472167BE03 for which upstream provided signatures on their website https://invisible-island.net/public/public.html Add patch to prevent linking against test libraries. Add patch to fix leaking of flags into pkgconfig files: https://bugs.archlinux.org/task/68523 Compile with flag for versioned symbols: https://bugs.archlinux.org/task/72278 Sort configure flags mainly alphabetically. Replace the use of echo with printf and sort fixes in package() by topic.ledoian
parent
d7fa1327d2
commit
8d2b043f4f
@ -0,0 +1,58 @@
|
|||||||
|
diff -ruN a/c++/Makefile.in b/c++/Makefile.in
|
||||||
|
--- a/c++/Makefile.in 2021-07-03 20:53:57.000000000 +0200
|
||||||
|
+++ b/c++/Makefile.in 2021-11-03 10:58:04.147647447 +0100
|
||||||
|
@@ -118,7 +118,7 @@
|
||||||
|
-l@FORM_NAME@@USE_LIB_SUFFIX@ \
|
||||||
|
-l@MENU_NAME@@USE_LIB_SUFFIX@ \
|
||||||
|
-l@PANEL_NAME@@USE_LIB_SUFFIX@ \
|
||||||
|
- -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
|
||||||
|
+ -lncurses@USE_LIB_SUFFIX@
|
||||||
|
|
||||||
|
LIBROOT = ncurses++
|
||||||
|
|
||||||
|
@@ -157,8 +157,7 @@
|
||||||
|
LDFLAGS_DEFAULT = $(LINK_@DFT_UPR_MODEL@) $(LDFLAGS_@DFT_UPR_MODEL@)
|
||||||
|
|
||||||
|
# flags for library built by this makefile
|
||||||
|
-LDFLAGS = $(TEST_ARGS) @LDFLAGS@ \
|
||||||
|
- @LD_MODEL@ $(TEST_LIBS) @LIBS@ $(CXXLIBS)
|
||||||
|
+LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ $(CXXLIBS)
|
||||||
|
|
||||||
|
AUTO_SRC = \
|
||||||
|
etip.h
|
||||||
|
diff -ruN a/form/Makefile.in b/form/Makefile.in
|
||||||
|
--- a/form/Makefile.in 2021-07-03 17:45:33.000000000 +0200
|
||||||
|
+++ b/form/Makefile.in 2021-11-03 10:58:45.301114373 +0100
|
||||||
|
@@ -110,7 +110,7 @@
|
||||||
|
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
|
||||||
|
|
||||||
|
SHLIB_DIRS = -L../lib
|
||||||
|
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
|
||||||
|
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@
|
||||||
|
|
||||||
|
RPATH_LIST = @RPATH_LIST@
|
||||||
|
RESULTING_SYMS = @RESULTING_SYMS@
|
||||||
|
diff -ruN a/menu/Makefile.in b/menu/Makefile.in
|
||||||
|
--- a/menu/Makefile.in 2021-07-03 17:45:33.000000000 +0200
|
||||||
|
+++ b/menu/Makefile.in 2021-11-03 10:58:59.461160284 +0100
|
||||||
|
@@ -110,7 +110,7 @@
|
||||||
|
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
|
||||||
|
|
||||||
|
SHLIB_DIRS = -L../lib
|
||||||
|
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
|
||||||
|
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@
|
||||||
|
|
||||||
|
RPATH_LIST = @RPATH_LIST@
|
||||||
|
RESULTING_SYMS = @RESULTING_SYMS@
|
||||||
|
diff -ruN a/panel/Makefile.in b/panel/Makefile.in
|
||||||
|
--- a/panel/Makefile.in 2021-07-03 17:45:33.000000000 +0200
|
||||||
|
+++ b/panel/Makefile.in 2021-11-03 10:59:33.957938691 +0100
|
||||||
|
@@ -112,7 +112,7 @@
|
||||||
|
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
|
||||||
|
|
||||||
|
SHLIB_DIRS = -L../lib
|
||||||
|
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
|
||||||
|
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@
|
||||||
|
|
||||||
|
RPATH_LIST = @RPATH_LIST@
|
||||||
|
RESULTING_SYMS = @RESULTING_SYMS@
|
@ -0,0 +1,24 @@
|
|||||||
|
diff -ruN a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
|
||||||
|
--- a/misc/gen-pkgconfig.in 2021-08-07 23:36:33.000000000 +0200
|
||||||
|
+++ b/misc/gen-pkgconfig.in 2021-11-03 11:12:51.127160950 +0100
|
||||||
|
@@ -83,7 +83,7 @@
|
||||||
|
fi
|
||||||
|
|
||||||
|
lib_flags=
|
||||||
|
-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@
|
||||||
|
+for opt in -L$libdir @LIBS@
|
||||||
|
do
|
||||||
|
case $opt in
|
||||||
|
-l*) # LIBS is handled specially below
|
||||||
|
diff -ruN a/misc/ncurses-config.in b/misc/ncurses-config.in
|
||||||
|
--- a/misc/ncurses-config.in 2021-08-07 23:36:14.000000000 +0200
|
||||||
|
+++ b/misc/ncurses-config.in 2021-11-03 11:26:12.393533954 +0100
|
||||||
|
@@ -101,7 +101,7 @@
|
||||||
|
# There is no portable way to find the list of standard library directories.
|
||||||
|
# Require a POSIX shell anyway, to keep this simple.
|
||||||
|
lib_flags=
|
||||||
|
-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ $LIBS
|
||||||
|
+for opt in -L$libdir $LIBS
|
||||||
|
do
|
||||||
|
case $opt in
|
||||||
|
-specs*) # ignore linker specs-files which were used to build library
|
Loading…
Reference in New Issue