[packages/wine] - rel 3; ncursesw detection (wine checks for soname exactly instead of checking if it can link to so

arekm arekm at pld-linux.org
Thu Jun 13 17:40:40 CEST 2013


commit 7acebd3b1084faeb71dcc452e89a61e3de656b63
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Jun 13 17:40:37 2013 +0200

    - rel 3; ncursesw detection (wine checks for soname exactly instead of checking if it can link to soname - that fails in case of libncurses.so -> libncursesw.so.6 symlink)

 wine-ncurses.patch | 24 ++++++++++++++++++++++++
 wine.spec          |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/wine.spec b/wine.spec
index 5a10e78..7994dcc 100644
--- a/wine.spec
+++ b/wine.spec
@@ -32,7 +32,7 @@ Summary(pl.UTF-8):	Program pozwalający uruchamiać aplikacje Windows
 Summary(pt_BR.UTF-8):	Executa programas Windows no Linux
 Name:		wine
 Version:	1.4.1
-Release:	2
+Release:	3
 Epoch:		1
 License:	LGPL
 Group:		Applications/Emulators
diff --git a/wine-ncurses.patch b/wine-ncurses.patch
index 0807842..a92ce78 100644
--- a/wine-ncurses.patch
+++ b/wine-ncurses.patch
@@ -66,3 +66,27 @@
  # define CURSES_NAME "ncurses"
  #else
  # define CURSES_NAME "curses"
+diff -urN wine-1.4.1.org/configure.ac wine-1.4.1/configure.ac
+--- wine-1.4.1.org/configure.ac	2012-06-15 21:17:00.000000000 +0200
++++ wine-1.4.1/configure.ac	2013-06-13 17:34:25.210134842 +0200
+@@ -1281,6 +1281,9 @@
+ if test "$ac_cv_header_ncurses_h" = "yes"
+ then
+     WINE_CHECK_SONAME(ncurses,waddch,[CURSESLIBS="-lncurses"])
++    if test "x$ac_cv_lib_soname_ncurses" = "x"; then
++        WINE_CHECK_SONAME(ncursesw,waddch,[CURSESLIBS="-lncursesw"])
++    fi
+ elif test "$ac_cv_header_curses_h" = "yes"
+ then
+     WINE_CHECK_SONAME(curses,waddch,[CURSESLIBS="-lcurses"])
+@@ -1289,8 +1292,8 @@
+ LIBS="$LIBS $CURSESLIBS"
+ AC_CHECK_FUNCS(mousemask)
+ LIBS="$ac_save_LIBS"
+-WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"],
+-                 [lib(n)curses ${notice_platform}development files not found, curses won't be supported.])
++WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses$ac_cv_lib_soname_ncursesw" = "x"],
++                 [lib(n)curses(w) ${notice_platform}development files not found, curses won't be supported.])
+ 
+ dnl **** Check for SANE ****
+ if test "x$with_sane" != "xno"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wine.git/commitdiff/7acebd3b1084faeb71dcc452e89a61e3de656b63



More information about the pld-cvs-commit mailing list