summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/xrdp/xrdp/fix-compiling-with-musl.patch27
-rw-r--r--meta-oe/recipes-support/xrdp/xrdp_0.10.5.bb (renamed from meta-oe/recipes-support/xrdp/xrdp_0.10.4.1.bb)4
2 files changed, 1 insertions, 30 deletions
diff --git a/meta-oe/recipes-support/xrdp/xrdp/fix-compiling-with-musl.patch b/meta-oe/recipes-support/xrdp/xrdp/fix-compiling-with-musl.patch
deleted file mode 100644
index c716229ab6..0000000000
--- a/meta-oe/recipes-support/xrdp/xrdp/fix-compiling-with-musl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1
2sys/signal.h does almost the same in both glibc and musl: it includes "signal.h"
3
4However with musl there is also a warning macro about this, which is interpreted as
5an error during building.
6
7Fixes error:
8
9| In file included from ../../sources/xrdp-0.10.4.1/waitforx/waitforx.c:5:
10| <...>/usr/include/sys/signal.h:1:2: error: #warning redirecting incorrect #include <sys/signal.h> to <signal.h> [-Werror=cpp]
11| 1 | #warning redirecting incorrect #include <sys/signal.h> to <signal.h>
12| | ^~~~~~~
13| cc1: all warnings being treated as errors
14
15Upstream-Status: Submitted [https://github.com/neutrinolabs/xrdp/pull/3678]
16Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
17
18--- ./waitforx/waitforx.c.orig 2025-11-25 14:38:46.464337398 +0100
19+++ ./waitforx/waitforx.c 2025-11-25 14:38:52.007441093 +0100
20@@ -2,7 +2,6 @@
21 #include <signal.h>
22 #include <stdio.h>
23 #include <stdlib.h>
24-#include <sys/signal.h>
25 #include <unistd.h>
26
27 #include "config_ac.h"
diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.10.4.1.bb b/meta-oe/recipes-support/xrdp/xrdp_0.10.5.bb
index 8203ada8e5..8d7c5807f2 100644
--- a/meta-oe/recipes-support/xrdp/xrdp_0.10.4.1.bb
+++ b/meta-oe/recipes-support/xrdp/xrdp_0.10.5.bb
@@ -17,9 +17,7 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN
17 file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \ 17 file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \
18 file://0001-mark-count-with-unused-attribute.patch \ 18 file://0001-mark-count-with-unused-attribute.patch \
19 " 19 "
20SRC_URI:append:libc-musl = " file://fix-compiling-with-musl.patch" 20SRC_URI[sha256sum] = "9abc96d164de4b1c40e2f3f537d0593d052a640cf3388978c133715ea69fb123"
21
22SRC_URI[sha256sum] = "52eadf3e86c57be0de0b9d5c184b52a7946a070746d3eb04b5089dd6d42f8f5f"
23 21
24UPSTREAM_CHECK_URI = "https://github.com/neutrinolabs/xrdp/releases" 22UPSTREAM_CHECK_URI = "https://github.com/neutrinolabs/xrdp/releases"
25UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" 23UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)"