[neon/qt6/qt6-svg/Neon/unstable] debian: adapt to noble's gcc being 13

Carlos De Maine null at kde.org
Sat Apr 27 12:47:16 BST 2024


Git commit 7d894acb0fd016f178485a972b5a91c3fcb2711d by Carlos De Maine.
Committed on 27/04/2024 at 11:46.
Pushed by carlosdem into branch 'Neon/unstable'.

adapt to noble's gcc being 13

M  +3    -5    debian/control
M  +0    -4    debian/rules

https://invent.kde.org/neon/qt6/qt6-svg/-/commit/7d894acb0fd016f178485a972b5a91c3fcb2711d

diff --git a/debian/control b/debian/control
index dfaa730..c0c972b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,17 +8,15 @@ Build-Depends: cmake,
                libgl-dev,
                libvulkan-dev [linux-any],
                libxkbcommon-dev,
-               g++-12,
-               gcc-12,
                mold,
                ninja-build,
                pkgconf,
                pkg-kde-tools,
-               qt6-base-dev (>= 6.6.2),
+               qt6-base-dev (>= 6.7.0),
                zlib1g-dev
-Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>= 6.7~) <!nodoc>,
                      qt6-documentation-tools (>= 6.6~) <!nodoc>,
-                     qt6-base-doc (>= 6.6~) <!nodoc>,
+                     qt6-base-doc (>= 6.7~) <!nodoc>,
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-svg
diff --git a/debian/rules b/debian/rules
index ba0e08f..0967e04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,10 +6,6 @@ export PANGEA_ARCH_BIN_ONLY=FALSE
 
 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