diff -Nru gambas3-3.18.0/debian/changelog gambas3-3.18.0/debian/changelog --- gambas3-3.18.0/debian/changelog 2023-01-20 23:46:02.000000000 +0000 +++ gambas3-3.18.0/debian/changelog 2023-02-04 09:09:23.000000000 +0000 @@ -1,3 +1,24 @@ +gambas3 (3.18.0-4ubuntu1) lunar; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Use gcc-11 for now to fix a strange armhf build failure + + -- Gianfranco Costamagna Sat, 04 Feb 2023 10:09:23 +0100 + +gambas3 (3.18.0-4) unstable; urgency=medium + + * Change dependencies to guarantee IDE startup + * Remove Ian (disappeared) from Uploaders + + -- Bastian Germann Thu, 26 Jan 2023 09:11:56 +0100 + +gambas3 (3.18.0-3) unstable; urgency=high + + * Build armel with clang (gcc 12.2 fails) + * Use the correct DEB_HOST_ARCH_OS var for cross compilation + + -- Bastian Germann Mon, 23 Jan 2023 16:32:17 +0100 + gambas3 (3.18.0-2ubuntu1) lunar; urgency=medium * Sync with Debian. Remaining change: diff -Nru gambas3-3.18.0/debian/control gambas3-3.18.0/debian/control --- gambas3-3.18.0/debian/control 2023-01-20 23:46:02.000000000 +0000 +++ gambas3-3.18.0/debian/control 2023-02-04 09:09:23.000000000 +0000 @@ -4,12 +4,11 @@ Homepage: http://gambas.sourceforge.net Vcs-Git: https://salsa.debian.org/gambas-team/gambas3.git Vcs-Browser: https://salsa.debian.org/gambas-team/gambas3 -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Gambas Team -Uploaders: Ian Haywood , - Bastian Germann , +Maintainer: Debian Gambas Team +Uploaders: Bastian Germann , José L. Redrejo Rodríguez Build-Depends: debhelper-compat (= 12), gcc-11 [armhf], g++-11 [armhf], + clang [armel], gettext, libalure-dev, libbz2-dev, @@ -42,7 +41,7 @@ libpoppler-private-dev, libpq-dev, libqt5svg5-dev, - libqt5webkit5-dev, + libqt5webkit5-dev [linux-any], libqt5x11extras5-dev, librsvg2-dev, libsdl-gfx1.2-dev, @@ -112,15 +111,13 @@ gambas3-gb-opengl-glu (>= ${binary:Version}), gambas3-gb-opengl-sge (>= ${binary:Version}), gambas3-gb-openssl (>= ${binary:Version}), - gambas3-gb-pcre (>= ${binary:Version}), gambas3-gb-poppler (>= ${binary:Version}), gambas3-gb-report2 (>= ${binary:Version}), gambas3-gb-scanner (>= ${binary:Version}), gambas3-gb-sdl2 (>= ${binary:Version}), gambas3-gb-sdl2-audio (>= ${binary:Version}), - gambas3-gb-util-web (>= ${binary:Version}), gambas3-gb-term-form (>= ${binary:Version}), - gambas3-gb-vb, + gambas3-gb-vb (>= ${binary:Version}), gambas3-gb-web (>= ${binary:Version}), gambas3-gb-web-feed (>= ${binary:Version}), gambas3-gb-web-gui (>= ${binary:Version}), @@ -128,7 +125,7 @@ gambas3-gb-xml-rpc (>= ${binary:Version}), gambas3-gb-xml-xslt (>= ${binary:Version}), gambas3-ide (>= ${binary:Version}), - gambas3-scripter, + gambas3-scripter (>= ${binary:Version}), ${misc:Depends} Description: Complete visual development environment for Gambas Gambas is a free development environment based on a Basic interpreter @@ -139,7 +136,7 @@ . This package doesn't include anything: it is a metapackage to install the IDE and all the available Gambas components except deprecated ones, - the gtk3, and the qt5 components. + as well as components that are not available on every platform. Package: gambas3-devel Architecture: any @@ -157,7 +154,7 @@ Package: gambas3-examples Architecture: all -Depends: gambas3-runtime, ${misc:Depends} +Depends: gambas3-runtime (>= ${binary:Version}), ${misc:Depends} Description: Gambas examples Gambas is a free development environment based on a Basic interpreter with object extensions, like Visual Basic(tm) (but it is NOT a clone!). @@ -233,7 +230,6 @@ Architecture: all Section: libdevel Depends: gambas3-gb-form (>= ${binary:Version}), - gambas3-gb-gui (>= ${binary:Version}), gambas3-runtime (>= ${binary:Version}), ${misc:Depends} Description: Gambas charting component @@ -309,7 +305,7 @@ Package: gambas3-gb-db Architecture: any Section: libdevel -Depends: gambas3-runtime, +Depends: gambas3-runtime (>= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: Gambas database access common libraries @@ -387,7 +383,7 @@ Section: libdevel Depends: gambas3-gb-image (>= ${source:Version}), gambas3-gb-desktop-x11 (>= ${source:Version}), - gambas3-runtime, + gambas3-runtime (>= ${binary:Version}), xdg-utils, ${misc:Depends} Description: Gambas Portland project compatibility component @@ -400,7 +396,7 @@ Architecture: any Section: libdevel Depends: gambas3-gb-image (>= ${source:Version}), - gambas3-runtime, + gambas3-runtime (>= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: Gambas Portland project compatibility component for X11 @@ -526,7 +522,7 @@ Architecture: any Section: libdevel Depends: gambas3-gb-gtk3 (>= ${binary:Version}), - gambas3-gb-gtk3-x11 | gambas3-gb-gtk3-wayland, + gambas3-gb-gtk3-x11 (>= ${binary:Version}) | gambas3-gb-gtk3-wayland (>= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: Gambas GTK+3 Webview component @@ -753,7 +749,7 @@ Section: libdevel Depends: gambas3-gb-net (>= ${binary:Version}), gambas3-gb-mime (>= ${binary:Version}), - gambas3-runtime, + gambas3-runtime (>= ${binary:Version}), ${misc:Depends} Description: Gambas POP3 client implementation Gambas is a free development environment based on a Basic interpreter @@ -774,7 +770,8 @@ Package: gambas3-gb-opengl Architecture: any Section: libdevel -Depends: gambas3-runtime (>= ${binary:Version}), gambas3-gb-image (>= ${binary:Version}), +Depends: gambas3-runtime (>= ${binary:Version}), + gambas3-gb-image (>= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: Gambas OpenGL component @@ -845,7 +842,8 @@ Package: gambas3-gb-qt5 Architecture: any Section: libdevel -Depends: gambas3-runtime (>= ${binary:Version}), gambas3-gb-image (>= ${binary:Version}), +Depends: gambas3-runtime (>= ${binary:Version}), + gambas3-gb-image (>= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Recommends: gambas3-gb-qt5-ext (>= ${binary:Version}), @@ -895,7 +893,7 @@ This component allows one to display a tray icon inside the system tray. Package: gambas3-gb-qt5-webkit -Architecture: any +Architecture: linux-any Section: kde Depends: gambas3-gb-qt5 (>= ${binary:Version}), ${misc:Depends}, @@ -935,7 +933,7 @@ Architecture: amd64 arm64 armhf i386 mips64el mipsel Section: kde Depends: gambas3-gb-qt5 (>= ${binary:Version}), - gambas3-gb-qt5-x11 | gambas3-gb-qt5-wayland, + gambas3-gb-qt5-x11 (>= ${binary:Version}) | gambas3-gb-qt5-wayland (>= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: Gambas Qt5 Webview component @@ -961,7 +959,6 @@ Architecture: all Section: libdevel Depends: gambas3-gb-form (>= ${binary:Version}), - gambas3-gb-qt5 (>= ${binary:Version}), gambas3-runtime (>= ${binary:Version}), ${misc:Depends} Description: Gambas report component @@ -974,7 +971,6 @@ Architecture: all Section: libdevel Depends: gambas3-gb-form (>= ${binary:Version}), - gambas3-gb-qt5 (>= ${binary:Version}), gambas3-runtime (>= ${binary:Version}), ${misc:Depends} Description: Gambas report2 component @@ -1211,10 +1207,12 @@ gambas3-gb-net (>= ${binary:Version}), gambas3-gb-net-curl (>= ${binary:Version}), gambas3-gb-gtk3-webview (>= ${binary:Version}) | gambas3-gb-qt5-webview (>= ${binary:Version}), + gambas3-gb-pcre (>= ${binary:Version}), gambas3-gb-settings (>= ${binary:Version}), gambas3-gb-signal (>= ${binary:Version}), gambas3-gb-term (>= ${binary:Version}), gambas3-gb-util (>= ${binary:Version}), + gambas3-gb-util-web (>= ${binary:Version}), gambas3-runtime (>= ${binary:Version}), ${misc:Depends} Description: Visual development environment for the Gambas programming language @@ -1225,7 +1223,8 @@ Package: gambas3-runtime Architecture: any -Depends: xdg-utils, ${misc:Depends}, ${shlibs:Depends} +Depends: xdg-utils, ${misc:Depends}, ${shlibs:Depends}, + gambas3-gb-gui (>= ${binary:Version}), Provides: gambas3-gb-gui-opengl, gambas3-gb-gui-qt, gambas3-gb-gui-qt-webkit, diff -Nru gambas3-3.18.0/debian/patches/series gambas3-3.18.0/debian/patches/series --- gambas3-3.18.0/debian/patches/series 2023-01-20 23:46:02.000000000 +0000 +++ gambas3-3.18.0/debian/patches/series 2023-01-26 15:39:09.000000000 +0000 @@ -1 +1,2 @@ nonverbose_build.patch +std_cpp17.patch diff -Nru gambas3-3.18.0/debian/patches/std_cpp17.patch gambas3-3.18.0/debian/patches/std_cpp17.patch --- gambas3-3.18.0/debian/patches/std_cpp17.patch 1970-01-01 00:00:00.000000000 +0000 +++ gambas3-3.18.0/debian/patches/std_cpp17.patch 2023-01-26 08:11:56.000000000 +0000 @@ -0,0 +1,23 @@ +Origin: ubstream, https://gitlab.com/gambas/gambas/-/commit/812ed5ef04294467b4833b0e19f0ea4b418db55a +From: Bastian Germann +Date: Mon, 23 Jan 2023 15:31:20 +0100 +Subject: Substitute GB_CXXFLAGS_STD_CPP17 + +[CONFIGURATION] +* BUG: Substitute GB_CXXFLAGS_STD_CPP17 +--- + acinclude.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/acinclude.m4 b/acinclude.m4 +index edb5080cb..7b5fe0500 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -458,6 +458,7 @@ AC_DEFUN([GB_INIT], + AC_SUBST(AM_CXXFLAGS_OPT) + AC_SUBST(GB_CFLAGS_LTO) + AC_SUBST(GB_CXXFLAGS_STD_CPP11) ++ AC_SUBST(GB_CXXFLAGS_STD_CPP17) + + rm -f DISABLED DISABLED.* FAILED + ]) diff -Nru gambas3-3.18.0/debian/rules gambas3-3.18.0/debian/rules --- gambas3-3.18.0/debian/rules 2023-01-20 23:46:02.000000000 +0000 +++ gambas3-3.18.0/debian/rules 2023-01-26 15:39:07.000000000 +0000 @@ -10,12 +10,12 @@ export XDG_DATA_HOME=$(CURDIR)/debian/tmp/usr/share export XDG_UTILS_INSTALL_MODE=user DISABLE_MODULES= -ifneq (linux,$(DEB_BUILD_ARCH_OS)) +ifneq (linux,$(DEB_HOST_ARCH_OS)) DISABLE_MODULES+= --disable-inotify DISABLE_MODULES+= --disable-qt5wayland DISABLE_MODULES+= --disable-gtk3wayland endif -ifeq (hurd,$(DEB_BUILD_ARCH_OS)) +ifeq (hurd,$(DEB_HOST_ARCH_OS)) DISABLE_MODULES+= --disable-v4l endif @@ -23,6 +23,16 @@ DISABLE_MODULES+= --disable-qt5webview endif +ifeq (armel,$(DEB_HOST_ARCH)) + export CC=clang + export CXX=clang++ + export DEB_LDFLAGS_APPEND= -latomic + +override_dh_dwz: + # skip as this results in errors for clang-produced binaries +endif + + %: dh $@