[neon/qt6/qt6-base/Neon/release] debian: more lints cmake and overrides

Carlos De Maine null at kde.org
Mon Dec 11 09:04:43 GMT 2023


Git commit 83b43d990fa6d5869ceab8e854ec2b76e7df2a01 by Carlos De Maine.
Committed on 11/12/2023 at 10:03.
Pushed by carlosdem into branch 'Neon/release'.

more lints cmake and overrides

M  +20   -1    debian/control
M  +1    -1    debian/patches/series
M  +0    -6    debian/source/lintian-overrides

https://invent.kde.org/neon/qt6/qt6-base/-/commit/83b43d990fa6d5869ceab8e854ec2b76e7df2a01

diff --git a/debian/control b/debian/control
index a8a85e4..d32e6a7 100644
--- a/debian/control
+++ b/debian/control
@@ -178,14 +178,33 @@ Architecture: any
 Section: kde
 X-Neon-MergedPackage: true
 Pre-Depends: ${misc:Pre-Depends},
-Depends: libfontconfig-dev,
+Depends: default-libmysqlclient-dev,
+         firebird-dev ,
+         libcups2-dev,
+         libdbus-1-dev,
+         libdrm-dev,
+         libegl-dev,
+         libfontconfig-dev,
+         libgbm-dev,
          libgl-dev,
+         libgl-dev,
+         libgl1-mesa-dev,
+         libgles-dev,
+         libglib2.0-dev,
+         libglu1-mesa-dev | libglu-dev,
          libglx-dev,
          libinput-dev,
+         libkms-dev,
          libopengl-dev,
+         libpq-dev,
+         libsqlite3-dev,
+         libssl-dev,
+         libts-dev,
          libvulkan-dev,
          libxkbcommon-dev,
+         python3:any,
          qt6-base (= ${binary:Version}),
+         unixodbc-dev,
          ${misc:Depends},
          ${shlibs:Depends},
 Provides: qmake6,
diff --git a/debian/patches/series b/debian/patches/series
index d5de314..e4b75f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,7 @@ be_verbose_on_plugin_inclusion.patch
 
 # Debian specific
 remove_privacy_breaches.diff
-#build_path_embedded_qtbuildinternalsextra_cmake.patch
+build_path_embedded_qtbuildinternalsextra_cmake.patch
 cross.patch
 remove_rpath_from_examples.patch
 forkfd_grow_stack_upwards_on_hppa.patch
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 45e2b5c..e57562e 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,5 +1,4 @@
 # Binary data crafted to be used during tests
-qt6-base source: source-is-missing [tests/auto/corelib/plugin/qpluginloader/elftest/debugobj.so]
 qt6-base source: binary-with-bad-dynamic-table [tests/auto/corelib/plugin/qpluginloader/elftest/debugobj.so]
 
 # These are not static libraries, despite the .a extension
@@ -10,11 +9,6 @@ qt6-base source: unpack-message-for-source ar failed for tests/auto/corelib/io/q
 qt6-base source: unpack-message-for-source ar failed for tests/auto/corelib/io/qdir/types/b.a
 qt6-base source: unpack-message-for-source ar failed for tests/auto/corelib/io/qdir/types/c.a
 
-# Override some source-is-missing
-qt6-base source: source-is-missing [tests/auto/corelib/text/qtextboundaryfinder/data/WordBreakTest.html]
-qt6-base source: source-is-missing [tests/manual/examples/widgets/richtext/textedit/example.html]
-
-
 # Override some source-is-missing
 qt6-base source: source-is-missing tests/auto/corelib/plugin/qpluginloader/elftest/debugobj.so
 


More information about the Neon-commits mailing list