From nobody Wed Jul 12 05:31:38 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 4R15vb1JYQz2tnPq; Wed, 12 Jul 2023 05:31:39 +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 4R15vb0vGTz3nlj; Wed, 12 Jul 2023 05:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689139899; 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=5hTp/Tvl9IwQeqcOWe3aVSjPRByBbDO1h1skulmZmA8=; b=rK+mf1ZgyoKF/p+1U83kapNbRd2X4Eu5y9fXK87sypDAOgY1nmcLJGmm2ZnD5KvNsWRfRC lW97eP3AhVmSUBlmFGWYGLKZHFVODc7+t4yIP8Y/72Ixq/X+89SvUU/iz++SFKqVugQECp AIwVX+LGC+JnvolLwQRnG0kvmnd6wPLTGQqUktWUCa+lqC5kRjLh+UtfXI+xjGd8/bIhTq huRZ6sNHw/G3F3DSjPfEjdywPhFfhaFZzA8gLlyL2cpADenq5fwjB/DyWbEf+hmsihAwe9 xR8erIhZ1Q5P51QeN585EfHdTRR8p0VHf0rxh7TA/HdlFXQr98+986Lps83EcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689139899; 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=5hTp/Tvl9IwQeqcOWe3aVSjPRByBbDO1h1skulmZmA8=; b=R1rIh/ddx8BZkW+qa9BFpDPG4tnc2Wd7n1J9FPYwD3cvoYll+rXHzNDSncJTQpqaxC1I0D VAZf4LKxEi6YBhNlM3VC4ZWyMfpO/bfmvifylllsH33KZfchLfucnWfsrSDXJ0vm4lgNMA Xk+KVoQaLmQ6ms6hGkEcJ3OyrRm6U6t5qgrm9ZLODAT1UKajQB1JP7HpbLS21+tcoyZp3v dpWo/JdXFUBy/OrXrIQQfMT8F8hqa5e0x2SSx6M4cFMWgIzltlc6lyWKjf0+fnsCBfj/rL eg11Z5NsLmC/gRoKWpR0+kw3RIxBgrwhBpIKPfOi2lbIja9KmMhaqjFoKBMAyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689139899; a=rsa-sha256; cv=none; b=bakNuJfSkMFX8t7QqSauVbIbl8VGB0OXs37TMYFUTak7BNHEygNBHzJhImZgLa6zJGR6yZ FXGVmlKTR7199PmO4R1KR4HThGAdGmb4AZkG9jpSBqcsLKQXvxGPBB2UiRYxal3RMIrwmc BNTBDlmguKwME0nIUtN96oJys9ChyNXZWpiKPU8aG5tDDPekq/2m4OARPzMEXC2xUv9m98 Cqk/1NOONy7msDrhoSKdcudhBzPLwpdNmx9RfnBvIqv8CDjIWhKkcJMCUwal7X75xF1+kl iIGZONkjl2FT21uNm/eWbfnrt954JzCmY4fbHVKeYpPYp6Ykqr1iN75SiCf4xQ== 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 4R15vZ74mwzx3h; Wed, 12 Jul 2023 05:31:38 +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 36C5Vcdp047480; Wed, 12 Jul 2023 05:31:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36C5VcAL047479; Wed, 12 Jul 2023 05:31:38 GMT (envelope-from git) Date: Wed, 12 Jul 2023 05:31:38 GMT Message-Id: <202307120531.36C5VcAL047479@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 196d64b6e6a9 - main - audio/kid3: Update to 3.9.4 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: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 196d64b6e6a94f536161a62932cd7e5d3d76c095 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=196d64b6e6a94f536161a62932cd7e5d3d76c095 commit 196d64b6e6a94f536161a62932cd7e5d3d76c095 Author: Jason E. Hale AuthorDate: 2023-07-10 20:28:55 +0000 Commit: Jason E. Hale CommitDate: 2023-07-12 05:31:32 +0000 audio/kid3: Update to 3.9.4 https://invent.kde.org/multimedia/kid3/-/releases/v3.9.4 --- audio/kid3/Makefile | 9 ++++----- audio/kid3/distinfo | 6 +++--- audio/kid3/files/patch-CMakeLists.txt | 28 ++++++++-------------------- 3 files changed, 15 insertions(+), 28 deletions(-) diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile index f0ae476bd6b3..0a686b4f93f6 100644 --- a/audio/kid3/Makefile +++ b/audio/kid3/Makefile @@ -1,6 +1,5 @@ PORTNAME= kid3 -PORTVERSION= 3.9.3 -PORTREVISION= 4 +PORTVERSION= 3.9.4 CATEGORIES= audio kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} PKGNAMESUFFIX= -${FLAVOR} @@ -39,7 +38,7 @@ PLIST_SUB+= SHLIB_VER=${PORTVERSION} USES+= qt:5 USE_QT= core dbus gui multimedia network xml widgets \ buildtools:build linguisttools:build qmake:build -CMAKE_ON+= WITH_QT5 +CMAKE_OFF+= BUILD_WITH_QT6 PLIST_SUB+= KF5="@comment " \ QT="" \ QT_SUFX="-qt" @@ -48,7 +47,7 @@ KID3_APPS+= QT USES+= gl qt:6 USE_GL= opengl USE_QT= base multimedia tools:build -CMAKE_OFF+= WITH_QT5 +CMAKE_ON+= BUILD_WITH_QT6 PLIST_SUB+= KF5="@comment " \ QT="" \ QT_SUFX="-qt" @@ -59,7 +58,7 @@ USE_KDE= auth codecs config configwidgets coreaddons kio \ service widgetsaddons xmlgui doctools:build ecm:build USE_QT= concurrent core dbus gui multimedia network xml widgets \ buildtools:build linguisttools:build qmake:build -CMAKE_ON+= WITH_QT5 +CMAKE_OFF+= BUILD_WITH_QT6 PLIST_SUB+= KF5="" \ QT="@comment " \ QT_SUFX="" diff --git a/audio/kid3/distinfo b/audio/kid3/distinfo index 74e0694ead92..42ba611810da 100644 --- a/audio/kid3/distinfo +++ b/audio/kid3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673648673 -SHA256 (kid3-3.9.3.tar.xz) = 0f686b75e8f643af406230e7d84cb8bc148e9b3058dd4cd93147494918eeadd0 -SIZE (kid3-3.9.3.tar.xz) = 1820640 +TIMESTAMP = 1689017923 +SHA256 (kid3-3.9.4.tar.xz) = c410960e96225de0a1c4888c3ea1c6dc2ca245abb691474326dcdc3edbd6a520 +SIZE (kid3-3.9.4.tar.xz) = 1834140 diff --git a/audio/kid3/files/patch-CMakeLists.txt b/audio/kid3/files/patch-CMakeLists.txt index 9e2d5dc014e0..55c0b58940c8 100644 --- a/audio/kid3/files/patch-CMakeLists.txt +++ b/audio/kid3/files/patch-CMakeLists.txt @@ -1,25 +1,13 @@ -Add CMake option to specify the version of Qt we want to build against. +Fix detection of Qt5 if both Qt5 and Qt6 are installed. ---- CMakeLists.txt.orig 2022-09-12 03:46:59 UTC +--- CMakeLists.txt.orig 2023-07-10 19:51:30 UTC +++ CMakeLists.txt -@@ -27,6 +27,7 @@ set(BUILD_SHARED_LIBS ON CACHE BOOL "build shared libr - cmake_minimum_required(VERSION 3.3) - - set(BUILD_SHARED_LIBS ON CACHE BOOL "build shared libraries") -+set(WITH_QT5 ON CACHE BOOL "build with Qt 5") - set(WITH_QML ON CACHE BOOL "build with QML") - set(WITH_TAGLIB ON CACHE BOOL "build with TagLib") - set(WITH_MP4V2 OFF CACHE BOOL "build with mp4v2") -@@ -263,7 +264,11 @@ endif() - set(Qt${_qtVersionMajor}AndroidExtras_DIR "${_qtDir}/lib/cmake/Qt${_qtVersionMajor}AndroidExtras") - endif() - endif() --find_package(QT NAMES Qt5 Qt6 COMPONENTS Core REQUIRED) -+if(WITH_QT5) +@@ -273,7 +273,7 @@ else() + if(BUILD_WITH_QT6) + find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED) + else() +- find_package(QT NAMES Qt5 Qt6 COMPONENTS Core REQUIRED) + find_package(QT NAMES Qt5 COMPONENTS Core REQUIRED) -+else() -+ find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED) -+endif() + endif() if(QT_VERSION_MAJOR EQUAL 6 AND QT_VERSION_MINOR LESS 2) set(WITH_MULTIMEDIA OFF) - endif()