[neon/qt6/qt6-3d/Neon/release] debian: adapt to gcc-13

Carlos De Maine null at kde.org
Sat Apr 27 17:04:59 BST 2024


Git commit 43975d28db8dc5b8cf4b9b9cb54c855a61a5f6e6 by Carlos De Maine.
Committed on 27/04/2024 at 16:04.
Pushed by carlosdem into branch 'Neon/release'.

adapt to gcc-13

M  +12   -2    debian/control
M  +0    -4    debian/rules

https://invent.kde.org/neon/qt6/qt6-3d/-/commit/43975d28db8dc5b8cf4b9b9cb54c855a61a5f6e6

diff --git a/debian/control b/debian/control
index ad27215..e2234bc 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,
                libassimp-dev (>= 5.1.1~),
                libgl-dev,
                libgl1-mesa-dri <!nocheck>,
@@ -84,12 +82,24 @@ Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
+Package: libqt63danimation6t64
+Architecture: all
+Depends: qt6-3d, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
 Package: libqt63dcore6
 Architecture: all
 Depends: qt6-3d, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
+Package: libqt63dcore6t64
+Architecture: all
+Depends: qt6-3d, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
 Package: libqt63dextras6
 Architecture: all
 Depends: qt6-3d, ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index e2abeb2..ad6cc4e 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