Merge ~liushuyu-011/ubuntu/+source/backstep:ubuntu/devel into ubuntu/+source/backstep:ubuntu/devel

[Zixing Liu]

This MP adds a patch to fix FTBFS on armhf. The reason was the project contains various errors and typos in the code that can't pass compile if -Werror is enabled.

[Zixing Liu (liushuyu-011)]

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/15925327/+listing-archive-extra

[Steve Langasek (vorlon)]

review: Approve

[Nick Rosbrook (enr0n)]

Thanks for the patch. It would be good to have a bug that explains the FTBFS you are fixing. Don't forget to include a Bug-Ubuntu: field in the patch header once you open the bug.

Also, it looks like your patch probably addresses multiple implicit declarations, but the changelog entry only mentions adding one missing header. Could you please update the changelog entry (and probably patch description) to be more accurate?

Edit: Steve already sponsored.

review: Needs Fixing

diff --git a/debian/changelog b/debian/changelog
index 7d1a789..82727a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+backstep (0.3-0ubuntu13) noble; urgency=medium
+
+  * debian/patches/add-missing-configurator-header.patch: Add a missing
+    header.
+
+ -- Zixing Liu <[e-mail]>  Wed, 10 Apr 2024 12:45:41 -0600
+
 backstep (0.3-0ubuntu12) noble; urgency=medium
 
   * No-change rebuild for CVE-2024-3094
diff --git a/debian/patches/add-missing-configurator-header.patch b/debian/patches/add-missing-configurator-header.patch
new file mode 100644
index 0000000..c3d9061
--- /dev/null
+++ b/debian/patches/add-missing-configurator-header.patch
@@ -0,0 +1,65 @@
+Description: Add missing headers
+ Adds a missing header to include a function prototype and also fixes
+ a typo in the header
+Author: Zixing Liu <[e-mail]>
+Forwarded: no
+Last-Update: 2024-04-10
+
+Index: backstep/src/backstep.c
+===================================================================
+--- backstep.orig/src/backstep.c
++++ backstep/src/backstep.c
+@@ -35,6 +35,7 @@
+ #include "windows.h"
+ #include "managedwindow.h"
+ #include "configuration.h"
++#include "configurator.h"
+ #include "settings.h"
+ #include "session.h"
+ #include "colors.h"
+Index: backstep/src/sessionclient.h
+===================================================================
+--- backstep.orig/src/sessionclient.h
++++ backstep/src/sessionclient.h
+@@ -49,7 +49,7 @@ void bs_session_client_get_prop_value(BS
+                                       const gchar *name,
+                                       SmPropValue **val_ret, 
+                                       gint *nvals_ret);
+-void bs_sessin_client_set_list_of_array_prop(BSSessionClient *client, 
++void bs_session_client_set_list_of_array_prop(BSSessionClient *client, 
+                                              const gchar *name,
+                                              const gchar *vals[],
+                                              gint nvals);
+Index: backstep/src/error.h
+===================================================================
+--- backstep.orig/src/error.h
++++ backstep/src/error.h
+@@ -17,7 +17,7 @@
+  */
+ #ifndef ERROR_H
+ #define ERROR_H
+-
++GQuark bs_error_quark();
+ #define BACKSTEP_ERROR bs_error_quark()
+ 
+ typedef enum {
+Index: backstep/src/windowpixmaprender.c
+===================================================================
+--- backstep.orig/src/windowpixmaprender.c
++++ backstep/src/windowpixmaprender.c
+@@ -19,6 +19,7 @@
+ #  include <config.h>
+ #endif
+ #ifdef HAVE_RENDER
++#include <math.h>
+ #include <gdk/gdkx.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xatom.h>
+@@ -27,6 +28,7 @@
+ #include <X11/extensions/Xcomposite.h>
+ #include <X11/extensions/Xdamage.h>
+ #include "windowpixmaprender.h"
++#include "damage.h"
+ #include "trace.h"
+ 
+ static double scale = .33;
diff --git a/debian/patches/series b/debian/patches/series
index 659f2b5..3327026 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 binutils-gold.patch
 libm-underlinkage.patch
 format-security.patch
+add-missing-configurator-header.patch