diff --git a/mingw-w64-gdb/0001-gdb-tui-Fix-breakpoint-display-functionality.patch b/mingw-w64-gdb/0001-gdb-tui-Fix-breakpoint-display-functionality.patch deleted file mode 100644 index 20226785ec..0000000000 --- a/mingw-w64-gdb/0001-gdb-tui-Fix-breakpoint-display-functionality.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 4f8042c7295f894124abed541abd0576f51c0e1b Mon Sep 17 00:00:00 2001 -From: Tom de Vries -Date: Fri, 22 Oct 2021 00:28:14 +0200 -Subject: [PATCH] [gdb/tui] Fix breakpoint display functionality - -In commit 81e6b8eb208 "Make tui-winsource not use breakpoint_chain", a loop -body was transformed into a lambda function body: -... -- for (bp = breakpoint_chain; -- bp != NULL; -- bp = bp->next) -+ iterate_over_breakpoints ([&] (breakpoint *bp) -> bool -... -and consequently: -- a continue was replaced by a return, and -- a final return was added. - -Then in commit 240edef62f0 "gdb: remove iterate_over_breakpoints function", we -transformed back to a loop body: -... -- iterate_over_breakpoints ([&] (breakpoint *bp) -> bool -+ for (breakpoint *bp : all_breakpoints ()) -... -but without reverting the changes that introduced the two returns. - -Consequently, breakpoints no longer show up in the tui source window. - -Fix this by reverting the changes that introduced the two returns. - -Build on x86_64-linux, tested with all .exp test-cases that contain -tuiterm_env. - -Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=28483 ---- - gdb/tui/tui-winsource.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c -index afd51e95980..955b68901fe 100644 ---- a/gdb/tui/tui-winsource.c -+++ b/gdb/tui/tui-winsource.c -@@ -460,7 +460,7 @@ tui_source_window_base::update_breakpoint_info - for (breakpoint *bp : all_breakpoints ()) - { - if (bp == being_deleted) -- return false; -+ continue; - - for (bp_location *loc : bp->locations ()) - { -@@ -478,7 +478,6 @@ tui_source_window_base::update_breakpoint_info - mode |= TUI_BP_HARDWARE; - } - } -- return false; - } - - if (line->break_mode != mode) --- -2.33.1.windows.1 - diff --git a/mingw-w64-gdb/PKGBUILD b/mingw-w64-gdb/PKGBUILD index 14ea248b60..d36357b76e 100644 --- a/mingw-w64-gdb/PKGBUILD +++ b/mingw-w64-gdb/PKGBUILD @@ -5,8 +5,8 @@ _realname=gdb pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-multiarch") -pkgver=11.1 -pkgrel=2 +pkgver=11.2 +pkgrel=1 pkgdesc="GNU Debugger (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -32,16 +32,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gmp" "${MINGW_PACKAGE_PREFIX}-cc") options=('staticlibs' '!distcc' '!ccache') source=(https://ftp.gnu.org/gnu/gdb/${_realname}-${pkgver}.tar.xz{,.sig} - '0001-gdb-tui-Fix-breakpoint-display-functionality.patch' '0001-Workaround-performance-regression-in-info-func-var-t.patch' '0002-Fix-using-gnu-print.patch' '0003-configure-Disable-static-linking-with-standard-libs.patch' '0004-Python-Configure-path-fixes.patch' '0005-W32-Always-check-USERPROFILE-if-HOME-is-not-set.patch') validpgpkeys=('F40ADB902B24264AA42E50BF92EDB04BFF325CF3') -sha256sums=('cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94' +sha256sums=('1497c36a71881b8671a9a84a0ee40faab788ca30d7ba19d8463c3cc787152e32' 'SKIP' - 'a8001dad47e4016dbd0843356f79ba562f152e68362e73a700f644166eccbba8' '428cda7dcc107c236225ae89704390b0f1e70c276b5ca6b1741988f384b21d62' 'c60e867fb74f7985b5ac5337a07cc697b4a4ffe19fb6e52f7c377e29c8413a4a' '0eb291cd81f7392610d16a83f436a30d3384a99661c6b6ffd1bfb243d5aee6dd' @@ -51,9 +49,6 @@ sha256sums=('cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94' prepare() { cd ${srcdir}/${_realname}-${pkgver} - # https://sourceware.org/bugzilla/show_bug.cgi?id=28483 - patch -p1 -i ${srcdir}/0001-gdb-tui-Fix-breakpoint-display-functionality.patch - # https://sourceware.org/bugzilla/show_bug.cgi?id=15412 patch -p1 -i ${srcdir}/0001-Workaround-performance-regression-in-info-func-var-t.patch