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

Carlos De Maine null at kde.org
Tue Apr 30 13:32:05 BST 2024


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

adapt to noble's gcc-13

M  +1    -1    debian/changelog
M  +5    -7    debian/control
M  +0    -4    debian/rules

https://invent.kde.org/neon/qt6/qt6-grpc/-/commit/dcb62967cfb50812bdacbbdf8f2325a1c74d4b1b

diff --git a/debian/changelog b/debian/changelog
index 4a41b65..429244b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qt6-grpc (6.7.0-0neon) jammy; urgency=medium
+qt6-grpc (6.7.0-0neon) noble; urgency=medium
 
   * New release
 
diff --git a/debian/control b/debian/control
index 6136282..746063d 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>
 Build-Depends: cmake,
                debhelper-compat (= 13),
-               g++-12,
-               gcc-12,
                grpc-proto,
                libgrpc-dev,
                libgrpc++-dev,
@@ -17,12 +15,12 @@ Build-Depends: cmake,
                pkg-kde-tools,
                pkgconf,
                protobuf-compiler,
-               qt6-base-dev (>= 6.6.2~),
-               qt6-declarative-dev (>= 6.6.2~),
+               qt6-base-dev (>= 6.7.0~),
+               qt6-declarative-dev (>= 6.7.0~),
                zlib1g-dev,
-Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
-                     qt6-documentation-tools (>= 6.6~) <!nodoc>,
-                     qt6-base-doc (>= 6.6~) <!nodoc>,
+Build-Depends-Indep: qt6-base-dev (>= 6.7~) <!nodoc>,
+                     qt6-documentation-tools (>= 6.7~) <!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-translations
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