mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-08 08:30:47 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/rdesktop: update the patches to be applied with fuzz 0

Browse Source 
Commit 8f88a644ed "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] e2dde9c7cd

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
This commit is contained in:
Julien Olivain
2024-07-04 11:45:49 +02:00
committed by Romain Naour
parent 9ede791756
commit 3149532ff1
3 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.checkpackageignore
View File

@@ -1226,7 +1226,6 @@ package/quotatool/0001-fix-missing-__P-definition-for-musl-compile.patch lib_pat
package/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch lib_patch.Upstream
package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch lib_patch.Upstream
package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch lib_patch.Upstream
package/rdesktop/0001-8bit-colors.patch lib_patch.Sob lib_patch.Upstream
package/read-edid/0001-Fix-install-file-list.patch lib_patch.Upstream
package/read-edid/0002-Fix-compiler-check.patch lib_patch.Upstream
package/read-edid/0003-fix-build-with-gcc-10.patch lib_patch.Upstream

21
package/rdesktop/0001-8bit-colors.patch
View File

@@ -1,21 +0,0 @@
diff -urpN rdesktop-1.5.0-orig/xwin.c rdesktop-1.5.0/xwin.c
--- rdesktop-1.5.0-orig/xwin.c 2007-01-17 12:01:18.000000000 +0100
+++ rdesktop-1.5.0/xwin.c 2007-01-17 12:05:02.000000000 +0100
@@ -1461,7 +1461,7 @@ select_visual(int screen_num)
}
/* we use a colourmap, so the default visual should do */
- g_owncolmap = True;
+// g_owncolmap = True;
g_visual = vmatches[0].visual;
g_depth = vmatches[0].depth;
}
@@ -1568,7 +1568,7 @@ ui_init(void)
{
g_xcolmap =
XCreateColormap(g_display, RootWindowOfScreen(g_screen), g_visual,
- AllocNone);
+ (g_depth <= 8) ? AllocAll : AllocNone);
if (g_depth <= 8)
warning("Display colour depth is %d bit: you may want to use -C for a private colourmap.\n", g_depth);
}

38
package/rdesktop/0001-Allow-8-bit-colors.patch Normal file
View File

@@ -0,0 +1,38 @@
From 2159684f1287b6bca2bd74c129b752a636ee807f Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <peter@korsgaard.com>
Date: Wed, 17 Jan 2007 13:58:01 +0000
Subject: [PATCH] Allow 8-bit colors
Upstream: Reported as unmaintained on homepage http://www.rdesktop.org/
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
[Julien: refreshed the patch to be applied with fuzz factor 0]
Signed-off-by: Julien Olivain <ju.o@free.fr>
---
xwin.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xwin.c b/xwin.c
index d96d0f4..d11f4a6 100644
--- a/xwin.c
+++ b/xwin.c
@@ -1801,7 +1801,7 @@ select_visual(int screen_num)
}
/* we use a colourmap, so the default visual should do */
- g_owncolmap = True;
+// g_owncolmap = True;
g_visual = vmatches[0].visual;
g_depth = vmatches[0].depth;
}
@@ -2010,7 +2010,7 @@ ui_init(void)
{
g_xcolmap =
XCreateColormap(g_display, RootWindowOfScreen(g_screen), g_visual,
- AllocNone);
+ (g_depth <= 8) ? AllocAll : AllocNone);
if (g_depth <= 8)
logger(GUI, Warning,
"Display colour depth is %d bit: you may want to use -C for a private colourmap",
--
2.45.2