diff --git a/debian/changelog b/debian/changelog index 84df118..bbf55a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ qt6-base (6.6.2+dfsg-4) UNRELEASED; urgency=medium [ Patrick Franz ] * Add B-Ds for XCB. * Do not reduce the amount of relocations (Closes: #1059249). + * Clean up cmake-arguments. -- Debian Qt/KDE Maintainers Sun, 25 Feb 2024 18:25:55 +0100 diff --git a/debian/rules b/debian/rules index 71f6df2..d712676 100755 --- a/debian/rules +++ b/debian/rules @@ -42,48 +42,46 @@ override_dh_auto_configure: -DINSTALL_ARCHDATADIR=lib/$(DEB_HOST_MULTIARCH)/qt6 \ -DINSTALL_EXAMPLESDIR=lib/$(DEB_HOST_MULTIARCH)/qt6/examples \ -DINSTALL_DATADIR=share/qt6 \ - -DINSTALL_HOSTDATADIR=lib/$(DEB_HOST_MULTIARCH)/qt6 \ -DINSTALL_DOCDIR=share/qt6/doc \ -DINSTALL_SYSCONFDIR=/etc/xdg \ -DINSTALL_INCLUDEDIR=include/$(DEB_HOST_MULTIARCH)/qt6 \ - -DINSTALL_PLUGINDIR=lib/$(DEB_HOST_MULTIARCH)/qt6/plugins \ - -DINSTALL_TRANSLATIONDIR=share/qt6/translations \ + -DINSTALL_TRANSLATIONSDIR=share/qt6/translations \ -DINSTALL_MKSPECSDIR=lib/$(DEB_HOST_MULTIARCH)/qt6/mkspecs \ -DINSTALL_PUBLICBINDIR=bin \ -DQT_BUILD_EXAMPLES=ON \ -DQT_INSTALL_EXAMPLES_SOURCES=ON \ - -DFEATURE_mimetype_database=OFF \ - -DFEATURE_dbus_linked=ON \ -DFEATURE_accessibility=ON \ - -DFEATURE_doubleconversion=ON \ - -DFEATURE_glib=ON \ - -DFEATURE_icu=ON \ - -DFEATURE_pcre2=ON \ - -DFEATURE_system_pcre2=ON \ - -DFEATURE_zlib=ON \ - -DFEATURE_ssl=ON \ - -DFEATURE_libproxy=ON \ - -DFEATURE_system_proxies=ON \ -DFEATURE_cups=ON \ + -DFEATURE_dbus_linked=ON \ + -DFEATURE_directfb=OFF \ + -DFEATURE_doubleconversion=ON \ -DFEATURE_fontconfig=ON \ -DFEATURE_freetype=ON \ + -DFEATURE_glib=ON \ + -DFEATURE_gtk3=ON \ -DFEATURE_harfbuzz=ON \ - -DFEATURE_gtk=ON \ - -DFEATURE_directfb=OFF \ - -DFEATURE_sql_odbc=ON \ + -DFEATURE_icu=ON \ + -DFEATURE_jpeg=ON \ + -DFEATURE_libproxy=ON \ + -DFEATURE_mimetype_database=OFF \ + -DFEATURE_pcre2=ON \ + -DFEATURE_png=ON \ + -DFEATURE_reduce_relocations=OFF \ + -DFEATURE_relocatable=OFF \ + -DFEATURE_rpath=OFF \ -DFEATURE_sql_mysql=ON \ + -DFEATURE_sql_odbc=ON \ -DFEATURE_sql_psql=ON \ -DFEATURE_sql_sqlite=ON \ - -DFEATURE_system_sqlite=ON \ - -DFEATURE_system_xcb_xinput=ON \ - -DFEATURE_jpeg=ON \ + -DFEATURE_ssl=ON \ -DFEATURE_system_jpeg=ON \ - -DFEATURE_png=ON \ - -DFEATURE_system_png=ON \ -DFEATURE_system_libb2=ON \ - -DFEATURE_rpath=OFF \ - -DFEATURE_reduce_relocations=OFF \ - -DFEATURE_relocatable=OFF \ + -DFEATURE_system_pcre2=ON \ + -DFEATURE_system_png=ON \ + -DFEATURE_system_proxies=ON \ + -DFEATURE_system_sqlite=ON \ + -DFEATURE_system_xcb_xinput=ON \ + -DFEATURE_system_zlib=ON \ $(extra_cmake_args)