* [PR PATCH] ksolid: remove musl patch.
@ 2020-08-24 20:47 ericonr
2020-08-24 21:12 ` [PR PATCH] [Merged]: " abenson
0 siblings, 1 reply; 2+ messages in thread
From: ericonr @ 2020-08-24 20:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages ksolid
https://github.com/void-linux/void-packages/pull/24458
ksolid: remove musl patch.
@Johnnynator it's been solved upstream, but it was included below their own headers, so the patch didn't fail.
A patch file from https://github.com/void-linux/void-packages/pull/24458.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ksolid-24458.patch --]
[-- Type: text/x-diff, Size: 930 bytes --]
From d75e9cbcab66be8e2885ecc05700f2290c4aeaca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 24 Aug 2020 17:44:57 -0300
Subject: [PATCH] ksolid: remove musl patch.
---
srcpkgs/ksolid/patches/musl.patch | 10 ----------
1 file changed, 10 deletions(-)
delete mode 100644 srcpkgs/ksolid/patches/musl.patch
diff --git a/srcpkgs/ksolid/patches/musl.patch b/srcpkgs/ksolid/patches/musl.patch
deleted file mode 100644
index ea96a4f5601..00000000000
--- a/srcpkgs/ksolid/patches/musl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/solid/devices/backends/udisks2/udisksblock.h.orig 2015-11-02 15:30:34.407887930 +0100
-+++ src/solid/devices/backends/udisks2/udisksblock.h 2015-11-02 15:30:48.702027116 +0100
-@@ -21,6 +21,7 @@
- #ifndef UDISKS2BLOCK_H
- #define UDISKS2BLOCK_H
-
-+#include <sys/types.h>
- #include <solid/devices/ifaces/block.h>
- #include "udisksdeviceinterface.h"
-
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: ksolid: remove musl patch.
2020-08-24 20:47 [PR PATCH] ksolid: remove musl patch ericonr
@ 2020-08-24 21:12 ` abenson
0 siblings, 0 replies; 2+ messages in thread
From: abenson @ 2020-08-24 21:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 381 bytes --]
There's a merged pull request on the void-packages repository
ksolid: remove musl patch.
https://github.com/void-linux/void-packages/pull/24458
Description:
@Johnnynator it's been solved upstream, but it was included below their own headers, so the patch didn't fail.
See https://invent.kde.org/frameworks/solid/-/blob/v5.73.0/src/solid/devices/backends/udisks2/udisksblock.h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-24 21:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-24 20:47 [PR PATCH] ksolid: remove musl patch ericonr
2020-08-24 21:12 ` [PR PATCH] [Merged]: " abenson
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).