Package: whitedune
Followup-For: Bug #1067618
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu noble ubuntu-patch
Control: tags -1 patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/implicit-declarations.patch: Add missing includes and
function prototypes. (LP: #2061038).
Thanks for considering the patch.
-- System Information:
Debian Release: bookworm/sid
APT prefers jammy-updates
APT policy: (500, 'jammy-updates'), (500, 'jammy-security'), (500, 'jammy'),
(100, 'jammy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 6.5.0-27-generic (SMP w/10 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8),
LANGUAGE=en_CA:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru whitedune-0.30.10/debian/patches/implicit-declarations.patch
whitedune-0.30.10/debian/patches/implicit-declarations.patch
--- whitedune-0.30.10/debian/patches/implicit-declarations.patch
1969-12-31 17:00:00.000000000 -0700
+++ whitedune-0.30.10/debian/patches/implicit-declarations.patch
2024-04-15 11:23:06.000000000 -0600
@@ -0,0 +1,60 @@
+Description: Add missing includes and function prototypes
+ This fixes FTBFS on armhf
+Author: Zixing Liu <zixing....@canonical.com>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1067618
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/whitedune/+bug/2061038
+Forwarded: no
+Last-Update: 2024-04-15
+---
+Index: whitedune/src/SDLjoystick/SDL_joystick_c.h
+===================================================================
+--- whitedune.orig/src/SDLjoystick/SDL_joystick_c.h
++++ whitedune/src/SDLjoystick/SDL_joystick_c.h
+@@ -2,3 +2,11 @@
+ * This Makefile is free software; the Free Software Foundation
+ * gives unlimited permission to copy, distribute and modify it.
+ */
++extern int SDL_PrivateJoystickButton(SDL_Joystick *joystick,
++ Uint8 button, Uint8 state);
++extern int SDL_PrivateJoystickAxis(SDL_Joystick *joystick,
++ Uint8 axis, Sint16 value);
++extern int SDL_PrivateJoystickBall(SDL_Joystick *joystick,
++ Uint8 ball, Sint16 xrel, Sint16 yrel);
++extern int SDL_PrivateJoystickHat(SDL_Joystick *joystick,
++ Uint8 hat, Uint8 value);
+Index: whitedune/src/swt/rc/rclex.l
+===================================================================
+--- whitedune.orig/src/swt/rc/rclex.l
++++ whitedune/src/swt/rc/rclex.l
+@@ -28,6 +28,7 @@
+ #include <string.h>
+
+ #include <res.h>
++#include <unistd.h>
+ #include "y.tab.h"
+ #include "rc.h"
+
+Index: whitedune/src/swt/rc/rcparse.y
+===================================================================
+--- whitedune.orig/src/swt/rc/rcparse.y
++++ whitedune/src/swt/rc/rcparse.y
+@@ -38,6 +38,7 @@ static RCNode *append(RCNode *node1, RCN
+ static RCBitmap *newBitmap(int id, const char *filename);
+ static void addAccelerator(int key, int modifiers, int command);
+ static int getVirtkey(const char *str);
++int yyerror(const char *s);
+
+ RCBitmap **bitmaps = NULL;
+ RCNode **nodes = NULL;
+Index: whitedune/src/pngLoad.c
+===================================================================
+--- whitedune.orig/src/pngLoad.c
++++ whitedune/src/pngLoad.c
+@@ -20,6 +20,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ #include "config.h"
+
diff -Nru whitedune-0.30.10/debian/patches/series
whitedune-0.30.10/debian/patches/series
--- whitedune-0.30.10/debian/patches/series 2019-02-12 14:32:01.000000000
-0700
+++ whitedune-0.30.10/debian/patches/series 2024-04-15 11:20:26.000000000
-0600
@@ -1,3 +1,4 @@
libxp-configure.patch
png1.5.patch
avoid-grep-binary.patch
+implicit-declarations.patch
