pool/ncurses
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix main patch ncurses-6.1.dif

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=445
This commit is contained in:
Dr. Werner Fink 2019-10-14 10:24:07 +00:00 committed by Git OBS Bridge
parent 0ff19ae226
commit f6e037c2b9
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ncurses-6.1.dif
View File

@ -359,16 +359,7 @@
arrays of characters representing all or part of a CRT screen. arrays of characters representing all or part of a CRT screen.
--- misc/gen-pkgconfig.in --- misc/gen-pkgconfig.in
+++ misc/gen-pkgconfig.in 2019-08-12 08:07:59.759015287 +0000 +++ misc/gen-pkgconfig.in 2019-08-12 08:07:59.759015287 +0000
@@ -78,7 +78,7 @@ if [ "$includedir" != "/usr/include" ]; @@ -127,6 +127,7 @@ do
fi
LDFLAGS=
-if [ "$libdir" != "/usr/lib" ]; then
+if [ "$libdir" != "/usr/lib" -a "$libdir" != "/usr/lib64" ]; then
LDFLAGS="$LDFLAGS -L\${libdir}"
fi
if [ "x@EXTRA_LDFLAGS@" != "x" ]; then
@@ -101,6 +101,7 @@ do
LIBS="-l$name" LIBS="-l$name"
desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
@ -376,7 +367,7 @@
reqs= reqs=
if [ $name = $MAIN_LIBRARY ]; then if [ $name = $MAIN_LIBRARY ]; then
@@ -110,9 +111,11 @@ do @@ -137,9 +138,11 @@ do
desc="$desc terminal interface library" desc="$desc terminal interface library"
elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}" reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}"
@ -388,7 +379,7 @@
desc="$desc add-on library" desc="$desc add-on library"
fi fi
@@ -122,6 +125,8 @@ do @@ -149,6 +152,8 @@ do
[ $NEED_TINFO != yes ] ; then [ $NEED_TINFO != yes ] ; then
[ -n "$reqs" ] && reqs="$reqs, " [ -n "$reqs" ] && reqs="$reqs, "
reqs="${reqs}${SUB_LIBRARY}${suffix}" reqs="${reqs}${SUB_LIBRARY}${suffix}"