Github messages for voidlinux
 help / color / mirror / Atom feed
From: 7r3nzy <7r3nzy@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] mtree: fix for gcc-12
Date: Sat, 03 Dec 2022 07:52:23 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40884@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 466 bytes --]

There is a new pull request by 7r3nzy against master on the void-packages repository

https://github.com/7r3nzy/void-packages mtree
https://github.com/void-linux/void-packages/pull/40884

mtree: fix for gcc-12
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86-64


A patch file from https://github.com/void-linux/void-packages/pull/40884.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mtree-40884.patch --]
[-- Type: text/x-diff, Size: 2285 bytes --]

From 3a955532531fe4712f86ddd31fd73319927f265e Mon Sep 17 00:00:00 2001
From: Abdul Rehman <7r3nzy@gmail.com>
Date: Sat, 3 Dec 2022 11:50:18 +0500
Subject: [PATCH] mtree: fix for gcc-12

---
 srcpkgs/mtree/patches/1-stat.patch | 32 ++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/mtree/patches/1-stat.patch

diff --git a/srcpkgs/mtree/patches/1-stat.patch b/srcpkgs/mtree/patches/1-stat.patch
new file mode 100644
index 000000000000..0818184831ab
--- /dev/null
+++ b/srcpkgs/mtree/patches/1-stat.patch
@@ -0,0 +1,32 @@
+--- a/create.c	2017-12-08 03:59:27.000000000 +0500
++++ b/create.c 11:42:30.353325117 +0500
+@@ -213,8 +213,8 @@
+                     (intmax_t)p->fts_statp->st_size);
+         if (keys & F_TIME)
+                 output(indent, &offset, "time=%ld.%09ld",
+-                    (long)p->fts_statp->st_mtimespec.tv_sec,
+-                    p->fts_statp->st_mtimespec.tv_nsec);
++                    (long)p->fts_statp->st_mtime,
++                    p->fts_statp->st_mtim.tv_nsec);
+         if (keys & F_CKSUM && S_ISREG(p->fts_statp->st_mode)) {
+                 if ((fd = open(p->fts_accpath, O_RDONLY, 0)) < 0 ||
+                     crc(fd, &val, &len))
+--- a/compare.c	2022-12-03 11:41:16.489318329 +0500
++++ b/compare.c	2022-12-03 11:41:23.540318977 +0500
+@@ -183,13 +183,13 @@
+          * Catches nano-second differences, but doesn't display them.
+          */
+         if ((s->flags & F_TIME) &&
+-             ((s->st_mtimespec.tv_sec != p->fts_statp->st_mtimespec.tv_sec) ||
+-             (s->st_mtimespec.tv_nsec != p->fts_statp->st_mtimespec.tv_nsec))) {
++             ((s->st_mtimespec.tv_sec != p->fts_statp->st_mtime) ||
++             (s->st_mtimespec.tv_nsec != p->fts_statp->st_mtim.tv_nsec))) {
+                 LABEL;
+                 (void)printf("%smodification time expected %.24s ",
+                     tab, ctime(&s->st_mtimespec.tv_sec));
+                 (void)printf("found %.24s",
+-                    ctime(&p->fts_statp->st_mtimespec.tv_sec));
++                    ctime(&p->fts_statp->st_mtime));
+                 if (uflag) {
+                         tv[0].tv_sec = s->st_mtimespec.tv_sec;
+                         tv[0].tv_usec = s->st_mtimespec.tv_nsec / 1000;

             reply	other threads:[~2022-12-03  6:52 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-03  6:52 7r3nzy [this message]
2022-12-03  6:55 ` [PR PATCH] [Updated] mtree: fix for glibc-2.36 7r3nzy
2022-12-03  8:58 ` kruceter
2022-12-03  9:03 ` [PR PATCH] [Closed]: " 7r3nzy
2022-12-03  9:03 ` 7r3nzy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40884@inbox.vuxu.org \
    --to=7r3nzy@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).