Removed patch to fix detection of ncurses on Archlinux (accepted upstream).

This commit is contained in:
Sebastian Lackner 2014-09-05 18:44:34 +02:00
parent b1a5dfb1f7
commit cc1c1f12ae
4 changed files with 1 additions and 44 deletions

1
debian/changelog vendored
View File

@ -7,6 +7,7 @@ wine-compholio (1.7.26) UNRELEASED; urgency=low
* 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).
* Removed patch to fix issue with msi/ITERATE_MoveFiles (accepted upstream).
* Removed patch to fix detection of ncurses on Archlinux (accepted upstream).
-- Erich E. Hoover <erich.e.hoover@gmail.com> Wed, 27 Aug 2014 00:34:51 +0200
wine-compholio (1.7.25) unstable; urgency=low

View File

@ -26,7 +26,6 @@ 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 \
@ -266,21 +265,6 @@ 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. [rev 3, by Sebastian Lackner]
# |
# | Modified files:
# | * configure.ac
# |
.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. [rev 3]" },'; \
) > configure-Detect_Ncurses.ok
# Patchset dsound-Fast_Mixer
# |
# | Included patches:

View File

@ -1,25 +0,0 @@
From 20b1ab08fbddbaeaba82761006b68c1ab8dfb70b Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 4 Sep 2014 09:26:33 +0200
Subject: configure: Fix detection of ncurses library on Archlinux.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index db8b76f..17475b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1370,7 +1370,7 @@ 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"],,,[[libncursesw\\{0,1\\}]])
elif test "$ac_cv_header_curses_h" = "yes"
then
WINE_CHECK_SONAME(curses,waddch,[CURSES_LIBS="-lcurses"])
--
2.1.0

View File

@ -1,3 +0,0 @@
Author: Sebastian Lackner
Subject: Fix detection of ncurses library on Archlinux.
Revision: 3