diff -Nru gambas3-3.16.3/debian/changelog gambas3-3.16.3/debian/changelog
--- gambas3-3.16.3/debian/changelog	2021-09-11 12:12:24.000000000 +0000
+++ gambas3-3.16.3/debian/changelog	2021-09-30 17:21:52.000000000 +0000
@@ -1,3 +1,11 @@
+gambas3 (3.16.3-1+rpi1) bookworm-staging; urgency=medium
+
+  * Don't use qtwebengine on raspbian.
+  * Add build conflicts on libcgal-dev, it seems to break the build.
+  * Fix clean target.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 30 Sep 2021 17:21:52 +0000
+
 gambas3 (3.16.3-1) unstable; urgency=medium
 
   * New upstream version 3.16.3
diff -Nru gambas3-3.16.3/debian/control gambas3-3.16.3/debian/control
--- gambas3-3.16.3/debian/control	2021-09-11 12:09:11.000000000 +0000
+++ gambas3-3.16.3/debian/control	2021-09-30 17:21:52.000000000 +0000
@@ -65,10 +65,12 @@
                mesa-common-dev,
                pkg-config,
                postgresql-server-dev-all:native,
-               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
 
@@ -894,7 +896,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}),
          ${misc:Depends},
diff -Nru gambas3-3.16.3/debian/rules gambas3-3.16.3/debian/rules
--- gambas3-3.16.3/debian/rules	2021-09-11 12:09:11.000000000 +0000
+++ gambas3-3.16.3/debian/rules	2021-09-30 17:21:52.000000000 +0000
@@ -12,7 +12,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
 
@@ -36,6 +36,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