summaryrefslogtreecommitdiff
path: root/x11-libs/libyui-ncurses/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-08-29 20:19:23 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-08-29 20:19:23 +0100
commit12bb627384ddfd47382b9f1b6464481a58d01ebb (patch)
treef9760c04ccd4fcd7de214e2acd5b0e43fb530aa9 /x11-libs/libyui-ncurses/files
parent5fdd950c7ae03e12746a45c86d85861beaacc846 (diff)
gentoo resync : 29.08.2018
Diffstat (limited to 'x11-libs/libyui-ncurses/files')
-rw-r--r--x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch4
-rw-r--r--x11-libs/libyui-ncurses/files/libyui-ncurses-2.48.3-ncurses.patch29
2 files changed, 31 insertions, 2 deletions
diff --git a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch
index b69aafe797b1..9da76f194598 100644
--- a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch
+++ b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch
@@ -1,7 +1,7 @@
Fixes building with sys-libs/ncurses[tinfo]
---- cmake/Modules/FindCurses6.cmake.orig 2014-09-25 16:32:20.000000000 +0400
-+++ cmake/Modules/FindCurses6.cmake 2014-09-25 16:33:16.000000000 +0400
+--- a/cmake/Modules/FindCurses6.cmake 2014-09-25 16:32:20.000000000 +0400
++++ b/cmake/Modules/FindCurses6.cmake 2014-09-25 16:33:16.000000000 +0400
@@ -11,11 +11,12 @@
FIND_LIBRARY(CURSES6_TINFO_LIBRARY NAMES tinfo PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH)
ENDFOREACH()
diff --git a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.48.3-ncurses.patch b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.48.3-ncurses.patch
new file mode 100644
index 000000000000..7c58ce47ab69
--- /dev/null
+++ b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.48.3-ncurses.patch
@@ -0,0 +1,29 @@
+From 6444e043b58bf7703e4fc9035f380f3817207525 Mon Sep 17 00:00:00 2001
+From: Stefan Hundhammer <shundhammer@suse.de>
+Date: Thu, 4 Jan 2018 17:21:56 +0100
+Subject: [PATCH] Removed function that conflicts with newer NCurses lib
+ (bsc#1074600)
+
+---
+ src/ncursesw.h | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/src/ncursesw.h b/src/ncursesw.h
+index d25923a..c8b95bb 100644
+--- a/src/ncursesw.h
++++ b/src/ncursesw.h
+@@ -1607,14 +1607,6 @@ class NCursesWindow
+ return ::wtouchln( w, s, cnt, ( int )( changed ? 1 : 0 ) );
+ }
+
+- /**
+- * Return TRUE if line is marked as changed, FALSE otherwise
+- */
+- bool is_linetouched( int line ) const
+- {
+- return ( ::is_linetouched( w, line ) ? TRUE : FALSE );
+- }
+-
+ /**
+ * Return TRUE if window is marked as changed, FALSE otherwise
+ */