[neon/backports-jammy/appstream-jammy2/Neon/unstable] debian: qt = qt6
Carlos De Maine
null at kde.org
Fri Sep 15 07:10:39 BST 2023
Git commit 52edecc1beac0174f443da5c539509d365db11cb by Carlos De Maine.
Committed on 15/09/2023 at 08:10.
Pushed by carlosdem into branch 'Neon/unstable'.
qt = qt6
M +13 -11 debian/control
A +1 -0 debian/libappstreamqt5-3.install
A +3 -0 debian/libappstreamqt5-dev.install
D +0 -1 debian/libappstreamqt6-3.install
D +0 -3 debian/libappstreamqt6-dev.install
M +0 -101 debian/patches/0001_qt.diff
M +4 -4 debian/rules
https://invent.kde.org/neon/backports-jammy/appstream-jammy2/-/commit/52edecc1beac0174f443da5c539509d365db11cb
diff --git a/debian/control b/debian/control
index 351ff0e..ee36ed9 100644
--- a/debian/control
+++ b/debian/control
@@ -138,9 +138,9 @@ Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
-Breaks: libappstreamqt3,
-Replaces: libappstreamqt3,
-Description: Qt5 library to access AppStream services
+Breaks: libappstreamqt3, libappstreamqt6-3
+Replaces: libappstreamqt3, libappstreamqt6-3
+Description: Qt6 library to access AppStream services
AppStream is a metadata specification which permits software components to
provide information about themselves to automated systems and end-users
before the software is actually installed.
@@ -156,9 +156,11 @@ Architecture: any
Multi-Arch: same
Section: libdevel
Depends: libappstreamqt-3 (= ${binary:Version}),
- qtbase5-dev,
+ qt6-base-dev,
${misc:Depends}
-Description: Qt5 library to access AppStream services (development files)
+Breaks: libappstreamqt6-dev
+Replaces: libappstreamqt6-dev
+Description: Qt6 library to access AppStream services (development files)
AppStream is a metadata specification which permits software components to
provide information about themselves to automated systems and end-users
before the software is actually installed.
@@ -169,7 +171,7 @@ Description: Qt5 library to access AppStream services (development files)
This package contains development files necessary to develop
software management tools which use the Qt-based AppStream library.
-Package: libappstreamqt6-3
+Package: libappstreamqt5-3
Architecture: any
Section: libs
Multi-Arch: same
@@ -178,7 +180,7 @@ Depends: ${misc:Depends},
${shlibs:Depends}
Breaks: libappstreamqt2,
Replaces: libappstreamqt2,
-Description: Qt6 library to access AppStream services
+Description: Qt5 library to access AppStream services
AppStream is a metadata specification which permits software components to
provide information about themselves to automated systems and end-users
before the software is actually installed.
@@ -189,14 +191,14 @@ Description: Qt6 library to access AppStream services
This package contains a Qt-based library to access AppStream
services, like the software component metadata pool.
-Package: libappstreamqt6-dev
+Package: libappstreamqt5-dev
Architecture: any
Multi-Arch: same
Section: libdevel
-Depends: libappstreamqt6-3 (= ${binary:Version}),
- qt6-base-dev,
+Depends: libappstreamqt5-3 (= ${binary:Version}),
+ qtbase5-dev,
${misc:Depends}
-Description: Qt6 library to access AppStream services (development files)
+Description: Qt5 library to access AppStream services (development files)
AppStream is a metadata specification which permits software components to
provide information about themselves to automated systems and end-users
before the software is actually installed.
diff --git a/debian/libappstreamqt5-3.install b/debian/libappstreamqt5-3.install
new file mode 100644
index 0000000..709185f
--- /dev/null
+++ b/debian/libappstreamqt5-3.install
@@ -0,0 +1 @@
+usr/lib/*/libAppStreamQt5.so.*
diff --git a/debian/libappstreamqt5-dev.install b/debian/libappstreamqt5-dev.install
new file mode 100644
index 0000000..b4b9d1c
--- /dev/null
+++ b/debian/libappstreamqt5-dev.install
@@ -0,0 +1,3 @@
+usr/include/AppStreamQt5/
+usr/lib/*/cmake/AppStreamQt5/*
+usr/lib/*/libAppStreamQt5.so
diff --git a/debian/libappstreamqt6-3.install b/debian/libappstreamqt6-3.install
deleted file mode 100644
index 7c5708b..0000000
--- a/debian/libappstreamqt6-3.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libAppStreamQt6.so.*
diff --git a/debian/libappstreamqt6-dev.install b/debian/libappstreamqt6-dev.install
deleted file mode 100644
index 015bb11..0000000
--- a/debian/libappstreamqt6-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-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
index 6c8cded..e69de29 100644
--- a/debian/patches/0001_qt.diff
+++ b/debian/patches/0001_qt.diff
@@ -1,101 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 2325457e..381e16ff 100644
---- a/meson.build
-+++ b/meson.build
-@@ -195,6 +195,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 78%
-rename from qt/cmake/AppStreamQt5Config.cmake.in
-rename to qt/cmake/AppStreamQt6Config.cmake.in
-index 0bef7e80..a66568ac 100644
---- a/qt/cmake/AppStreamQt5Config.cmake.in
-+++ b/qt/cmake/AppStreamQt6Config.cmake.in
-@@ -4,7 +4,7 @@ get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../..
- # Use original install prefix when loaded through a "/usr move"
- # cross-prefix symbolic link such as /lib -> /usr/lib.
- get_filename_component(_realCurr "${CMAKE_CURRENT_LIST_DIR}" REALPATH)
--get_filename_component(_realOrig "@LIBDIR_FULL@/cmake/AppStreamQt5" REALPATH)
-+get_filename_component(_realOrig "@LIBDIR_FULL@/cmake/AppStreamQt6" REALPATH)
- if(_realCurr STREQUAL _realOrig)
- set(PACKAGE_PREFIX_DIR "@PREFIX@")
- endif()
-@@ -28,14 +28,14 @@ macro(check_required_components _NAME)
- endforeach()
- endmacro()
-
--add_library(AppStreamQt SHARED IMPORTED)
--set_target_properties(AppStreamQt PROPERTIES
-+add_library(AppStreamQt6 SHARED IMPORTED)
-+set_target_properties(AppStreamQt6 PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/include/"
-- INTERFACE_LINK_LIBRARIES "Qt5::Core"
-- IMPORTED_LOCATION "@LIBDIR_FULL@/libAppStreamQt5.so.${AppStreamQt_VERSION}"
-- IMPORTED_SONAME "libAppStreamQt5.${AppStreamQt_VERSION_MAJOR}"
-+ INTERFACE_LINK_LIBRARIES "Qt6::Core"
-+ IMPORTED_LOCATION "@LIBDIR_FULL@/libAppStreamQt6.so.${AppStreamQt_VERSION}"
-+ IMPORTED_SONAME "libAppStreamQt6.${AppStreamQt_VERSION_MAJOR}"
- )
-
- ####################################################################################
-
--check_required_components(Qt5Core)
-+check_required_components(Qt6Core)
-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/rules b/debian/rules
index 1b480df..08b1e1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,19 +12,19 @@ endif
dh $@ --with gir
execute_after_dh_auto_clean:
- rm -rf build-qt6
+ rm -rf build-qt5
override_dh_auto_configure:
dh_auto_configure -- -Dqt=true -Dapt-support=true $(ENABLE_COMPOSE) -Dvapi=true
- dh_auto_configure --builddirectory=build-qt6 -- -Dqt6=true
+ dh_auto_configure --builddirectory=build-qt5 -- -Dqt5=true
override_dh_auto_build:
dh_auto_build
- dh_auto_build --builddirectory=build-qt6
+ dh_auto_build --builddirectory=build-qt5
override_dh_auto_install:
dh_auto_install
- dh_auto_install --builddirectory=build-qt6
+ dh_auto_install --builddirectory=build-qt5
override_dh_missing:
dh_missing --fail-missing
More information about the Neon-commits
mailing list