* [PR PATCH] ddd: update to 3.4.0
@ 2024-04-17 14:21 mvf
2024-04-17 15:13 ` [PR PATCH] [Updated] " mvf
2024-04-19 17:43 ` [PR PATCH] [Merged]: " cinerea0
0 siblings, 2 replies; 3+ messages in thread
From: mvf @ 2024-04-17 14:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1221 bytes --]
There is a new pull request by mvf against master on the void-packages repository
https://github.com/mvf/void-packages pr/ddd
https://github.com/void-linux/void-packages/pull/49881
ddd: update to 3.4.0
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/49881.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr/ddd-49881.patch --]
[-- Type: text/x-diff, Size: 5345 bytes --]
From dcc63fb997553ff2a399930a7856fa1e504930aa Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Wed, 17 Apr 2024 11:15:51 +0200
Subject: [PATCH] ddd: update to 3.4.0
---
srcpkgs/ddd/patches/cstdio-missing.diff | 10 ---
srcpkgs/ddd/patches/gcc9-ftbfs.patch | 101 ------------------------
srcpkgs/ddd/template | 6 +-
3 files changed, 3 insertions(+), 114 deletions(-)
delete mode 100644 srcpkgs/ddd/patches/cstdio-missing.diff
delete mode 100644 srcpkgs/ddd/patches/gcc9-ftbfs.patch
diff --git a/srcpkgs/ddd/patches/cstdio-missing.diff b/srcpkgs/ddd/patches/cstdio-missing.diff
deleted file mode 100644
index e8f5a2bc379fec..00000000000000
--- a/srcpkgs/ddd/patches/cstdio-missing.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ddd/strclass.C 2014-05-29 20:30:26.494721840 +0200
-+++ b/ddd/strclass.C 2014-05-29 20:30:10.492723038 +0200
-@@ -39,6 +39,7 @@ extern "C" int malloc_verify();
- #include <limits.h>
- #include <new>
- #include <stdlib.h>
-+#include <cstdio>
-
- void string::error(const char* msg) const
- {
diff --git a/srcpkgs/ddd/patches/gcc9-ftbfs.patch b/srcpkgs/ddd/patches/gcc9-ftbfs.patch
deleted file mode 100644
index 4ce937927a1d2e..00000000000000
--- a/srcpkgs/ddd/patches/gcc9-ftbfs.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From: Sophie Brun <sophie@offensive-security.com>
-Date: Mon, 30 Sep 2019 16:17:19 +0200
-Subject: Fix ftbfs with GCC-9
-
-Last-Update: 2019-10-01
-Description:
-"If a friend declaration specifies a default, it must be a friend
-function definition, and no other declarations of this function are
-allowed in the translation unit."
-Remove default values from declaration and change these functions calls
-in the code to add default values if not overwritten.
----
- ddd/DispValue.C | 4 ++--
- ddd/complete.C | 2 +-
- ddd/exit.C | 2 +-
- ddd/strclass.C | 1 +
- ddd/strclass.h | 10 ++++++----
- 5 files changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/ddd/DispValue.C b/ddd/DispValue.C
-index de25768..2656242 100644
---- a/ddd/DispValue.C
-+++ b/ddd/DispValue.C
-@@ -1432,8 +1432,8 @@ void DispValue::get_index_surroundings(string& prefix, string& suffix) const
-
- for (int i = 1; i < nchildren(); i++)
- {
-- prefix = common_prefix(prefix, child(i)->full_name());
-- suffix = common_suffix(suffix, child(i)->full_name());
-+ prefix = common_prefix(prefix, child(i)->full_name(), 0);
-+ suffix = common_suffix(suffix, child(i)->full_name(), -1);
- }
- }
-
-diff --git a/ddd/complete.C b/ddd/complete.C
-index b161e74..4bde5ff 100644
---- a/ddd/complete.C
-+++ b/ddd/complete.C
-@@ -354,7 +354,7 @@ static void complete_reply(const string& complete_answer, void *qu_data)
- string common_pfx = completions[0];
- int i;
- for (i = 1; i < completions_size; i++)
-- common_pfx = common_prefix(common_pfx, completions[i]);
-+ common_pfx = common_prefix(common_pfx, completions[i], 0);
-
- if (completions_size > 1 && input == common_pfx)
- {
-diff --git a/ddd/exit.C b/ddd/exit.C
-index f490c23..664f203 100644
---- a/ddd/exit.C
-+++ b/ddd/exit.C
-@@ -478,7 +478,7 @@ void get_core_pattern(int signal)
- str_func_ret = "core";
- }
- else {
-- readline(patternfile, pattern);
-+ readline(patternfile, pattern, '\n', 1);
- core_pat = pattern.chars();
- while(*core_pat)
- {
-diff --git a/ddd/strclass.C b/ddd/strclass.C
-index be0bade..dfbb054 100644
---- a/ddd/strclass.C
-+++ b/ddd/strclass.C
-@@ -1563,6 +1563,7 @@ std::istream& operator>>(std::istream& s, string& x)
- return s;
- }
-
-+
- int readline(std::istream& s, string& x, char terminator, int discard)
- {
- assert(!x.consuming());
-diff --git a/ddd/strclass.h b/ddd/strclass.h
-index 7ef16fa..035a17e 100644
---- a/ddd/strclass.h
-+++ b/ddd/strclass.h
-@@ -811,9 +811,11 @@ public:
- const regex& sep);
-
- friend string common_prefix(const string& x, const string& y,
-- int startpos = 0);
-+ int startpos);
-+
- friend string common_suffix(const string& x, const string& y,
-- int startpos = -1);
-+ int startpos);
-+
- friend string replicate(char c, int n);
- friend string replicate(const string& y, int n);
- friend string join(const string *src, int n, const string& sep);
-@@ -864,8 +866,8 @@ public:
- friend std::istream& operator>>(std::istream& s, string& x);
-
- friend int readline(std::istream& s, string& x,
-- char terminator = '\n',
-- int discard_terminator = 1);
-+ char terminator,
-+ int discard_terminator);
-
- // Status
- unsigned int length() const;
diff --git a/srcpkgs/ddd/template b/srcpkgs/ddd/template
index 24f44a9abc2379..b4e6ca2b1e00c8 100644
--- a/srcpkgs/ddd/template
+++ b/srcpkgs/ddd/template
@@ -1,7 +1,7 @@
# Template file for 'ddd'
pkgname=ddd
-version=3.3.12
-revision=6
+version=3.4.0
+revision=1
build_style=gnu-configure
makedepends="ncurses-devel libXt-devel libXext-devel libXmu-devel motif-devel"
short_desc="Graphical front-end for command-line debuggers"
@@ -9,4 +9,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/ddd"
distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=3ad6cd67d7f4b1d6b2d38537261564a0d26aaed077bf25c51efc1474d0e8b65c
+checksum=5d4cbc8a0bb0458543866d679308c53a3ef066e402fe5a1918e19698a3d3580f
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] ddd: update to 3.4.0
2024-04-17 14:21 [PR PATCH] ddd: update to 3.4.0 mvf
@ 2024-04-17 15:13 ` mvf
2024-04-19 17:43 ` [PR PATCH] [Merged]: " cinerea0
1 sibling, 0 replies; 3+ messages in thread
From: mvf @ 2024-04-17 15:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]
There is an updated pull request by mvf against master on the void-packages repository
https://github.com/mvf/void-packages pr/ddd
https://github.com/void-linux/void-packages/pull/49881
ddd: update to 3.4.0
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/49881.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr/ddd-49881.patch --]
[-- Type: text/x-diff, Size: 5396 bytes --]
From 2f8e2212f1457b318b4ebcde6d0936ac042cf8b6 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Wed, 17 Apr 2024 11:15:51 +0200
Subject: [PATCH] ddd: update to 3.4.0
---
srcpkgs/ddd/patches/cstdio-missing.diff | 10 ---
srcpkgs/ddd/patches/gcc9-ftbfs.patch | 101 ------------------------
srcpkgs/ddd/template | 10 ++-
3 files changed, 7 insertions(+), 114 deletions(-)
delete mode 100644 srcpkgs/ddd/patches/cstdio-missing.diff
delete mode 100644 srcpkgs/ddd/patches/gcc9-ftbfs.patch
diff --git a/srcpkgs/ddd/patches/cstdio-missing.diff b/srcpkgs/ddd/patches/cstdio-missing.diff
deleted file mode 100644
index e8f5a2bc379fec..00000000000000
--- a/srcpkgs/ddd/patches/cstdio-missing.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ddd/strclass.C 2014-05-29 20:30:26.494721840 +0200
-+++ b/ddd/strclass.C 2014-05-29 20:30:10.492723038 +0200
-@@ -39,6 +39,7 @@ extern "C" int malloc_verify();
- #include <limits.h>
- #include <new>
- #include <stdlib.h>
-+#include <cstdio>
-
- void string::error(const char* msg) const
- {
diff --git a/srcpkgs/ddd/patches/gcc9-ftbfs.patch b/srcpkgs/ddd/patches/gcc9-ftbfs.patch
deleted file mode 100644
index 4ce937927a1d2e..00000000000000
--- a/srcpkgs/ddd/patches/gcc9-ftbfs.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From: Sophie Brun <sophie@offensive-security.com>
-Date: Mon, 30 Sep 2019 16:17:19 +0200
-Subject: Fix ftbfs with GCC-9
-
-Last-Update: 2019-10-01
-Description:
-"If a friend declaration specifies a default, it must be a friend
-function definition, and no other declarations of this function are
-allowed in the translation unit."
-Remove default values from declaration and change these functions calls
-in the code to add default values if not overwritten.
----
- ddd/DispValue.C | 4 ++--
- ddd/complete.C | 2 +-
- ddd/exit.C | 2 +-
- ddd/strclass.C | 1 +
- ddd/strclass.h | 10 ++++++----
- 5 files changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/ddd/DispValue.C b/ddd/DispValue.C
-index de25768..2656242 100644
---- a/ddd/DispValue.C
-+++ b/ddd/DispValue.C
-@@ -1432,8 +1432,8 @@ void DispValue::get_index_surroundings(string& prefix, string& suffix) const
-
- for (int i = 1; i < nchildren(); i++)
- {
-- prefix = common_prefix(prefix, child(i)->full_name());
-- suffix = common_suffix(suffix, child(i)->full_name());
-+ prefix = common_prefix(prefix, child(i)->full_name(), 0);
-+ suffix = common_suffix(suffix, child(i)->full_name(), -1);
- }
- }
-
-diff --git a/ddd/complete.C b/ddd/complete.C
-index b161e74..4bde5ff 100644
---- a/ddd/complete.C
-+++ b/ddd/complete.C
-@@ -354,7 +354,7 @@ static void complete_reply(const string& complete_answer, void *qu_data)
- string common_pfx = completions[0];
- int i;
- for (i = 1; i < completions_size; i++)
-- common_pfx = common_prefix(common_pfx, completions[i]);
-+ common_pfx = common_prefix(common_pfx, completions[i], 0);
-
- if (completions_size > 1 && input == common_pfx)
- {
-diff --git a/ddd/exit.C b/ddd/exit.C
-index f490c23..664f203 100644
---- a/ddd/exit.C
-+++ b/ddd/exit.C
-@@ -478,7 +478,7 @@ void get_core_pattern(int signal)
- str_func_ret = "core";
- }
- else {
-- readline(patternfile, pattern);
-+ readline(patternfile, pattern, '\n', 1);
- core_pat = pattern.chars();
- while(*core_pat)
- {
-diff --git a/ddd/strclass.C b/ddd/strclass.C
-index be0bade..dfbb054 100644
---- a/ddd/strclass.C
-+++ b/ddd/strclass.C
-@@ -1563,6 +1563,7 @@ std::istream& operator>>(std::istream& s, string& x)
- return s;
- }
-
-+
- int readline(std::istream& s, string& x, char terminator, int discard)
- {
- assert(!x.consuming());
-diff --git a/ddd/strclass.h b/ddd/strclass.h
-index 7ef16fa..035a17e 100644
---- a/ddd/strclass.h
-+++ b/ddd/strclass.h
-@@ -811,9 +811,11 @@ public:
- const regex& sep);
-
- friend string common_prefix(const string& x, const string& y,
-- int startpos = 0);
-+ int startpos);
-+
- friend string common_suffix(const string& x, const string& y,
-- int startpos = -1);
-+ int startpos);
-+
- friend string replicate(char c, int n);
- friend string replicate(const string& y, int n);
- friend string join(const string *src, int n, const string& sep);
-@@ -864,8 +866,8 @@ public:
- friend std::istream& operator>>(std::istream& s, string& x);
-
- friend int readline(std::istream& s, string& x,
-- char terminator = '\n',
-- int discard_terminator = 1);
-+ char terminator,
-+ int discard_terminator);
-
- // Status
- unsigned int length() const;
diff --git a/srcpkgs/ddd/template b/srcpkgs/ddd/template
index 24f44a9abc2379..e8eacf322144da 100644
--- a/srcpkgs/ddd/template
+++ b/srcpkgs/ddd/template
@@ -1,7 +1,7 @@
# Template file for 'ddd'
pkgname=ddd
-version=3.3.12
-revision=6
+version=3.4.0
+revision=1
build_style=gnu-configure
makedepends="ncurses-devel libXt-devel libXext-devel libXmu-devel motif-devel"
short_desc="Graphical front-end for command-line debuggers"
@@ -9,4 +9,8 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/ddd"
distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=3ad6cd67d7f4b1d6b2d38537261564a0d26aaed077bf25c51efc1474d0e8b65c
+checksum=5d4cbc8a0bb0458543866d679308c53a3ef066e402fe5a1918e19698a3d3580f
+
+do_check() {
+ : # interactive, hangs on CI
+}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: ddd: update to 3.4.0
2024-04-17 14:21 [PR PATCH] ddd: update to 3.4.0 mvf
2024-04-17 15:13 ` [PR PATCH] [Updated] " mvf
@ 2024-04-19 17:43 ` cinerea0
1 sibling, 0 replies; 3+ messages in thread
From: cinerea0 @ 2024-04-19 17:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]
There's a merged pull request on the void-packages repository
ddd: update to 3.4.0
https://github.com/void-linux/void-packages/pull/49881
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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-19 17:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-17 14:21 [PR PATCH] ddd: update to 3.4.0 mvf
2024-04-17 15:13 ` [PR PATCH] [Updated] " mvf
2024-04-19 17:43 ` [PR PATCH] [Merged]: " cinerea0
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).