diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2026-03-19 19:14:21 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2026-03-19 19:14:21 +0000 |
| commit | 117d3bbc805e74921f2a1773a52d6f40612d5454 (patch) | |
| tree | 5abccfdc02ec7bbcab1450bd07dbc7f8374922aa /dev-util/patchutils | |
| parent | 953f0280b3dd0ddb35940a401607990d5bbde612 (diff) | |
| download | baldeagleos-repo-117d3bbc805e74921f2a1773a52d6f40612d5454.tar.gz baldeagleos-repo-117d3bbc805e74921f2a1773a52d6f40612d5454.tar.xz baldeagleos-repo-117d3bbc805e74921f2a1773a52d6f40612d5454.zip | |
Adding metadata
Diffstat (limited to 'dev-util/patchutils')
| -rw-r--r-- | dev-util/patchutils/files/0.4.5-completion-symlinks.patch | 26 | ||||
| -rw-r--r-- | dev-util/patchutils/files/0.4.5-const.patch | 69 | ||||
| -rw-r--r-- | dev-util/patchutils/patchutils-0.4.5-r1.ebuild (renamed from dev-util/patchutils/patchutils-0.4.5.ebuild) | 5 |
3 files changed, 100 insertions, 0 deletions
diff --git a/dev-util/patchutils/files/0.4.5-completion-symlinks.patch b/dev-util/patchutils/files/0.4.5-completion-symlinks.patch new file mode 100644 index 000000000000..7e21dab30f19 --- /dev/null +++ b/dev-util/patchutils/files/0.4.5-completion-symlinks.patch @@ -0,0 +1,26 @@ +https://github.com/twaugh/patchutils/pull/175 + +diff --git a/Makefile.am b/Makefile.am +index 433f4aa..7d8960c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -179,7 +179,8 @@ install-data-hook: + mv bash-completion-patchutils interdiff && \ + for cmd in filterdiff lsdiff grepdiff combinediff flipdiff rediff \ + splitdiff recountdiff unwrapdiff dehtmldiff editdiff espdiff \ +- fixcvsdiff patchview gitdiff svndiff gitdiffview svndiffview; do \ ++ fixcvsdiff patchview gitdiff svndiff gitdiffview svndiffview \ ++ gitshow gitshowview; do \ + ln -sf interdiff "$$cmd" || true; \ + done; \ + fi +@@ -202,7 +203,8 @@ endif + cd "$(DESTDIR)$(bashcompletiondir)" && \ + for cmd in filterdiff lsdiff grepdiff interdiff combinediff flipdiff rediff \ + splitdiff recountdiff unwrapdiff dehtmldiff editdiff espdiff \ +- fixcvsdiff patchview gitdiff svndiff gitdiffview svndiffview; do \ ++ fixcvsdiff patchview gitdiff svndiff gitdiffview svndiffview \ ++ gitshow gitshowview; do \ + rm -f "$$cmd"; \ + done; \ + rm -f patchutils; \ diff --git a/dev-util/patchutils/files/0.4.5-const.patch b/dev-util/patchutils/files/0.4.5-const.patch new file mode 100644 index 000000000000..35518dc924a6 --- /dev/null +++ b/dev-util/patchutils/files/0.4.5-const.patch @@ -0,0 +1,69 @@ +https://github.com/twaugh/patchutils/commit/0cfe6230b6669526ef8de3a1b26b55ae9e9c96fa + +From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com> +Date: Thu, 26 Feb 2026 18:07:35 +0100 +Subject: [PATCH] More const fixes for C23 [0.4.x] +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is a followup to #159 and fixes more glibc-2.43/C23 related const +warnings. Where we can, we make things more const; where necessary we +explicitly treat mutable things as mutable instead of pretending that +they are not. + +Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com> +--- + src/diff.c | 4 ++-- + src/rediff.c | 2 +- + src/util.c | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/diff.c b/src/diff.c +index 9c17e112..40c51cd2 100644 +--- a/src/diff.c ++++ b/src/diff.c +@@ -159,7 +159,7 @@ const char *stripped (const char *name, int num_components) + + unsigned long calculate_num_lines (const char *atatline, char which) + { +- char *p = strchr (atatline, which); ++ const char *p = strchr (atatline, which); + if (!p) + return 1; + while (*p && *p != ',' && *p != ' ') p++; +@@ -187,7 +187,7 @@ int read_atatline (const char *atatline, + { + char *endptr; + unsigned long res; +- char *p; ++ const char *p; + + if (orig_offset) { + p = strchr (atatline, '-'); +diff --git a/src/rediff.c b/src/rediff.c +index 10e6765c..7a4546f9 100644 +--- a/src/rediff.c ++++ b/src/rediff.c +@@ -265,7 +265,7 @@ static void copy_to (struct hunk *from, struct hunk *upto, + } + + /* Deal with an added hunk. */ +-static long added_hunk (const char *meta, long offset, FILE *modify, FILE *t, ++static long added_hunk (char *meta, long offset, FILE *modify, FILE *t, + unsigned long morig_count, unsigned long mnew_count) + { + long this_offset = 0; +diff --git a/src/util.c b/src/util.c +index 4f46f3c4..0ff86ee3 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -250,7 +250,7 @@ FILE *xopen_seekable (const char *name, const char *mode) + /* unzip if needed */ + FILE *xopen_unzip (const char *name, const char *mode) + { +- char *p, *zprog = NULL; ++ const char *p, *zprog = NULL; + FILE *fi, *fo; + const size_t buflen = 64 * 1024; + char *buffer; diff --git a/dev-util/patchutils/patchutils-0.4.5.ebuild b/dev-util/patchutils/patchutils-0.4.5-r1.ebuild index 293de13fe027..c152278cfe13 100644 --- a/dev-util/patchutils/patchutils-0.4.5.ebuild +++ b/dev-util/patchutils/patchutils-0.4.5-r1.ebuild @@ -28,6 +28,11 @@ DEPEND=" " BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/0.4.5-const.patch" + "${FILESDIR}/0.4.5-completion-symlinks.patch" +) + pkg_setup() { python-single-r1_pkg_setup } |
