From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 12 Jun 2025 17:54:03 +0000 (+0000)
Subject: Manual merge of version 3.19.5-1+rpi1 and 3.20.2-1 to produce 3.20.2-1+rpi1
X-Git-Tag: archive/raspbian/3.20.2-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3c21453ef34f29c75c70abce1459a69cdf85be5d;p=gambas3.git

Manual merge of version 3.19.5-1+rpi1 and 3.20.2-1 to produce 3.20.2-1+rpi1
---

293370c937062d3fbfd32d5a8f223861544125d2
diff --cc debian/changelog
index 96787488,20d8973a..765c0d4e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,53 +1,65 @@@
- gambas3 (3.19.5-1+rpi1) trixie-staging; urgency=medium
++gambas3 (3.20.2-1+rpi1) trixie-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.
 +
 +  [changes taken from 3.17.3-2ubuntu1 by Gianfranco Costamagna]
 +  * Use gcc-11 for now to fix a strange armhf build failure
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 15 Nov 2024 08:04:50 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 12 Jun 2025 17:53:24 +0000
++
+ gambas3 (3.20.2-1) unstable; urgency=medium
+ 
+   * Team upload
+   * New upstream version 3.20.2
+   * Correct gb.db2 dependencies
+   * Let gambas3-ide depend on gambas3-gb-hash
+   * Revert "Fix armel alignment issue"
+   * Revert "Add patches to fix build against poppler >= 25.01"
+ 
+  -- Bastian Germann <bage@debian.org>  Fri, 07 Mar 2025 23:30:21 +0100
+ 
+ gambas3 (3.20.0-4) unstable; urgency=medium
+ 
+   * Team upload
+   * Drop gambas3-gb-qt6-webview on mips64el
+   * Drop superfluous patch
+   * Fix armel alignment issue (Closes: #1093399)
+   * Check overflow
+ 
+  -- Bastian Germann <bage@debian.org>  Sat, 18 Jan 2025 13:47:39 +0100
+ 
+ gambas3 (3.20.0-3) unstable; urgency=medium
+ 
+   * Team upload
+   * Only build qt6 components that are expected
+ 
+  -- Bastian Germann <bage@debian.org>  Fri, 17 Jan 2025 20:57:45 +0100
+ 
+ gambas3 (3.20.0-2) unstable; urgency=medium
+ 
+   * Team upload
+   * Remove unused install file
+   * Enable new components and drop qt5 components
+ 
+  -- Bastian Germann <bage@debian.org>  Fri, 17 Jan 2025 15:56:29 +0100
+ 
+ gambas3 (3.20.0-1) unstable; urgency=medium
+ 
+   * Team upload
+   * New upstream version 3.20.0
+   * Revert "gbx_exec_loop: align type with builtin check signature"
+   * Rebase patch
+   * Disable new compnents
+   * Add new copyright info
+   * Do not check overflow (upstream tried to fix this unsuccessfully)
+ 
+   [ Alessandro Astone ]
+   * Add patches to fix build against poppler >= 25.01 (Closes: #1093187)
+ 
+  -- Bastian Germann <bage@debian.org>  Thu, 16 Jan 2025 11:33:39 +0100
  
  gambas3 (3.19.5-1) unstable; urgency=medium
  
diff --cc debian/control
index 21c4b819,20b02346..52ec7187
--- a/debian/control
+++ b/debian/control
@@@ -54,7 -52,9 +52,9 @@@ Build-Depends: debhelper-compat (= 12)
                 linux-libc-dev [linux-any],
                 mesa-common-dev,
                 pkgconf,
-                qtwebengine5-dev [amd64 arm64 i386 mips64el],
+                qt6-base-dev,
+                qt6-svg-dev,
 -               qt6-webengine-dev [amd64 arm64 armhf i386],
++               qt6-webengine-dev [amd64 arm64 i386],
                 unixodbc-dev,
                 xdg-utils,
                 zlib1g-dev
@@@ -899,11 -971,11 +973,11 @@@ Description: Gambas Qt5 X11 componen
   .
   This package allows the QT5 component to access X11.
  
- Package: gambas3-gb-qt5-webview
- Architecture: amd64 arm64 i386 mips64el
+ Package: gambas3-gb-qt6-webview
 -Architecture: amd64 arm64 armhf i386
++Architecture: amd64 arm64 i386
  Section: kde
- Depends: gambas3-gb-qt5 (>= ${binary:Version}),
-          gambas3-gb-qt5-x11 (>= ${binary:Version}), gambas3-gb-qt5-wayland (>= ${binary:Version}),
+ Depends: gambas3-gb-qt6 (>= ${binary:Version}),
+          gambas3-gb-qt6-x11 (>= ${binary:Version}), gambas3-gb-qt6-wayland (>= ${binary:Version}),
           ${misc:Depends},
           ${shlibs:Depends}
  Description: Gambas Qt5 Webview component
diff --cc debian/rules
index 0fc0429e,7460b810..6b5d0530
--- a/debian/rules
+++ b/debian/rules
@@@ -18,8 -13,8 +18,8 @@@ DISABLE_MODULES+= --disable-gtk3webvie
  DISABLE_MODULES+= --disable-v4l
  endif
  
- ifeq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 i386 mips64el))
- DISABLE_MODULES+= --disable-qt5webview
 -ifeq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 armhf i386))
++ifeq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 i386))
+ DISABLE_MODULES+= --disable-qt6webview
  endif