[neon/qt6/qt6-phonon/Neon/unstable] debian: adapt to dual build system until later
Carlos De Maine
null at kde.org
Wed Jul 19 04:04:18 BST 2023
Git commit 0ce121922027d24cfa8821cef421b00706728e34 by Carlos De Maine.
Committed on 19/07/2023 at 03:04.
Pushed by carlosdem into branch 'Neon/unstable'.
adapt to dual build system until later
M +0 -160 debian/not-installed
A +29 -0 debian/patches/either_or.diff
A +1 -0 debian/patches/series
M +4 -0 debian/rules
https://invent.kde.org/neon/qt6/qt6-phonon/-/commit/0ce121922027d24cfa8821cef421b00706728e34
diff --git a/debian/not-installed b/debian/not-installed
index bc7ba04..33dab2d 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,161 +1 @@
usr/bin/phononsettings
-usr/share/locale/ar/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/ar/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/az/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/az/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/be/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/be/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/be at latin/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/bg/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/bg/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/bn/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/bn_IN/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/bs/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/bs/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/ca/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/ca/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/ca at valencia/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/ca at valencia/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/cs/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/cs/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/csb/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/csb/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/da/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/da/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/de/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/de/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/el/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/el/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/en_GB/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/en_GB/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/eo/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/eo/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/es/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/es/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/et/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/et/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/eu/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/eu/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/fa/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/fa/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/fi/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/fi/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/fr/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/fr/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/fy/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/ga/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/ga/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/gl/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/gl/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/gu/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/gu/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/he/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/he/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/hi/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/hi/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/hne/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/hne/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/hr/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/hr/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/hsb/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/hsb/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/hu/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/hu/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/ia/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/ia/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/id/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/id/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/is/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/is/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/it/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/it/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/ja/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/ja/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/ka/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/ka/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/kk/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/kk/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/km/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/km/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/kn/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/ko/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/ko/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/ku/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/ku/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/lt/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/lt/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/lv/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/lv/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/mai/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/mai/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/mk/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/mk/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/ml/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/ml/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/mr/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/mr/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/ms/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/nb/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/nb/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/nds/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/nds/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/ne/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/ne/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/nl/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/nl/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/nn/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/nn/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/oc/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/oc/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/or/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/pa/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/pa/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/pl/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/pl/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/pt/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/pt/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/pt_BR/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/pt_BR/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/ro/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/ro/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/ru/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/ru/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/se/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/se/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/si/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/sk/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/sk/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/sl/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/sl/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/sq/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/sq/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/sr/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/sr/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/sr at ijekavian/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/sr at ijekavian/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/sr at ijekavianlatin/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/sr at ijekavianlatin/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/sr at latin/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/sr at latin/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/sv/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/sv/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/ta/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/ta/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/te/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/tg/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/th/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/th/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/tr/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/tr/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/ug/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/ug/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/uk/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/uk/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/vi/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/vi/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/wa/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/wa/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/zh_CN/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/zh_CN/LC_MESSAGES/phononsettings_qt.qm
-usr/share/locale/zh_TW/LC_MESSAGES/libphonon_qt.qm
-usr/share/locale/zh_TW/LC_MESSAGES/phononsettings_qt.qm
diff --git a/debian/patches/either_or.diff b/debian/patches/either_or.diff
new file mode 100644
index 0000000..6bbee2b
--- /dev/null
+++ b/debian/patches/either_or.diff
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7cae88a35c7732932cbb7585db3f88e89a42f8fb..5c0c4ff840b3d047fb9a8a85af12ecaa1df10c24 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,9 @@ option(PHONON_BUILD_SETTINGS "Build the settings GUI" ON)
+
+ option(PHONON_NO_CAPTURE "Disable the capture capabilities")
+
++option(BUILD_QT5 "Build for Qt5" ON)
++option(BUILD_QT6 "Build for Qt6" ON)
++
+ # Not set by ECM (yet)
+ set(CMAKE_AUTOUIC TRUE)
+ set(CMAKE_AUTORCC TRUE)
+@@ -33,7 +36,13 @@ include(ECMGeneratePkgConfigFile)
+ include(ECMPoQmTools)
+ include(ECMSetupVersion)
+
+-set(VERSIONS "5;6")
++if (${BUILD_QT6})
++set(VERSIONS "6")
++endif()
++if (${BUILD_QT5})
++set(VERSIONS "5")
++endif()
++
+ # CI is stupid and doesn't allow us to set CMAKE options per build variant
+ if ($ENV{CI_JOB_NAME_SLUG} MATCHES "qt5")
+ set(VERSIONS "5")
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b58af05
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+either_or.diff
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index a3258de..8087e21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,13 @@
# -*- makefile -*-
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+CMAKE_ARGS = -DBUILD_QT6=ON -DBUILD_QT5=OFF
%:
dh $@ --with kf6 --buildsystem kf6
+override_dh_auto_configure:
+ dh_auto_configure -- $(CMAKE_ARGS)
+
override_dh_shlibdeps:
dh_shlibdeps -a -O--buildsystem=kf6 -l`pwd`/debian/qt6-phonon/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
More information about the Neon-commits
mailing list