From nobody Thu Nov 16 13:58:30 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SWM7q0Tk6z50gxp; Thu, 16 Nov 2023 13:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SWM7p6vLjz4mml; Thu, 16 Nov 2023 13:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700143111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BO1dWVi9G7CVaS95JSCcN/w+wrJi60QFrujbcrqT89g=; b=Jhts2QdBcxXf7YFfRWgWwTgfU9ruxzkcF/v7DINdNYLehN/8s0AD63tJ3bNnMcXd/0WY1a loPpLWdtLQNe01lEY1OPl//BnH3OUqO3+CjYPJn9ZOkI2wxHJIxG8oY0eu2aKPoQtRu7Ft XW+dhknnBdgJUEeTI0N+C5RvYzNOfPqxwy6QNilFA3fCMv6YDCQq+HcVADnQAIWOAe6mIn JRq1rH2i4kdK/L94Yukuqp6A7phH60KYF33gLQnIxwAF78oQW2TxrIJig2PrEooKw+7fRN LM3BJU7C9kKQLcZWtqcjKJpzOa4BtL6wnRCcL1Fo/iT0cylD3BM0L5L1ahGJIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700143111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BO1dWVi9G7CVaS95JSCcN/w+wrJi60QFrujbcrqT89g=; b=jXIQanU+RcsICG1Xa1dF3bDI2EK3NTOmvriczgt2W70w7afX7z6SEVAZn+AAbuvieqUJ1A pednPI0j2N4yFK9y4RwqKcpOV0GCZp/SMGaRDq1doU8myFOQBuzq9cXrDr9nX+WVImQfF6 HvSG5LtMbIAg22v5ssJq43UYMQ3BVECAs5FOFgsznA2IyJwHSTs1ww+rUufQ1Guif/FsTf +v/AvHjb/oTSwxMXUCOYfnzrTY4eBI0E1reoJO1oDw5RvO0boq++90a3sLTWII95iN0x4a seiljF449oXXx3IlusSokPIsfUCcWkVCrtFe9Dfg686fptrrPfa3/O8LY+rwfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700143111; a=rsa-sha256; cv=none; b=YdI+SO94oW1utUZJShgvogp94AGc3NE1me3XhGJYse1DEEjL+rxSemqwSFZBrtVR13sxyL wW/NnHrZ1nxhPhP1181x+/TkVQc2TZBNXWTHWfafNpAkSWPfZzLz9mwaaFHfeGFiVkSbZn 0Obl6c3fIAcrBAvZnkLezhSyW1NNFZbyOEcC9BDDm78svSLxfWTXUQr9mB+XWRdM7qSU/v MDSUFIxfkPpnv9EX0sMO2xkx9ZHsE7ISMRwS+xA9Z920cvMvowyVObF3kreqLm/jBxcY3P dw8cxPdX7N8CVp7zcvncshAcaeSY86D9D5zSTWH1+hT4dds9QTZ+3KKrS2AEAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SWM7p5y8qz12Mp; Thu, 16 Nov 2023 13:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AGDwUJ7052692; Thu, 16 Nov 2023 13:58:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AGDwUN4052689; Thu, 16 Nov 2023 13:58:30 GMT (envelope-from git) Date: Thu, 16 Nov 2023 13:58:30 GMT Message-Id: <202311161358.3AGDwUN4052689@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: a2f40d93caa2 - main - devel/appstream-qt: Switch back to Qt 5. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2f40d93caa23d49fde3f8c9061d4e7fbdaeeb81 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a2f40d93caa23d49fde3f8c9061d4e7fbdaeeb81 commit a2f40d93caa23d49fde3f8c9061d4e7fbdaeeb81 Author: Gleb Popov AuthorDate: 2023-11-16 13:56:14 +0000 Commit: Gleb Popov 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}" + ) + + ####################################################################################