[neon/qt6/qt6-virtualkeyboard/Neon/release] debian: adapt to noble's gcc-13

Carlos De Maine null at kde.org
Tue Apr 30 13:41:28 BST 2024


Git commit 5aeb765bdef95dabbfc91437ad7ab32d11f3b5b1 by Carlos De Maine.
Committed on 30/04/2024 at 12:41.
Pushed by carlosdem into branch 'Neon/release'.

adapt to noble's gcc-13

M  +1    -1    debian/changelog
M  +2    -4    debian/control
M  +0    -4    debian/rules

https://invent.kde.org/neon/qt6/qt6-virtualkeyboard/-/commit/5aeb765bdef95dabbfc91437ad7ab32d11f3b5b1

diff --git a/debian/changelog b/debian/changelog
index 6817131..cbe115e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qt6-virtualkeyboard (6.7.0-0neon) jammy; urgency=medium
+qt6-virtualkeyboard (6.7.0-0neon) noble; urgency=medium
 
   * New release
 
diff --git a/debian/control b/debian/control
index be12b52..1aa9ff3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,6 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Patrick Franz <deltaone at debian.org>, Lu YaNing <dluyaning at gmail.com>
 Build-Depends: cmake,
                debhelper-compat (= 13),
-               g++-12,
-               gcc-12,
                hunspell-en-gb <!nocheck>,
                libgl-dev,
                libhunspell-dev,
@@ -19,8 +17,8 @@ Build-Depends: cmake,
                pkgconf,
                pkg-kde-tools,
                qt6-base-dev (>= 6.7.0~),
-               qt6-declarative-dev (>= 6.6.2~),
-               qt6-svg-dev (>= 6.6.2~),
+               qt6-declarative-dev (>= 6.7.0~),
+               qt6-svg-dev (>= 6.7.0~),
                xauth <!nocheck>,
                xvfb <!nocheck>
 Build-Depends-Indep: qt6-base-dev (>= 6.7~) <!nodoc>,
diff --git a/debian/rules b/debian/rules
index ada2c2e..cfb57b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,6 @@ include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
-# need gcc 12.1 for mold to be able to process --gdb-index
-export CC=gcc-12
-export CXX=g++-12
-
 # QT_HOST_PATH isn't passed in cross-builds
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 	extra_cmake_args += -DQT_HOST_PATH=/usr


More information about the Neon-commits mailing list