From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CAA1415803E for ; Fri, 5 Jan 2024 08:39:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B281C2BC0EF; Fri, 5 Jan 2024 08:39:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F3392BC0EF for ; Fri, 5 Jan 2024 08:39:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 263543430E1 for ; Fri, 5 Jan 2024 08:39:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D286B14D3 for ; Fri, 5 Jan 2024 08:39:29 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1704443641.d6dab2d788215e0d286b2aee6854c1989f3dee70.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kuserfeedback/, kde-frameworks/kuserfeedback/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/kuserfeedback/Manifest kde-frameworks/kuserfeedback/files/kuserfeedback-1.2.0-enable_docs.patch kde-frameworks/kuserfeedback/kuserfeedback-1.2.0.ebuild X-VCS-Directories: kde-frameworks/kuserfeedback/files/ kde-frameworks/kuserfeedback/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d6dab2d788215e0d286b2aee6854c1989f3dee70 X-VCS-Branch: master Date: Fri, 5 Jan 2024 08:39:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b80ea81d-b758-4cd0-ad7d-6c1c4fa78783 X-Archives-Hash: 57baf9eb3c9ab27e9bba2d28c2627b50 commit: d6dab2d788215e0d286b2aee6854c1989f3dee70 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 4 12:28:18 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jan 5 08:34:01 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6dab2d7 kde-frameworks/kuserfeedback: drop 1.2.0 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/kuserfeedback/Manifest | 1 - .../files/kuserfeedback-1.2.0-enable_docs.patch | 48 ----------------- .../kuserfeedback/kuserfeedback-1.2.0.ebuild | 60 ---------------------- 3 files changed, 109 deletions(-) diff --git a/kde-frameworks/kuserfeedback/Manifest b/kde-frameworks/kuserfeedback/Manifest index 9e7a40306cf9..126066648025 100644 --- a/kde-frameworks/kuserfeedback/Manifest +++ b/kde-frameworks/kuserfeedback/Manifest @@ -1,3 +1,2 @@ -DIST kuserfeedback-1.2.0.tar.xz 206364 BLAKE2B 4ae1683f8a3470ee3db7b3039c27ebd7bc210afd5cd8cdd992a107e541971f4778d7add3fb330befbfd7d62e04d9d2aba8fc22eab5a368f4b92e98f7baa1ec41 SHA512 0152233c741a287b623256cac6d109d405441f17dec68c5782d900ddb9ca5a93614d46ea112e1be9e64913cc3f46d107bec64cad4579b766919439b0ed88a470 DIST kuserfeedback-1.3.0.tar.xz 230644 BLAKE2B b7305be09a5e62c980273766ec16f624eab4312ababbb8ebb3e24983ffad7ac19445bb848088331c0b4b02da37ee646c9cf91b8965455d018f9b45084c62d17c SHA512 16fc7fa850e7ac1dc772ab25f81f75fe28454680ce9ddf68da0f14c6d5e9b8201f69d168b1ee32bdf9f0ee517b0cac34eb09fd3dbfa697c0a8d3b23c6ac790cb DIST kuserfeedback-5.247.0.tar.xz 238980 BLAKE2B 7d4677de1ababdfa558eb285a5afcead430def6aaf0b6e261a087978a66c7652dc815e85ee9262095a7b9ee027062428724ca7de13e426169e7b527a1154ef92 SHA512 7723942d143b480f3fcb5dd49d32b5b7eb0c50f07094d83e43a899d2e00db877bf28d07f961a67afb4c7df19e0638810597c78c57e72ebcc46611c5b198e20ce diff --git a/kde-frameworks/kuserfeedback/files/kuserfeedback-1.2.0-enable_docs.patch b/kde-frameworks/kuserfeedback/files/kuserfeedback-1.2.0-enable_docs.patch deleted file mode 100644 index 77915f1b4040..000000000000 --- a/kde-frameworks/kuserfeedback/files/kuserfeedback-1.2.0-enable_docs.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f523d1da91dbf944cb753e8aed8ad40367e8826c Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Fri, 11 Feb 2022 12:29:50 +0100 -Subject: [PATCH] Hide finding docs dependencies behind ENABLE_DOCS - -It was also oddly placed within CMakeLists.txt so moved it below -major Qt dependency calls (and the actual "# Dependencies" block). - -Signed-off-by: Andreas Sturmlechner ---- - CMakeLists.txt | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9ea764a..48623bc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,12 +39,6 @@ include(ECMGeneratePriFile) - include(FeatureSummary) - include(GenerateExportHeader) - --if(QT_MAJOR_VERSION STREQUAL "5") -- find_package(Qt5 CONFIG OPTIONAL_COMPONENTS DocTools) --else() -- find_package(Qt6 CONFIG OPTIONAL_COMPONENTS ToolsTools) --endif() -- - ecm_setup_version(PROJECT - VARIABLE_PREFIX KUSERFEEDBACK - VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kuserfeedback_version.h" -@@ -61,6 +55,14 @@ if (NOT CMAKE_CROSSCOMPILING) - find_package(Qt${QT_MAJOR_VERSION} NO_MODULE QUIET OPTIONAL_COMPONENTS Help) - endif() - -+if (ENABLE_DOCS) -+ if(QT_MAJOR_VERSION STREQUAL "5") -+ find_package(Qt5 CONFIG OPTIONAL_COMPONENTS DocTools) -+ else() -+ find_package(Qt6 CONFIG OPTIONAL_COMPONENTS ToolsTools) -+ endif() -+endif() -+ - set_package_properties(Qt${QT_MAJOR_VERSION} PROPERTIES URL "http://qt-project.org/") - set_package_properties(Qt${QT_MAJOR_VERSION}Widgets PROPERTIES TYPE RECOMMENDED PURPOSE "Required for feedback configuration and notification widgets.") - set_package_properties(Qt${QT_MAJOR_VERSION}Charts PROPERTIES TYPE RECOMMENDED PURPOSE "Required for UserFeedbackConsole.") --- -2.35.1 - diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-1.2.0.ebuild b/kde-frameworks/kuserfeedback/kuserfeedback-1.2.0.ebuild deleted file mode 100644 index 81a87132e7b2..000000000000 --- a/kde-frameworks/kuserfeedback/kuserfeedback-1.2.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_QTHELP="false" -ECM_TEST="forceoptional" -KFMIN=5.82.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Framework to collect user feedback for applications via telemetry and surveys" -SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - -LICENSE="MIT" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="doc" - -DEPEND=" - >=dev-qt/qtcharts-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 -" -RDEPEND="${DEPEND}" -BDEPEND=" - sys-devel/bison - sys-devel/flex - doc? ( - >=dev-qt/qdoc-${QTMIN}:5 - >=dev-qt/qthelp-${QTMIN}:5 - ) -" - -# https://invent.kde.org/libraries/kuserfeedback/-/merge_requests/21 -PATCHES=( "${FILESDIR}/${P}-enable_docs.patch" ) - -src_configure() { - local mycmakeargs=( - -DQT_MAJOR_VERSION=5 - # disable server application - -DENABLE_PHP=NO - -DENABLE_PHP_UNIT=NO - -DENABLE_SURVEY_TARGET_EXPRESSIONS=YES - -DENABLE_DOCS=$(usex doc) - ) - - ecm_src_configure -}