Attachment 229762 Details for Bug 258812 – use upstream fix ("git am")

[patch] use upstream fix ("git am")

0001-devel-basu-switch-to-upstream-fix-after-ffe546db80d9.patch (text/plain), 3.40 KB, created by Evgenii Khramtsov on 2021-11-28 03:59:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Evgenii Khramtsov

Created: 2021-11-28 03:59:52 UTC

Size: 3.40 KB

patch

obsolete

>From 777a3f980d0abc033933b711c9e7de3851b3bc6c Mon Sep 17 00:00:00 2001
>From: Evgeniy Khramtsov <evgeniy@khramtsov.org>
>Date: Sun, 28 Nov 2021 03:56:15 +0000
>Subject: [PATCH] devel/basu: switch to upstream fix after ffe546db80d9
>
>PR:	258812
>---
> devel/basu/Makefile          |  1 +
> devel/basu/distinfo          |  4 +++-
> devel/basu/files/patch-lld13 | 23 -----------------------
> 3 files changed, 4 insertions(+), 24 deletions(-)
> delete mode 100644 devel/basu/files/patch-lld13
>
>diff --git a/devel/basu/Makefile b/devel/basu/Makefile
>index 7f0b49f53834..0daa22d80d9d 100644
>--- a/devel/basu/Makefile
>+++ b/devel/basu/Makefile
>@@ -9,6 +9,7 @@ PATCH_SITES=	https://git.sr.ht/~emersion/${PORTNAME}/commit/
> PATCHFILES+=	928a746f7ebd.patch:-p1 # https://github.com/emersion/basu/pull/35
> PATCHFILES+=	4277dfe8077c.patch:-p1 # https://github.com/emersion/basu/pull/35
> PATCHFILES+=	f12a4efd8cb7.patch:-p1 # https://github.com/emersion/basu/pull/40
>+PATCHFILES+=	5fa970e868f2.patch:-p1 # https://lists.sr.ht/~emersion/public-inbox/patches/26862
> 
> MAINTAINER=	jbeich@FreeBSD.org
> COMMENT=	sd-bus library, extracted from systemd
>diff --git a/devel/basu/distinfo b/devel/basu/distinfo
>index 1924fd1e4c6d..ebbfc32120ec 100644
>--- a/devel/basu/distinfo
>+++ b/devel/basu/distinfo
>@@ -1,4 +1,4 @@
>-TIMESTAMP = 1609941411
>+TIMESTAMP = 1638071625
> SHA256 (basu-v0.2.0.tar.gz) = 673006f9ded754963249024b30319d7179665fde5a685d4b3b1a98d1a209a951
> SIZE (basu-v0.2.0.tar.gz) = 238871
> SHA256 (928a746f7ebd.patch) = d42af762217f7e0f189dcc1221d0ae6779d9e4be079acf9920e2585ecfd6e3c4
>@@ -7,3 +7,5 @@ SHA256 (4277dfe8077c.patch) = a382955269652ddc3b6190512b77975e3ef9bcd140e02c1f5a
> SIZE (4277dfe8077c.patch) = 875
> SHA256 (f12a4efd8cb7.patch) = 652fb79fc005038dca30bd893623cad147fa5adef40627ab490ba366f8d94cd7
> SIZE (f12a4efd8cb7.patch) = 1293
>+SHA256 (5fa970e868f2.patch) = 687673614b1b550f7ce60fc35aca5dec67d480aba7e3af3215a23552897f9e9c
>+SIZE (5fa970e868f2.patch) = 2192
>diff --git a/devel/basu/files/patch-lld13 b/devel/basu/files/patch-lld13
>deleted file mode 100644
>index fde89d2ea9ac..000000000000
>--- a/devel/basu/files/patch-lld13
>+++ /dev/null
>@@ -1,23 +0,0 @@
>-https://lists.sr.ht/~emersion/public-inbox/%3CCANvPQf_5qOdfbe4Tk029yVB6BHipmYfQnuuCVoTUv3N%3D2f8jfw%40mail.gmail.com%3E
>-https://github.com/systemd/systemd/commit/945317a4b69d33752c9513bb8994fe8d5a786ea6
>-
>---- src/libsystemd/sd-bus/bus-error.h.orig	2021-01-06 13:56:51 UTC
>-+++ src/libsystemd/sd-bus/bus-error.h
>-@@ -28,11 +28,17 @@ int bus_error_set_errnofv(sd_bus_error *e, int error, 
>-  * the bus error table, and BUS_ERROR_MAP_ELF_USE has to be used at
>-  * least once per compilation unit (i.e. per library), to ensure that
>-  * the error map is really added to the final binary.
>-+ *
>-+ * In addition, set the retain attribute so that the section cannot be
>-+ * discarded by ld --gc-sections -z start-stop-gc. Older compilers would
>-+ * warn for the unknown attribute, so just disable -Wattributes.
>-  */
>- 
>- #define BUS_ERROR_MAP_ELF_REGISTER                                      \
>-+        _Pragma("GCC diagnostic ignored \"-Wattributes\"")              \
>-         __attribute__ ((__section__("BUS_ERROR_MAP")))                  \
>-         __attribute__ ((__used__))                                      \
>-+        __attribute__ ((retain))                                        \
>-         __attribute__ ((aligned(8)))
>- 
>- #define BUS_ERROR_MAP_ELF_USE(errors)                                   \
>-- 
>2.34.1
>

Flags:

2khramtsov: maintainer-approval? (jbeich)

Actions: View | Diff

Attachments on bug 258812: 228291 | 228559 | 229762