mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Added patch to fix detection of ncurses library on Archlinux.
This commit is contained in:
Sebastian Lackner
parent
027b85ed1b
commit
faf78575ac
@ -45,7 +45,7 @@ Included bugfixes and improvements
|
||||
|
||||
**Bugs fixed in Wine-Compholio 1.7.25 [53]:**
|
||||
|
||||
* ATL IOCS data should not be stored in GWLP_USERDATA ([Wine Bug #21767](http://bugs.winehq.org/show_bug.cgi?id=21767 "JLC's Internet TV crashes on startup"))
|
||||
* ATL IOCS data should not be stored in GWLP_USERDATA ([Wine Bug #21767](http://bugs.winehq.org/show_bug.cgi?id=21767 "Multiple applications storing AxHostWindow instance pointer in GWLP_USERDATA crash on startup (Wine uses GWLP_USERDATA to store IOCS)(JLC's Internet TV, Anime Studio Pro 10.x)"))
|
||||
* Add Dynamic DST exceptions for Israel Standard Time ([Wine Bug #36374](http://bugs.winehq.org/show_bug.cgi?id=36374 "Israel timezone handled incorrectly"))
|
||||
* Add default ACLs for user shell folders
|
||||
* Allow special characters in pipe names ([Wine Bug #28995](http://bugs.winehq.org/show_bug.cgi?id=28995 "Unable to use named pipes with \">\" character in the name"))
|
||||
|
||||
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -5,6 +5,7 @@ wine-compholio (1.7.26) UNRELEASED; urgency=low
|
||||
* Added patch to use dynamic linking for libpcap.
|
||||
* Added patch to fix issues when using setcap on wine executable.
|
||||
* Added patch to improve heap allocation performance by using more freelists.
|
||||
* Added patch to fix detection of ncurses on Archlinux (avoids ugly workarounds at build time).
|
||||
-- Erich E. Hoover <erich.e.hoover@gmail.com> Wed, 27 Aug 2014 00:34:51 +0200
|
||||
|
||||
wine-compholio (1.7.25) unstable; urgency=low
|
||||
|
||||
@ -15,6 +15,7 @@ PATCHLIST := \
|
||||
comctl32-ImageList.ok \
|
||||
comctl32-LoadIconMetric.ok \
|
||||
configure-Absolute_RPATH.ok \
|
||||
configure-Detect_Ncurses.ok \
|
||||
dsound-Fast_Mixer.ok \
|
||||
fonts-Missing_Fonts.ok \
|
||||
iphlpapi-TCP_Table.ok \
|
||||
@ -220,6 +221,21 @@ configure-Absolute_RPATH.ok:
|
||||
echo '+ { "configure-Absolute_RPATH", "Sebastian Lackner", "Also add the absolute RPATH when linking against libwine." },'; \
|
||||
) > configure-Absolute_RPATH.ok
|
||||
|
||||
# Patchset configure-Detect_Ncurses
|
||||
# |
|
||||
# | Included patches:
|
||||
# | * Fix detection of ncurses library on Archlinux. [by Sebastian Lackner]
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * configure.ac, dlls/kernel32/term.c, programs/wineconsole/curses.c
|
||||
# |
|
||||
.INTERMEDIATE: configure-Detect_Ncurses.ok
|
||||
configure-Detect_Ncurses.ok:
|
||||
$(call APPLY_FILE,configure-Detect_Ncurses/0001-configure-Fix-detection-of-ncurses-library-on-Archli.patch)
|
||||
@( \
|
||||
echo '+ { "configure-Detect_Ncurses", "Sebastian Lackner", "Fix detection of ncurses library on Archlinux." },'; \
|
||||
) > configure-Detect_Ncurses.ok
|
||||
|
||||
# Patchset dsound-Fast_Mixer
|
||||
# |
|
||||
# | Included patches:
|
||||
|
||||
@ -0,0 +1,81 @@
|
||||
From d32cbf71cb4f53a9cd9f47b7a65551da850f60db Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Mon, 1 Sep 2014 20:32:15 +0200
|
||||
Subject: configure: Fix detection of ncurses library on Archlinux.
|
||||
|
||||
---
|
||||
configure.ac | 5 +++--
|
||||
dlls/kernel32/term.c | 4 +++-
|
||||
programs/wineconsole/curses.c | 4 +++-
|
||||
3 files changed, 9 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ba0c927..5c2fbe4 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1370,7 +1370,8 @@ dnl **** Check which curses lib to use ***
|
||||
CURSES_LIBS=""
|
||||
if test "$ac_cv_header_ncurses_h" = "yes"
|
||||
then
|
||||
- WINE_CHECK_SONAME(ncurses,waddch,[CURSES_LIBS="-lncurses"])
|
||||
+ WINE_CHECK_SONAME(ncurses,waddch,[CURSES_LIBS="-lncurses"],
|
||||
+ [WINE_CHECK_SONAME(ncursesw,waddch,[CURSES_LIBS="-lncursesw"])])
|
||||
elif test "$ac_cv_header_curses_h" = "yes"
|
||||
then
|
||||
WINE_CHECK_SONAME(curses,waddch,[CURSES_LIBS="-lcurses"])
|
||||
@@ -1379,7 +1380,7 @@ ac_save_LIBS="$LIBS"
|
||||
LIBS="$LIBS $CURSES_LIBS"
|
||||
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"],
|
||||
+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 ${notice_platform}development files not found, curses won't be supported.])
|
||||
|
||||
dnl **** Check for SANE ****
|
||||
diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c
|
||||
index 814b937..5672b85 100644
|
||||
--- a/dlls/kernel32/term.c
|
||||
+++ b/dlls/kernel32/term.c
|
||||
@@ -146,7 +146,7 @@ unsigned TERM_FillSimpleChar(WCHAR real_inchar, INPUT_RECORD* ir)
|
||||
return numEvent;
|
||||
}
|
||||
|
||||
-#if defined(SONAME_LIBCURSES) || defined(SONAME_LIBNCURSES)
|
||||
+#if defined(SONAME_LIBCURSES) || defined(SONAME_LIBNCURSES) || defined(SONAME_LIBNCURSESW)
|
||||
|
||||
#ifdef HAVE_NCURSES_H
|
||||
# define CURSES_NAME "ncurses"
|
||||
@@ -171,6 +171,8 @@ static BOOL TERM_bind_libcurses(void)
|
||||
{
|
||||
#ifdef SONAME_LIBNCURSES
|
||||
static const char ncname[] = SONAME_LIBNCURSES;
|
||||
+#elif defined(SONAME_LIBNCURSESW)
|
||||
+ static const char ncname[] = SONAME_LIBNCURSESW;
|
||||
#else
|
||||
static const char ncname[] = SONAME_LIBCURSES;
|
||||
#endif
|
||||
diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c
|
||||
index 77d7718..8dccb05 100644
|
||||
--- a/programs/wineconsole/curses.c
|
||||
+++ b/programs/wineconsole/curses.c
|
||||
@@ -62,7 +62,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(curses);
|
||||
|
||||
#define PRIVATE(data) ((struct inner_data_curse*)((data)->private))
|
||||
|
||||
-#if defined(SONAME_LIBCURSES) || defined(SONAME_LIBNCURSES)
|
||||
+#if defined(SONAME_LIBCURSES) || defined(SONAME_LIBNCURSES) || defined(SONAME_LIBNCURSESW)
|
||||
|
||||
#ifdef HAVE_NCURSES_H
|
||||
# define CURSES_NAME "ncurses"
|
||||
@@ -135,6 +135,8 @@ static BOOL WCCURSES_bind_libcurses(void)
|
||||
{
|
||||
#ifdef SONAME_LIBNCURSES
|
||||
static const char ncname[] = SONAME_LIBNCURSES;
|
||||
+#elif defined(SONAME_LIBNCURSESW)
|
||||
+ static const char ncname[] = SONAME_LIBNCURSESW;
|
||||
#else
|
||||
static const char ncname[] = SONAME_LIBCURSES;
|
||||
#endif
|
||||
--
|
||||
2.1.0
|
||||
|
||||
3
patches/configure-Detect_Ncurses/definition
Normal file
3
patches/configure-Detect_Ncurses/definition
Normal file
@ -0,0 +1,3 @@
|
||||
Author: Sebastian Lackner
|
||||
Subject: Fix detection of ncurses library on Archlinux.
|
||||
Revision: 1
|
||||
Loading…
Reference in New Issue
Block a user