[neon/qt6/qt6-tools/Neon/release] debian: add *t64 transitionals and adapt to noble's gcc-13
Carlos De Maine
null at kde.org
Sat Apr 27 16:43:40 BST 2024
Git commit 4fe88f0b122f48873a390b8023f60842fad7a128 by Carlos De Maine.
Committed on 27/04/2024 at 15:43.
Pushed by carlosdem into branch 'Neon/release'.
add *t64 transitionals and adapt to noble's gcc-13
(cherry picked from commit 971f8b82151d52e90e6ab0da3380a7818f45401a)
M +29 -7 debian/control
M +0 -5 debian/rules
https://invent.kde.org/neon/qt6/qt6-tools/-/commit/4fe88f0b122f48873a390b8023f60842fad7a128
diff --git a/debian/control b/debian/control
index d4b0af7..101bd34 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,6 @@ Uploaders: Patrick Franz <deltaone at debian.org>
Build-Depends: clang-15,
cmake,
debhelper-compat (= 13),
- g++-12,
- gcc-12,
libclang-15-dev,
libgl-dev,
# liblitehtml-dev (>= 0.6~),
@@ -21,11 +19,11 @@ Build-Depends: clang-15,
ninja-build,
pkgconf,
pkg-kde-tools,
- qt6-base-dev (>= 6.6.2~),
- qt6-declarative-dev (>= 6.6.2~)
-Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
- qt6-base-doc (>= 6.6~) <!nodoc>,
- qt6-documentation-tools (>= 6.6~) <!nodoc>,
+ qt6-base-dev (>= 6.7.0~),
+ qt6-declarative-dev (>= 6.7.0~)
+Build-Depends-Indep: qt6-base-dev (>= 6.7~) <!nodoc>,
+ qt6-base-doc (>= 6.7~) <!nodoc>,
+ qt6-documentation-tools (>= 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-tools
@@ -111,24 +109,48 @@ Depends: qt6-tools, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
+Package: libqt6designer6t64
+Architecture: all
+Depends: qt6-tools, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
Package: libqt6designercomponents6
Architecture: all
Depends: qt6-tools, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
+Package: libqt6designercomponents6t64
+Architecture: all
+Depends: qt6-tools, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
Package: libqt6help6
Architecture: all
Depends: qt6-tools, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
+Package: libqt6help6t64
+Architecture: all
+Depends: qt6-tools, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
Package: libqt6uitools6
Architecture: all
Depends: qt6-tools, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
+Package: libqt6uitools6t64
+Architecture: all
+Depends: qt6-tools, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
Package: assistant-qt6
Architecture: all
Depends: qt6-tools, ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index 5e3e30a..fbede35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,11 +6,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
#### uncomment when bootstrapping a new qt release ####
#export DEB_BUILD_PROFILES := ${DEB_BUILD_PROFILES} neon_nodoc
-
-# need gcc 12.1 for mold to be able to process --gdb-index
-export CC=gcc-12
-export CXX=g++-12
-
export LLVM_INSTALL_DIR := $(shell llvm-config --prefix)
%:
More information about the Neon-commits
mailing list