aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason E. Hale <jhale@FreeBSD.org>2023-07-10 20:28:55 +0000
committerJason E. Hale <jhale@FreeBSD.org>2023-07-12 05:31:32 +0000
commit196d64b6e6a94f536161a62932cd7e5d3d76c095 (patch)
tree339003a09ca55eb7fd54f22b95e346aa726396fa
parent390a665185dea4df5e2974008d3a09daafc0eae1 (diff)
downloadports-196d64b6e6a94f536161a62932cd7e5d3d76c095.tar.gz
ports-196d64b6e6a94f536161a62932cd7e5d3d76c095.zip
audio/kid3: Update to 3.9.4
-rw-r--r--audio/kid3/Makefile9
-rw-r--r--audio/kid3/distinfo6
-rw-r--r--audio/kid3/files/patch-CMakeLists.txt28
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()