[-- Attachment #1: Type: text/plain, Size: 1208 bytes --] There is a new pull request by meator against master on the void-packages repository https://github.com/meator/void-packages cgdb https://github.com/void-linux/void-packages/pull/35111 cgdb: update to 0.8.0, adopt <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35111.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-cgdb-35111.patch --] [-- Type: text/x-diff, Size: 3926 bytes --] From 2fb8d75edd947c573e8339a689913ce20b9b14ad Mon Sep 17 00:00:00 2001 From: meator <meator.dev@gmail.com> Date: Tue, 18 Jan 2022 16:01:46 +0100 Subject: [PATCH] cgdb: update to 0.8.0, adopt This commit also removes a patch that is included in this version. --- srcpkgs/cgdb/patches/fixescape.patch | 48 ---------------------------- srcpkgs/cgdb/template | 8 ++--- 2 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 srcpkgs/cgdb/patches/fixescape.patch diff --git a/srcpkgs/cgdb/patches/fixescape.patch b/srcpkgs/cgdb/patches/fixescape.patch deleted file mode 100644 index 529e832108d7..000000000000 --- a/srcpkgs/cgdb/patches/fixescape.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 242ea26b6f4aa7ce2ce56cbb1b50cd93a3126a57 Mon Sep 17 00:00:00 2001 -From: meator <coder64@protonmail.com> -Date: Thu, 17 Jun 2021 21:30:06 +0200 -Subject: [PATCH] Patch - -This is a patch for v0.7.1 of cgdb. It fixes bad escape sequences in prompt string. Based of https://github.com/cgdb/cgdb/issues/239#issuecomment-706249589 and https://github.com/cgdb/cgdb/issues/255#issuecomment-820546156. - ---- - cgdb/scroller.cpp | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/cgdb/scroller.cpp b/cgdb/scroller.cpp -index 2d01e82..d2d36ca 100644 ---- a/cgdb/scroller.cpp -+++ b/cgdb/scroller.cpp -@@ -106,14 +106,27 @@ static char *parse(struct scroller *scr, struct hl_line_attr **attrs, - /* Carriage return -> Move back to the beginning of the line */ - case '\r': - i = 0; -- if (buf[j + 1] != '\n') { -+ if ((buflen - j) >= 1 && buf[j + 1] != '\n') { - sbfree(*attrs); - *attrs = NULL; - } - break; - case '\033': - /* Handle ansi escape characters */ -- if (hl_ansi_color_support(hl_groups_instance) && -+ /* see https://conemu.github.io/en/AnsiEscapeCodes.html#SGR_Select_Graphic_Rendition_parameters -+ */ -+ if ((buflen - j) >= 6 -+ && buf[j + 1] == '[' && buf[j + 2] == '?' && buf[j + 3] == '2' -+ && buf[j + 4] == '0' && buf[j + 5] == '0' && buf[j + 6] == '4') { -+ /* simply ignore these escape sequences like e.g. "[?2004h" */ -+ j += 7; -+ } else if ((buflen - j) >= 2 && buf[j + 1] == '[' && buf[j + 2] == '?') { -+ /* simply ignore these escape sequences like e.g. "[?1h" */ -+ j += 4; -+ } else if ((buflen - j) >= 1 && (buf[j + 1] == '=' || buf[j + 1] == '>')) { -+ /* simply ignore these escape sequences */ -+ j += 1; -+ } else if (hl_ansi_color_support(hl_groups_instance) && - debugwincolor) { - int attr; - int ansi_count = hl_ansi_get_color_attrs( --- -2.32.0 - diff --git a/srcpkgs/cgdb/template b/srcpkgs/cgdb/template index 86ce9b0b8dd0..b089528d5999 100644 --- a/srcpkgs/cgdb/template +++ b/srcpkgs/cgdb/template @@ -1,7 +1,7 @@ # Template file for 'cgdb' pkgname=cgdb -version=0.7.1 -revision=2 +version=0.8.0 +revision=1 build_style=gnu-configure configure_args="ac_cv_rl_version=6.3 ac_cv_file__proc_self_status=yes" @@ -9,8 +9,8 @@ hostmakedepends="flex texinfo" makedepends="ncurses-devel readline-devel" depends="gdb" short_desc="Curses-based interface to the GNU Debugger" -maintainer="Orphaned <orphan@voidlinux.org>" +maintainer="meator <meator.dev@gmail.com>" license="GPL-2.0-only" homepage="http://cgdb.sourceforge.net" distfiles="http://cgdb.me/files/cgdb-${version}.tar.gz" -checksum=bb723be58ec68cb59a598b8e24a31d10ef31e0e9c277a4de07b2f457fe7de198 +checksum=0d38b524d377257b106bad6d856d8ae3304140e1ee24085343e6ddf1b65811f1
[-- Attachment #1: Type: text/plain, Size: 169 bytes --] New review comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/35111#discussion_r788251847 Comment: this link doesn't work
[-- Attachment #1: Type: text/plain, Size: 194 bytes --] New review comment by meator on void-packages repository https://github.com/void-linux/void-packages/pull/35111#discussion_r788850203 Comment: I do not understand you. Could you explain that?
[-- Attachment #1: Type: text/plain, Size: 418 bytes --] New review comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/35111#discussion_r788993237 Comment: This link redirects me to https://cgdb.github.com/ which returns a github 404 page: ![Screenshot from 2022-01-20 18-29-15](https://user-images.githubusercontent.com/23639164/150390863-407c0853-ed92-4202-aafc-ad02a253c128.png) https://cgdb.github.io/ works as expected
[-- Attachment #1: Type: text/plain, Size: 1213 bytes --] There is an updated pull request by meator against master on the void-packages repository https://github.com/meator/void-packages cgdb https://github.com/void-linux/void-packages/pull/35111 cgdb: update to 0.8.0, adopt <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl --> A patch file from https://github.com/void-linux/void-packages/pull/35111.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-cgdb-35111.patch --] [-- Type: text/x-diff, Size: 3980 bytes --] From 0e3f817c2f10a4c28c3cc495b997c40d763ace02 Mon Sep 17 00:00:00 2001 From: meator <meator.dev@gmail.com> Date: Tue, 18 Jan 2022 16:01:46 +0100 Subject: [PATCH] cgdb: update to 0.8.0, adopt and fix homepage This commit also removes a patch that is included in this version. --- srcpkgs/cgdb/patches/fixescape.patch | 48 ---------------------------- srcpkgs/cgdb/template | 10 +++--- 2 files changed, 5 insertions(+), 53 deletions(-) delete mode 100644 srcpkgs/cgdb/patches/fixescape.patch diff --git a/srcpkgs/cgdb/patches/fixescape.patch b/srcpkgs/cgdb/patches/fixescape.patch deleted file mode 100644 index 529e832108d7..000000000000 --- a/srcpkgs/cgdb/patches/fixescape.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 242ea26b6f4aa7ce2ce56cbb1b50cd93a3126a57 Mon Sep 17 00:00:00 2001 -From: meator <coder64@protonmail.com> -Date: Thu, 17 Jun 2021 21:30:06 +0200 -Subject: [PATCH] Patch - -This is a patch for v0.7.1 of cgdb. It fixes bad escape sequences in prompt string. Based of https://github.com/cgdb/cgdb/issues/239#issuecomment-706249589 and https://github.com/cgdb/cgdb/issues/255#issuecomment-820546156. - ---- - cgdb/scroller.cpp | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/cgdb/scroller.cpp b/cgdb/scroller.cpp -index 2d01e82..d2d36ca 100644 ---- a/cgdb/scroller.cpp -+++ b/cgdb/scroller.cpp -@@ -106,14 +106,27 @@ static char *parse(struct scroller *scr, struct hl_line_attr **attrs, - /* Carriage return -> Move back to the beginning of the line */ - case '\r': - i = 0; -- if (buf[j + 1] != '\n') { -+ if ((buflen - j) >= 1 && buf[j + 1] != '\n') { - sbfree(*attrs); - *attrs = NULL; - } - break; - case '\033': - /* Handle ansi escape characters */ -- if (hl_ansi_color_support(hl_groups_instance) && -+ /* see https://conemu.github.io/en/AnsiEscapeCodes.html#SGR_Select_Graphic_Rendition_parameters -+ */ -+ if ((buflen - j) >= 6 -+ && buf[j + 1] == '[' && buf[j + 2] == '?' && buf[j + 3] == '2' -+ && buf[j + 4] == '0' && buf[j + 5] == '0' && buf[j + 6] == '4') { -+ /* simply ignore these escape sequences like e.g. "[?2004h" */ -+ j += 7; -+ } else if ((buflen - j) >= 2 && buf[j + 1] == '[' && buf[j + 2] == '?') { -+ /* simply ignore these escape sequences like e.g. "[?1h" */ -+ j += 4; -+ } else if ((buflen - j) >= 1 && (buf[j + 1] == '=' || buf[j + 1] == '>')) { -+ /* simply ignore these escape sequences */ -+ j += 1; -+ } else if (hl_ansi_color_support(hl_groups_instance) && - debugwincolor) { - int attr; - int ansi_count = hl_ansi_get_color_attrs( --- -2.32.0 - diff --git a/srcpkgs/cgdb/template b/srcpkgs/cgdb/template index 86ce9b0b8dd0..4cc37844ddf3 100644 --- a/srcpkgs/cgdb/template +++ b/srcpkgs/cgdb/template @@ -1,7 +1,7 @@ # Template file for 'cgdb' pkgname=cgdb -version=0.7.1 -revision=2 +version=0.8.0 +revision=1 build_style=gnu-configure configure_args="ac_cv_rl_version=6.3 ac_cv_file__proc_self_status=yes" @@ -9,8 +9,8 @@ hostmakedepends="flex texinfo" makedepends="ncurses-devel readline-devel" depends="gdb" short_desc="Curses-based interface to the GNU Debugger" -maintainer="Orphaned <orphan@voidlinux.org>" +maintainer="meator <meator.dev@gmail.com>" license="GPL-2.0-only" -homepage="http://cgdb.sourceforge.net" +homepage="https://cgdb.github.io/" distfiles="http://cgdb.me/files/cgdb-${version}.tar.gz" -checksum=bb723be58ec68cb59a598b8e24a31d10ef31e0e9c277a4de07b2f457fe7de198 +checksum=0d38b524d377257b106bad6d856d8ae3304140e1ee24085343e6ddf1b65811f1
[-- Attachment #1: Type: text/plain, Size: 165 bytes --] New review comment by meator on void-packages repository https://github.com/void-linux/void-packages/pull/35111#discussion_r789016796 Comment: Ok, it's fixed now.
[-- Attachment #1: Type: text/plain, Size: 1062 bytes --] There's a merged pull request on the void-packages repository cgdb: update to 0.8.0, adopt https://github.com/void-linux/void-packages/pull/35111 Description: <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **YES** <!-- #### New package - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO** --> <!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration) and test at least one native build and, if supported, at least one cross build. Ignore this section if this PR is not skipping CI. --> <!-- #### Local build testing - I built this PR locally for my native architecture, (ARCH-LIBC) - I built this PR locally for these architectures (if supported. mark crossbuilds): - aarch64-musl - armv7l - armv6l-musl -->