[neon/qt6/qt6-5compat/Neon/release] debian: adapt to noble gcc-13 and stuff
Carlos De Maine
null at kde.org
Tue Apr 30 11:05:59 BST 2024
Git commit a82642c260c55b10ed0c4b72cfcabc1dd3c34bc5 by Carlos De Maine.
Committed on 30/04/2024 at 10:05.
Pushed by carlosdem into branch 'Neon/release'.
adapt to noble gcc-13 and stuff
(cherry picked from commit 2a2645acfcc85c0b23ddd2f4ec3c9f30e8a4bd04)
M +1 -1 debian/changelog
M +6 -8 debian/control
M +0 -4 debian/rules
https://invent.kde.org/neon/qt6/qt6-5compat/-/commit/a82642c260c55b10ed0c4b72cfcabc1dd3c34bc5
diff --git a/debian/changelog b/debian/changelog
index d65adb9..4f8ed78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qt6-5compat (6.7.0-0neon) jammy; urgency=medium
+qt6-5compat (6.7.0-0neon) noble; urgency=medium
* New release
diff --git a/debian/control b/debian/control
index b12263c..518bc61 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,
libc6-dev,
libghc-iconv-dev,
libgl-dev,
@@ -18,12 +16,12 @@ Build-Depends: cmake,
ninja-build,
pkg-config,
pkg-kde-tools,
- qt6-base-dev (>= 6.6.2~),
- qt6-declarative-dev (>= 6.6.2~),
- qt6-shadertools-dev (>= 6.6.2~)
-Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
- qt6-documentation-tools (>= 6.6~) <!nodoc>,
- qt6-base-doc (>= 6.6~) <!nodoc>,
+ qt6-base-dev (>= 6.7.0~),
+ qt6-declarative-dev (>= 6.7.0~),
+ qt6-shadertools-dev (>= 6.7.0~)
+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-5compat
diff --git a/debian/rules b/debian/rules
index edd7f95..c228140 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,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 += \
More information about the Neon-commits
mailing list