[rpms/gdb] gdb-17.2-rebase-f44: Remove gdb-fedora-libncursesw.patch

[rpms/gdb] gdb-17.2-rebase-f44: Remove gdb-fedora-libncursesw.patch

[Guinevere Larsen]

            A new commit has been pushed.

            Repo   : rpms/gdb
            Branch : gdb-17.2-rebase-f44
            Commit : f9386b1d20f23c69c5fc366b633e2fd5bb0ed634
            Author : Guinevere Larsen <blarsen@redhat.com>
            Date   : 2024-05-22T10:37:17-03:00
            Stats  : +27/-100 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/gdb/c/f9386b1d20f23c69c5fc366b633e2fd5bb0ed634?branch=gdb-17.2-rebase-f44

            Log:
            Remove gdb-fedora-libncursesw.patch

This was added as a workaround for ncurses version 6.0, that had
incompatible struct sizes, depending on if you had the wide version or
not. However, this was solved in RHEL8, so we don't need to worry about
that issue anymore

---
diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include
index 6fdaf79..84e1966 100644
--- a/_gdb.spec.Patch.include
+++ b/_gdb.spec.Patch.include
@@ -114,13 +114,9 @@ Patch026: gdb-rhbz1149205-catch-syscall-after-fork-test.patch
 #=fedoratest
 Patch027: gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
 
-# Force libncursesw over libncurses to match the includes (RH BZ 1270534).
-#=push+jan
-Patch028: gdb-fedora-libncursesw.patch
-
 # [aarch64] Fix hardware watchpoints (RH BZ 1261564).
 #=fedoratest
-Patch029: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
+Patch028: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 
 # Update gdb-add-index.sh such that, when the GDB environment
 # variable is not set, the script is smarter than just looking for
@@ -134,75 +130,75 @@ Patch029: gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 #   https://fedoraproject.org/wiki/Changes/Minimal_GDB_in_buildroot
 #
 #=fedora
-Patch030: gdb-add-index.patch
+Patch029: gdb-add-index.patch
 
 # Back-port upstream commit 1f0fab7ff86 as part of a fix for
 # non-deterministic gdb-index generation (RH BZ 2232086).
-Patch031: gdb-rhbz2232086-refactor-selftest-support.patch
+Patch030: gdb-rhbz2232086-refactor-selftest-support.patch
 
 # Back-port upstream commit aa19bc1d259 as part of a fix for
 # non-deterministic gdb-index generation (RH BZ 2232086).
-Patch032: gdb-rhbz-2232086-reduce-size-of-gdb-index.patch
+Patch031: gdb-rhbz-2232086-reduce-size-of-gdb-index.patch
 
 # Back-port upstream commit acc117b57f7 as part of a fix for
 # non-deterministic gdb-index generation (RH BZ 2232086).
-Patch033: gdb-rhbz-2232086-cpp-ify-mapped-symtab.patch
+Patch032: gdb-rhbz-2232086-cpp-ify-mapped-symtab.patch
 
 # Back-port upstream commit aff250145af as part of a fix for
 # non-deterministic gdb-index generation (RH BZ 2232086).
-Patch034: gdb-rhbz-2232086-generate-gdb-index-consistently.patch
+Patch033: gdb-rhbz-2232086-generate-gdb-index-consistently.patch
 
 # Back-port upstream commit 3644f41dc80 as part of a fix for
 # non-deterministic gdb-index generation (RH BZ 2232086).
-Patch035: gdb-rhbz-2232086-generate-dwarf-5-index-consistently.patch
+Patch034: gdb-rhbz-2232086-generate-dwarf-5-index-consistently.patch
 
 
-Patch036: gdb-rhbz2250652-gdbpy_gil.patch
+Patch035: gdb-rhbz2250652-gdbpy_gil.patch
 
 
-Patch037: gdb-rhbz2250652-avoid-PyOS_ReadlineTState.patch
+Patch036: gdb-rhbz2250652-avoid-PyOS_ReadlineTState.patch
 
 
-Patch038: gdb-ftbs-swapped-calloc-args.patch
+Patch037: gdb-ftbs-swapped-calloc-args.patch
 
 # Backport upstream workaround for GCC 14 problem which cause assertion
 # failures in GDB.
-Patch039: gdb-rhbz2261580-intrusive_list-assertion-fix.patch
+Patch038: gdb-rhbz2261580-intrusive_list-assertion-fix.patch
 
 # Backport upstream commit 7628a997f27.
-Patch040: gdb-sync-coffread-with-elfread.patch
+Patch039: gdb-sync-coffread-with-elfread.patch
 
 # Backport upstream commit 27807da5849.
-Patch041: gdb-merge-debug-symbol-lookup.patch
+Patch040: gdb-merge-debug-symbol-lookup.patch
 
 # Backport upstream commit 6234ba17598.
-Patch042: gdb-refactor-find-and-add-separate-symbol-file.patch
+Patch041: gdb-refactor-find-and-add-separate-symbol-file.patch
 
 # Backport upstream commit 661d98a3331.
-Patch043: gdb-add-missing-debug-ext-lang-hook.patch
+Patch042: gdb-add-missing-debug-ext-lang-hook.patch
 
 # Backport upstream commit 8f6c452b5a4.
-Patch044: gdb-add-missing-debug-info-python-hook.patch
+Patch043: gdb-add-missing-debug-info-python-hook.patch
 
 # Backport upstream commit 7db795bc67a.
-Patch045: gdb-remove-use-of-py-isascii
+Patch044: gdb-remove-use-of-py-isascii
 
 # Backport upstream commit 1146d27749f.
-Patch046: gdb-remove-path-in-test-name.patch
+Patch045: gdb-remove-path-in-test-name.patch
 
 # Backport upstream commit e8c3dafa5f5.
-Patch047: gdb-do-not-import-py-curses-ascii-module.patch
+Patch046: gdb-do-not-import-py-curses-ascii-module.patch
 
 # Backport upstream commit dd5516bf98f.
-Patch048: gdb-reformat-missing-debug-py-file.patch
+Patch047: gdb-reformat-missing-debug-py-file.patch
 
 # Backport upstream commit 7d21600b31fe.
-Patch049: gdb-handle-no-python-gdb-module.patch
+Patch048: gdb-handle-no-python-gdb-module.patch
 
 # Not a backport.  Add a new script which hooks into GDB and suggests
 # RPMs to install when GDB finds an objfile with no debug info.
-Patch050: gdb-add-rpm-suggestion-script.patch
+Patch049: gdb-add-rpm-suggestion-script.patch
 
 # Update x86 disassembler
-Patch051: gdb-rhbz2277160-apx-disasm.patch
+Patch050: gdb-rhbz2277160-apx-disasm.patch
 

diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include
index 161654d..f84adba 100644
--- a/_gdb.spec.patch.include
+++ b/_gdb.spec.patch.include
@@ -48,4 +48,3 @@
 %patch -p1 -P048
 %patch -p1 -P049
 %patch -p1 -P050
-%patch -p1 -P051

diff --git a/_patch_order b/_patch_order
index 5010a45..7f709c2 100644
--- a/_patch_order
+++ b/_patch_order
@@ -25,7 +25,6 @@ gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch
 gdb-rhbz1156192-recursive-dlopen-test.patch
 gdb-rhbz1149205-catch-syscall-after-fork-test.patch
 gdb-rhbz1084404-ppc64-s390x-wrong-prologue-skip-O2-g-3of3.patch
-gdb-fedora-libncursesw.patch
 gdb-rhbz1261564-aarch64-hw-watchpoint-test.patch
 gdb-add-index.patch
 gdb-rhbz2232086-refactor-selftest-support.patch

diff --git a/gdb-fedora-libncursesw.patch b/gdb-fedora-libncursesw.patch
deleted file mode 100644
index 3ee4ab6..0000000
--- a/gdb-fedora-libncursesw.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
-From: Fedora GDB patches <invalid@email.com>
-Date: Fri, 27 Oct 2017 21:07:50 +0200
-Subject: gdb-fedora-libncursesw.patch
-
-;; Force libncursesw over libncurses to match the includes (RH BZ 1270534).
-;;=push+jan
-
-Fedora: Force libncursesw over libncurses to match the includes.
-https://bugzilla.redhat.com/show_bug.cgi?id=1270534
-
-diff --git a/gdb/configure b/gdb/configure
---- a/gdb/configure
-+++ b/gdb/configure
-@@ -20663,6 +20663,7 @@ if test x"$prefer_curses" = xyes; then
-   # search /usr/local/include, if ncurses is installed in /usr/local.  A
-   # default installation of ncurses on alpha*-dec-osf* will lead to such
-   # a situation.
-+  # Fedora: Force libncursesw over libncurses to match the includes.
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing waddstr" >&5
- $as_echo_n "checking for library containing waddstr... " >&6; }
- if ${ac_cv_search_waddstr+:} false; then :
-@@ -20687,7 +20688,7 @@ return waddstr ();
-   return 0;
- }
- _ACEOF
--for ac_lib in '' ncursesw ncurses cursesX curses; do
-+for ac_lib in '' ncursesw; do
-   if test -z "$ac_lib"; then
-     ac_res="none required"
-   else
-@@ -20759,6 +20760,7 @@ case $host_os in
- esac
- 
- # These are the libraries checked by Readline.
-+# Fedora: Force libncursesw over libncurses to match the includes.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
- $as_echo_n "checking for library containing tgetent... " >&6; }
- if ${ac_cv_search_tgetent+:} false; then :
-@@ -20783,7 +20785,7 @@ return tgetent ();
-   return 0;
- }
- _ACEOF
--for ac_lib in '' termcap tinfow tinfo curses ncursesw ncurses; do
-+for ac_lib in '' ncursesw; do
-   if test -z "$ac_lib"; then
-     ac_res="none required"
-   else
-diff --git a/gdb/configure.ac b/gdb/configure.ac
---- a/gdb/configure.ac
-+++ b/gdb/configure.ac
-@@ -555,7 +555,8 @@ if test x"$prefer_curses" = xyes; then
-   # search /usr/local/include, if ncurses is installed in /usr/local.  A
-   # default installation of ncurses on alpha*-dec-osf* will lead to such
-   # a situation.
--  AC_SEARCH_LIBS(waddstr, [ncursesw ncurses cursesX curses],
-+  # Fedora: Force libncursesw over libncurses to match the includes.
-+  AC_SEARCH_LIBS(waddstr, [ncursesw],
-                  [curses_found=yes
-                   AC_DEFINE([HAVE_LIBCURSES], [1],
-                             [Define to 1 if curses is enabled.])
-@@ -595,7 +596,8 @@ case $host_os in
- esac
- 
- # These are the libraries checked by Readline.
--AC_SEARCH_LIBS(tgetent, [termcap tinfow tinfo curses ncursesw ncurses])
-+# Fedora: Force libncursesw over libncurses to match the includes.
-+AC_SEARCH_LIBS(tgetent, [ncursesw])
- 
- if test "$ac_cv_search_tgetent" = no; then
-   CONFIG_OBS="$CONFIG_OBS stub-termcap.o"

diff --git a/gdb.spec b/gdb.spec
index b3d79f4..68a993b 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -926,6 +926,10 @@ fi
 # endif scl
 
 %changelog
+* Wed May 22 2024 Guinevere Larsen <blarsen@redhat.com>
+- Remove gdb-fedora-libncursesw.patch, this workaround isn't needed
+  anymore.
+
 * Wed May 15 2024 Keith Seitz <keiths@redhat.com> - 14.2-8
 - Sync x86 disassembler with (proposed) gdb-15.1 release.
   (many authors, RHBZ 2277160)