[neon/backports-jammy/appstream-jammy2/Neon/unstable] debian: make it actually work

[Carlos De Maine]

Git commit 0c3be0e3857ba0de534c46c189067915fdb9925c by Carlos De Maine.
Committed on 14/09/2023 at 02:08.
Pushed by carlosdem into branch 'Neon/unstable'.

make it actually work

A  +1    -0    debian/libappstreamqt-3.install
A  +1    -0    debian/libappstreamqt6-3.install
A  +3    -0    debian/libappstreamqt6-dev.install
A  +68   -0    debian/patches/0001_qt.diff
A  +1    -0    debian/patches/series
M  +4    -4    debian/rules

https://invent.kde.org/neon/backports-jammy/appstream-jammy2/-/commit/0c3be0e3857ba0de534c46c189067915fdb9925c

diff --git a/debian/libappstreamqt-3.install b/debian/libappstreamqt-3.install
new file mode 100644
index 0000000..89bdc8f
--- /dev/null
+++ b/debian/libappstreamqt-3.install
@@ -0,0 +1 @@
+usr/lib/*/libAppStreamQt.so.*
diff --git a/debian/libappstreamqt6-3.install b/debian/libappstreamqt6-3.install
new file mode 100644
index 0000000..7c5708b
--- /dev/null
+++ b/debian/libappstreamqt6-3.install
@@ -0,0 +1 @@
+usr/lib/*/libAppStreamQt6.so.*
diff --git a/debian/libappstreamqt6-dev.install b/debian/libappstreamqt6-dev.install
new file mode 100644
index 0000000..015bb11
--- /dev/null
+++ b/debian/libappstreamqt6-dev.install
@@ -0,0 +1,3 @@
+usr/include/AppStreamQt6/
+usr/lib/*/cmake/AppStreamQt6/*
+usr/lib/*/libAppStreamQt6.so
diff --git a/debian/patches/0001_qt.diff b/debian/patches/0001_qt.diff
new file mode 100644
index 0000000..8bcae40
--- /dev/null
+++ b/debian/patches/0001_qt.diff
@@ -0,0 +1,68 @@
+diff --git a/meson.build b/meson.build
+index 49c9c2ff..13c0194b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -198,6 +198,6 @@ subdir('data/')
+ subdir('contrib/')
+ subdir('docs/')
+ subdir('tests/')
+-if get_option('qt') or get_option('qt5')
++if get_option('qt') or get_option('qt6')
+     subdir('qt/')
+ endif
+diff --git a/meson_options.txt b/meson_options.txt
+index ca903a85..17d11f8b 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -13,12 +13,12 @@ option('vapi',
+        value : false,
+        description : 'Create and install a Vala API file. Requires "gir" to be enabled as well'
+ )
+-option('qt',
++option('qt6',
+        type : 'boolean',
+        value : false,
+        description : 'Build libappstream-qt for Qt6'
+ )
+-option('qt5',
++option('qt',
+        type : 'boolean',
+        value : false,
+        description: 'Build libappstream-qt5 for Qt5'
+diff --git a/qt/cmake/AppStreamQt5Config.cmake.in b/qt/cmake/AppStreamQt6Config.cmake.in
+similarity index 100%
+rename from qt/cmake/AppStreamQt5Config.cmake.in
+rename to qt/cmake/AppStreamQt6Config.cmake.in
+diff --git a/qt/cmake/AppStreamQt5ConfigVersion.cmake.in b/qt/cmake/AppStreamQt6ConfigVersion.cmake.in
+similarity index 100%
+rename from qt/cmake/AppStreamQt5ConfigVersion.cmake.in
+rename to qt/cmake/AppStreamQt6ConfigVersion.cmake.in
+diff --git a/qt/meson.build b/qt/meson.build
+index 0a02a750..c6e1793b 100644
+--- a/qt/meson.build
++++ b/qt/meson.build
+@@ -1,19 +1,19 @@
+ # Meson definition for AppStream Qt
+
+-if get_option('qt') and get_option('qt5')
+-    error('Both the "qt" and "qt5" option enabled. Please select only one Qt major version to build!')
++if get_option('qt') and get_option('qt6')
++    error('Both the "qt" and "qt6" option enabled. Please select only one Qt major version to build!')
+ endif
+
+ asqt_api_level = '3'
+
+-if get_option('qt5')
++if get_option('qt')
+     qt_major_version = '5'
+     qt_min_version = '5.15'
+-    asqt_library_name = 'AppStreamQt5'
++    asqt_library_name = 'AppStreamQt'
+ else
+     qt_major_version = '6'
+     qt_min_version = '6.2.4'
+-    asqt_library_name = 'AppStreamQt'
++    asqt_library_name = 'AppStreamQt6'
+ endif
+
+ add_languages('cpp', native: true)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8f28c24
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001_qt.diff
diff --git a/debian/rules b/debian/rules
index 08b1e1b..1b480df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,19 +12,19 @@ endif
 	dh $@ --with gir
 
 execute_after_dh_auto_clean:
-	rm -rf build-qt5
+	rm -rf build-qt6
 
 override_dh_auto_configure:
 	dh_auto_configure -- -Dqt=true -Dapt-support=true $(ENABLE_COMPOSE) -Dvapi=true
-	dh_auto_configure --builddirectory=build-qt5 -- -Dqt5=true
+	dh_auto_configure --builddirectory=build-qt6 -- -Dqt6=true
 
 override_dh_auto_build:
 	dh_auto_build
-	dh_auto_build --builddirectory=build-qt5
+	dh_auto_build --builddirectory=build-qt6
 
 override_dh_auto_install:
 	dh_auto_install
-	dh_auto_install --builddirectory=build-qt5
+	dh_auto_install --builddirectory=build-qt6
 
 override_dh_missing:
 	dh_missing --fail-missing