From cc1c1f12ae5ffbb700639390315c1128f9b138f3 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 5 Sep 2014 18:44:34 +0200 Subject: [PATCH] Removed patch to fix detection of ncurses on Archlinux (accepted upstream). --- debian/changelog | 1 + patches/Makefile | 16 ------------ ...tection-of-ncurses-library-on-Archli.patch | 25 ------------------- patches/configure-Detect_Ncurses/definition | 3 --- 4 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 patches/configure-Detect_Ncurses/0001-configure-Fix-detection-of-ncurses-library-on-Archli.patch delete mode 100644 patches/configure-Detect_Ncurses/definition diff --git a/debian/changelog b/debian/changelog index eddbba00..3360bbc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Wed, 27 Aug 2014 00:34:51 +0200 wine-compholio (1.7.25) unstable; urgency=low diff --git a/patches/Makefile b/patches/Makefile index 95199b53..f61ef4bd 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -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: diff --git a/patches/configure-Detect_Ncurses/0001-configure-Fix-detection-of-ncurses-library-on-Archli.patch b/patches/configure-Detect_Ncurses/0001-configure-Fix-detection-of-ncurses-library-on-Archli.patch deleted file mode 100644 index 38e4ca86..00000000 --- a/patches/configure-Detect_Ncurses/0001-configure-Fix-detection-of-ncurses-library-on-Archli.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 20b1ab08fbddbaeaba82761006b68c1ab8dfb70b Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -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 - diff --git a/patches/configure-Detect_Ncurses/definition b/patches/configure-Detect_Ncurses/definition deleted file mode 100644 index 8004e414..00000000 --- a/patches/configure-Detect_Ncurses/definition +++ /dev/null @@ -1,3 +0,0 @@ -Author: Sebastian Lackner -Subject: Fix detection of ncurses library on Archlinux. -Revision: 3