diff -Nru gambas3-3.17.2/debian/changelog gambas3-3.17.2/debian/changelog
--- gambas3-3.17.2/debian/changelog	2022-07-07 14:42:48.000000000 +0000
+++ gambas3-3.17.2/debian/changelog	2022-07-15 13:51:34.000000000 +0000
@@ -1,3 +1,12 @@
+gambas3 (3.17.2-2+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 3.16.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 30 Sep 2021 17:21:52 +0000]
+  * Don't use qtwebengine on raspbian.
+  * Add build conflicts on libcgal-dev, it seems to break the build.
+  * Fix clean target.
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 15 Jul 2022 13:51:34 +0000
+
 gambas3 (3.17.2-2) unstable; urgency=medium
 
   [ Nathan Pratta Teodosio ]
diff -Nru gambas3-3.17.2/debian/control gambas3-3.17.2/debian/control
--- gambas3-3.17.2/debian/control	2022-07-07 14:34:26.000000000 +0000
+++ gambas3-3.17.2/debian/control	2022-07-15 13:51:34.000000000 +0000
@@ -65,10 +65,12 @@
                linux-libc-dev [linux-any],
                mesa-common-dev,
                pkg-config,
-               qtwebengine5-dev [amd64 arm64 armhf i386 mips64el mipsel],
+               qtwebengine5-dev [amd64 arm64 i386 mips64el mipsel],
                unixodbc-dev,
                xdg-utils,
                zlib1g-dev
+Build-Conflicts:
+               libcgal-dev
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
 
@@ -920,7 +922,7 @@
  This package allows the QT5 component to access X11.
 
 Package: gambas3-gb-qt5-webview
-Architecture: amd64 arm64 armhf i386 mips64el mipsel
+Architecture: amd64 arm64 i386 mips64el mipsel
 Section: kde
 Depends: gambas3-gb-qt5 (>= ${binary:Version}),
          gambas3-gb-qt5-x11 | gambas3-gb-qt5-wayland,
diff -Nru gambas3-3.17.2/debian/rules gambas3-3.17.2/debian/rules
--- gambas3-3.17.2/debian/rules	2022-07-07 14:33:15.000000000 +0000
+++ gambas3-3.17.2/debian/rules	2022-07-15 13:51:34.000000000 +0000
@@ -14,7 +14,7 @@
 DISABLE_MODULES+= --disable-v4l
 endif
 
-ifeq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 armhf i386 mips64el mipsel))
+ifeq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 i386 mips64el mipsel))
 DISABLE_MODULES+= --disable-qt5webview
 endif
 
@@ -38,6 +38,10 @@
 	find . -name "*.mo" -delete
 	find . -name "*.pot" -delete
 	rm -fv aclocal.m4 main/aclocal.m4
+	rm -rf main/lib/inotify/.libs
+	find . -name config.sub -delete
+	find . -name config.guess -delete
+	rm -f gb.qt5/src/webview/Makefile main/lib/inotify/Makefile main/lib/inotify/gb.inotify.la main/lib/inotify/gb_inotify_la-c_watch.lo main/lib/inotify/gb_inotify_la-gb_list.lo main/lib/inotify/gb_inotify_la-main.lo
 
 override_dh_auto_install:
 	dh_auto_install --no-parallel