Skip to content

Commit 3149532

Browse files
jolivainRomainNaour
authored andcommitted
package/rdesktop: update the patches to be applied with fuzz 0
Commit 8f88a64 "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, rdesktop fails to build with output: Applying 0001-8bit-colors.patch using patch: patching file xwin.c Hunk #1 succeeded at 1801 (offset 340 lines). Hunk #2 FAILED at 1568. 1 out of 2 hunks FAILED -- saving rejects to file xwin.c.rej This commit refreshes the package patches on the current package version. The original patch was not generated with "git format-patch", and had no information (no commit log, no author, no date, ...). Since it was introduced in commit [1], the author and date is set to this commit. The "Upstream:" tag is also added to the patch, mentioning the upstream project is reported as unmaintained on its homepage (at the time of this commit). Finally, the ".checkpackageignore" entry is removed, since it is no longer needed. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/e2dde9c7cdc2f9ed851acfb7daa858ffa1744246 Signed-off-by: Julien Olivain <[email protected]> Signed-off-by: Romain Naour <[email protected]>
1 parent 9ede791 commit 3149532

File tree

3 files changed

+38
-22
lines changed

3 files changed

+38
-22
lines changed

.checkpackageignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,6 @@ package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch lib_pat
12261226
package/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch lib_patch.Upstream
12271227
package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch lib_patch.Upstream
12281228
package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch lib_patch.Upstream
1229-
package/rdesktop/0001-8bit-colors.patch lib_patch.Sob lib_patch.Upstream
12301229
package/read-edid/0001-Fix-install-file-list.patch lib_patch.Upstream
12311230
package/read-edid/0002-Fix-compiler-check.patch lib_patch.Upstream
12321231
package/read-edid/0003-fix-build-with-gcc-10.patch lib_patch.Upstream

package/rdesktop/0001-8bit-colors.patch

Lines changed: 0 additions & 21 deletions
This file was deleted.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
From 2159684f1287b6bca2bd74c129b752a636ee807f Mon Sep 17 00:00:00 2001
2+
From: Peter Korsgaard <[email protected]>
3+
Date: Wed, 17 Jan 2007 13:58:01 +0000
4+
Subject: [PATCH] Allow 8-bit colors
5+
6+
Upstream: Reported as unmaintained on homepage http://www.rdesktop.org/
7+
Signed-off-by: Peter Korsgaard <[email protected]>
8+
[Julien: refreshed the patch to be applied with fuzz factor 0]
9+
Signed-off-by: Julien Olivain <[email protected]>
10+
---
11+
xwin.c | 4 ++--
12+
1 file changed, 2 insertions(+), 2 deletions(-)
13+
14+
diff --git a/xwin.c b/xwin.c
15+
index d96d0f4..d11f4a6 100644
16+
--- a/xwin.c
17+
+++ b/xwin.c
18+
@@ -1801,7 +1801,7 @@ select_visual(int screen_num)
19+
}
20+
21+
/* we use a colourmap, so the default visual should do */
22+
- g_owncolmap = True;
23+
+// g_owncolmap = True;
24+
g_visual = vmatches[0].visual;
25+
g_depth = vmatches[0].depth;
26+
}
27+
@@ -2010,7 +2010,7 @@ ui_init(void)
28+
{
29+
g_xcolmap =
30+
XCreateColormap(g_display, RootWindowOfScreen(g_screen), g_visual,
31+
- AllocNone);
32+
+ (g_depth <= 8) ? AllocAll : AllocNone);
33+
if (g_depth <= 8)
34+
logger(GUI, Warning,
35+
"Display colour depth is %d bit: you may want to use -C for a private colourmap",
36+
--
37+
2.45.2
38+

0 commit comments

Comments
 (0)