Date: Thu, 16 Nov 2023 13:58:30 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a2f40d93caa2 - main - devel/appstream-qt: Switch back to Qt 5. Message-ID: <202311161358.3AGDwUN4052689@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a2f40d93caa23d49fde3f8c9061d4e7fbdaeeb81 commit a2f40d93caa23d49fde3f8c9061d4e7fbdaeeb81 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2023-11-16 13:56:14 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2023-11-16 13:58:24 +0000 devel/appstream-qt: Switch back to Qt 5. Sponsored by: Serenity Cybersecurity, LLC --- devel/appstream-qt/Makefile | 8 +-- devel/appstream-qt/pkg-plist | 60 +++++++++++----------- .../patch-qt_cmake_AppStreamQt5Config.cmake.in | 13 +++++ 3 files changed, 47 insertions(+), 34 deletions(-) diff --git a/devel/appstream-qt/Makefile b/devel/appstream-qt/Makefile index 1703e990a599..427cbbff9653 100644 --- a/devel/appstream-qt/Makefile +++ b/devel/appstream-qt/Makefile @@ -1,15 +1,15 @@ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= Qt COMMENT?= Qt bindings to AppStream LIB_DEPENDS= libappstream.so:devel/appstream -USES= qt:6 +USES= qt:5 -USE_QT= base tools:build +USE_QT= core buildtools:build qmake:build testlib:build -MESON_ARGS= -Dqt=true +MESON_ARGS= -Dqt5=true MASTERDIR= ${.CURDIR}/../appstream PLIST= ${.CURDIR}/pkg-plist diff --git a/devel/appstream-qt/pkg-plist b/devel/appstream-qt/pkg-plist index 98ad101dfe29..351a20882ac7 100644 --- a/devel/appstream-qt/pkg-plist +++ b/devel/appstream-qt/pkg-plist @@ -1,30 +1,30 @@ -include/AppStreamQt/appstreamqt_export.h -include/AppStreamQt/bundle.h -include/AppStreamQt/category.h -include/AppStreamQt/component-box.h -include/AppStreamQt/component.h -include/AppStreamQt/contentrating.h -include/AppStreamQt/developer.h -include/AppStreamQt/icon.h -include/AppStreamQt/image.h -include/AppStreamQt/launchable.h -include/AppStreamQt/metadata.h -include/AppStreamQt/pool.h -include/AppStreamQt/provided.h -include/AppStreamQt/relation-check-result.h -include/AppStreamQt/relation.h -include/AppStreamQt/release-list.h -include/AppStreamQt/release.h -include/AppStreamQt/screenshot.h -include/AppStreamQt/spdx.h -include/AppStreamQt/suggested.h -include/AppStreamQt/systeminfo.h -include/AppStreamQt/translation.h -include/AppStreamQt/utils.h -include/AppStreamQt/version.h -include/AppStreamQt/video.h -lib/cmake/AppStreamQt/AppStreamQtConfig.cmake -lib/cmake/AppStreamQt/AppStreamQtConfigVersion.cmake -lib/libAppStreamQt.so -lib/libAppStreamQt.so.1.0.0 -lib/libAppStreamQt.so.3 +include/AppStreamQt5/appstreamqt_export.h +include/AppStreamQt5/bundle.h +include/AppStreamQt5/category.h +include/AppStreamQt5/component-box.h +include/AppStreamQt5/component.h +include/AppStreamQt5/contentrating.h +include/AppStreamQt5/developer.h +include/AppStreamQt5/icon.h +include/AppStreamQt5/image.h +include/AppStreamQt5/launchable.h +include/AppStreamQt5/metadata.h +include/AppStreamQt5/pool.h +include/AppStreamQt5/provided.h +include/AppStreamQt5/relation-check-result.h +include/AppStreamQt5/relation.h +include/AppStreamQt5/release-list.h +include/AppStreamQt5/release.h +include/AppStreamQt5/screenshot.h +include/AppStreamQt5/spdx.h +include/AppStreamQt5/suggested.h +include/AppStreamQt5/systeminfo.h +include/AppStreamQt5/translation.h +include/AppStreamQt5/utils.h +include/AppStreamQt5/version.h +include/AppStreamQt5/video.h +lib/cmake/AppStreamQt5/AppStreamQt5Config.cmake +lib/cmake/AppStreamQt5/AppStreamQt5ConfigVersion.cmake +lib/libAppStreamQt5.so +lib/libAppStreamQt5.so.1.0.0 +lib/libAppStreamQt5.so.3 diff --git a/devel/appstream/files/patch-qt_cmake_AppStreamQt5Config.cmake.in b/devel/appstream/files/patch-qt_cmake_AppStreamQt5Config.cmake.in new file mode 100644 index 000000000000..d0bf73824eae --- /dev/null +++ b/devel/appstream/files/patch-qt_cmake_AppStreamQt5Config.cmake.in @@ -0,0 +1,13 @@ +--- qt/cmake/AppStreamQt5Config.cmake.in.orig 2023-11-11 18:48:36 UTC ++++ qt/cmake/AppStreamQt5Config.cmake.in +@@ -32,8 +32,8 @@ set_target_properties(AppStreamQt PROPERTIES + set_target_properties(AppStreamQt 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}" ++ IMPORTED_LOCATION "@LIBDIR_FULL@/libAppStreamQt5.so.${AppStreamQt5_VERSION}" ++ IMPORTED_SONAME "libAppStreamQt5.${AppStreamQt5_VERSION_MAJOR}" + ) + + ####################################################################################
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311161358.3AGDwUN4052689>