From nobody Sat Jan 13 19:36:19 2024 X-Original-To: dev-commits-ports-all@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 4TC7tq3SQTz56Vgf; Sat, 13 Jan 2024 19:36:19 +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 4TC7tq1g6xz494K; Sat, 13 Jan 2024 19:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705174579; 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=ta4ZSYK/dQ9gdUev3Na+Xsiax4IshrPsW/kg2Z0i1D4=; b=pqvH5fbgQpKnTY3BNepctH+2WO+cijwpute13JiG2mPmbfDZOKl8ekTYk9s7t9mnIn7fZP vpxxnU8Q7jkxwvXa9N6bqwtkg3yXPqBZloUh2CXdQQAIsTy7CixqulN/taczfFGzAgz+Nl yVUXdi9FgMg0WVehheTw0qS5i6CTOS5OtgDozuvlMxXjp62wICs3CymTFJ9beHSlvpGmq3 VIYTN1zMCPBLWqATQa5yFhojKWAQ90YMwZhTblNquNO+No9EYFE3f7b21X9tqsfidB6XTD 2T70I7IAU4txFrMK80e3khAKVI3YPk18+3T98fw73BMmG33Is4FvTyHJ0CAh/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705174579; 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=ta4ZSYK/dQ9gdUev3Na+Xsiax4IshrPsW/kg2Z0i1D4=; b=uzecR6GE9zvVj1S92qQKu9QcSeLiIVgxoaQbR7HbnOxpbAnlqhxxFFvHMfBHNgL+e4XEu/ RVXUoAt76IVDkH7iEljXEcsODfMrYI8qNDkmJnIyFkwjA61viaJ/Qen5RPnsL2+M6VuG46 /zc0bCCSGYueH6jpOIAbkJ0UZ/x2YhX6tyY9QVUWO2XNs3T6+L9+6HehrYNAbZTe3aubiQ 8lj2ddx+g5hGSRUvSnBHH2gcL74gPIz+1+SACehuIZ3Lq6/nIWYMN1pXVTvYBR40WxzWcv lQHlpDkWLGuR86D41Qxk1a8rtWrp+ld3Of2Sz16BI9Mvj2bAQ+5mhnJSsGf9pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705174579; a=rsa-sha256; cv=none; b=st2HN9N6N2W6U9gpvmWQQfK8eT7jB5GOYIhI03ReYAx4cjYCWMMghahEImYB5CV27NbE0x e/8lJJytb/OZAo9Y+zkY47pXCfOqgzIASkZzXORQuk/CDMlAsf2HxlZgJTjdhN7bo4Z6mI adH/nwFuU2p/lMmaz2MpJDDJmMI9fmsxcJ6xb7Q3KvdJIn0GHasHlMMldzu1MX+wjYSgsZ vsq1axVHf+WXHwRxORIiRggoK3FjsppVNXWmIVKlgLeqkAm2yBcd+e8xTW/tPphRcvWHAM VpV2JXw4m6ZMFPRg7vqt/oLaPSJePdWu0yfkxnUmpOt4TRDP8P+PC48RhJJcAQ== 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 4TC7tq0mSnzjcq; Sat, 13 Jan 2024 19:36:19 +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 40DJaJsg091868; Sat, 13 Jan 2024 19:36:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40DJaJmf091865; Sat, 13 Jan 2024 19:36:19 GMT (envelope-from git) Date: Sat, 13 Jan 2024 19:36:19 GMT Message-Id: <202401131936.40DJaJmf091865@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 8d20726a99ff - main - audio/pulseaudio-qt: update to 1.4.0 and flavorize for Qt 5 and Qt 6 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d20726a99ff2400ba2229a4deb16e1dd59c07e4 Auto-Submitted: auto-generated The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=8d20726a99ff2400ba2229a4deb16e1dd59c07e4 commit 8d20726a99ff2400ba2229a4deb16e1dd59c07e4 Author: Tobias C. Berner AuthorDate: 2024-01-12 18:43:43 +0000 Commit: Tobias C. Berner CommitDate: 2024-01-13 19:35:39 +0000 audio/pulseaudio-qt: update to 1.4.0 and flavorize for Qt 5 and Qt 6 - Add flavors to simplify the coming transition phase from a Qt5 based KDE desktop to a Qt6 based one. --- audio/pulseaudio-qt/Makefile | 18 +++++--- audio/pulseaudio-qt/distinfo | 6 +-- audio/pulseaudio-qt/pkg-plist | 95 ++++++++++++++++++++------------------- deskutils/kdeconnect-kde/Makefile | 3 +- 4 files changed, 66 insertions(+), 56 deletions(-) diff --git a/audio/pulseaudio-qt/Makefile b/audio/pulseaudio-qt/Makefile index ca5c25b2a80c..08bbf832a2d7 100644 --- a/audio/pulseaudio-qt/Makefile +++ b/audio/pulseaudio-qt/Makefile @@ -1,20 +1,28 @@ PORTNAME= pulseaudio-qt -DISTVERSION= 1.3 +DISTVERSION= 1.4.0 MASTER_SITES= KDE/stable/${PORTNAME} -PORTREVISION= 2 CATEGORIES= audio kde +PKGNAMESUFFIX= ${FLAVOR:S/qt//} MAINTAINER= kde@FreeBSD.org COMMENT= Pulseaudio bindings for Qt WWW= https://github.com/KDE/pulseaudio-qt +FLAVORS= qt5 qt6 +FLAVOR?= qt5 + LIB_DEPENDS= libcanberra.so:audio/libcanberra \ libpulse.so:audio/pulseaudio -USES= cmake compiler:c++11-lib gettext kde:5 \ - pkgconfig qt:5 shebangfix tar:xz +USES= cmake compiler:c++11-lib gettext kde:${FLAVOR:S/qt//} \ + pkgconfig qt:${FLAVOR:S/qt//} shebangfix tar:xz USE_KDE= ecm:build -USE_QT= core dbus gui \ +_USE_QT_qt5= core dbus gui \ buildtools:build qmake:build +_USE_QT_qt6= base +USE_QT= ${_USE_QT_${FLAVOR}} +CMAKE_ARGS= -DQT_MAJOR_VERSION=${FLAVOR:S/qt//} + +PLIST_SUB= QT_VER=${FLAVOR:S/qt//} .include diff --git a/audio/pulseaudio-qt/distinfo b/audio/pulseaudio-qt/distinfo index 84d3ceffb06e..f65ff0692f38 100644 --- a/audio/pulseaudio-qt/distinfo +++ b/audio/pulseaudio-qt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1622271634 -SHA256 (pulseaudio-qt-1.3.tar.xz) = bceb07630d946fa0ce928b177687f618186cdef2309828188211d61a36589ec4 -SIZE (pulseaudio-qt-1.3.tar.xz) = 34148 +TIMESTAMP = 1705084640 +SHA256 (pulseaudio-qt-1.4.0.tar.xz) = d8ca624ecf2130856b859cf9341177f6fef8c51f20f7728d807d09c7150ed065 +SIZE (pulseaudio-qt-1.4.0.tar.xz) = 35704 diff --git a/audio/pulseaudio-qt/pkg-plist b/audio/pulseaudio-qt/pkg-plist index f403fb4e4009..4b98b7188ef3 100644 --- a/audio/pulseaudio-qt/pkg-plist +++ b/audio/pulseaudio-qt/pkg-plist @@ -1,47 +1,48 @@ -include/KF5/KF5PulseAudioQt/PulseAudioQt/Card -include/KF5/KF5PulseAudioQt/PulseAudioQt/CardPort -include/KF5/KF5PulseAudioQt/PulseAudioQt/Client -include/KF5/KF5PulseAudioQt/PulseAudioQt/Context -include/KF5/KF5PulseAudioQt/PulseAudioQt/Device -include/KF5/KF5PulseAudioQt/PulseAudioQt/IndexedPulseObject -include/KF5/KF5PulseAudioQt/PulseAudioQt/Models -include/KF5/KF5PulseAudioQt/PulseAudioQt/Module -include/KF5/KF5PulseAudioQt/PulseAudioQt/Port -include/KF5/KF5PulseAudioQt/PulseAudioQt/Profile -include/KF5/KF5PulseAudioQt/PulseAudioQt/PulseObject -include/KF5/KF5PulseAudioQt/PulseAudioQt/Server -include/KF5/KF5PulseAudioQt/PulseAudioQt/Sink -include/KF5/KF5PulseAudioQt/PulseAudioQt/SinkInput -include/KF5/KF5PulseAudioQt/PulseAudioQt/Source -include/KF5/KF5PulseAudioQt/PulseAudioQt/SourceOutput -include/KF5/KF5PulseAudioQt/PulseAudioQt/Stream -include/KF5/KF5PulseAudioQt/PulseAudioQt/StreamRestore -include/KF5/KF5PulseAudioQt/PulseAudioQt/VolumeObject -include/KF5/KF5PulseAudioQt/PulseAudioQt/card.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/cardport.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/client.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/context.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/device.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/indexedpulseobject.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/models.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/module.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/port.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/profile.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/pulseaudioqt_export.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/pulseobject.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/server.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/sink.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/sinkinput.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/source.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/sourceoutput.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/stream.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/streamrestore.h -include/KF5/KF5PulseAudioQt/PulseAudioQt/volumeobject.h -include/KF5/pulseaudioqt_version.h -lib/cmake/KF5PulseAudioQt/KF5PulseAudioQtConfig.cmake -lib/cmake/KF5PulseAudioQt/KF5PulseAudioQtConfigVersion.cmake -lib/cmake/KF5PulseAudioQt/KF5PulseAudioQtTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/KF5PulseAudioQt/KF5PulseAudioQtTargets.cmake -lib/libKF5PulseAudioQt.so -lib/libKF5PulseAudioQt.so.1.3.0 -lib/libKF5PulseAudioQt.so.3 +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Card +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/CardPort +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Client +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Context +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Device +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/IndexedPulseObject +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Models +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Module +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Port +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Profile +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/PulseObject +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Server +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Sink +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/SinkInput +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Source +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/SourceOutput +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/Stream +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/StreamRestore +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/VolumeObject +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/card.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/cardport.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/client.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/context.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/device.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/indexedpulseobject.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/models.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/module.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/port.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/profile.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/pulseaudioqt_export.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/pulseobject.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/server.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/sink.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/sinkinput.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/source.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/sourceoutput.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/stream.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/streamrestore.h +include/KF%%QT_VER%%/KF%%QT_VER%%PulseAudioQt/PulseAudioQt/volumeobject.h +include/KF%%QT_VER%%/pulseaudioqt_version.h +lib/cmake/KF%%QT_VER%%PulseAudioQt/KF%%QT_VER%%PulseAudioQtConfig.cmake +lib/cmake/KF%%QT_VER%%PulseAudioQt/KF%%QT_VER%%PulseAudioQtConfigVersion.cmake +lib/cmake/KF%%QT_VER%%PulseAudioQt/KF%%QT_VER%%PulseAudioQtTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/KF%%QT_VER%%PulseAudioQt/KF%%QT_VER%%PulseAudioQtTargets.cmake +lib/libKF%%QT_VER%%PulseAudioQt.so +lib/libKF%%QT_VER%%PulseAudioQt.so.1.4.0 +lib/libKF%%QT_VER%%PulseAudioQt.so.4 +libdata/pkgconfig/KF%%QT_VER%%PulseAudioQt.pc diff --git a/deskutils/kdeconnect-kde/Makefile b/deskutils/kdeconnect-kde/Makefile index 88093581a964..b1a517866a50 100644 --- a/deskutils/kdeconnect-kde/Makefile +++ b/deskutils/kdeconnect-kde/Makefile @@ -1,5 +1,6 @@ PORTNAME= kdeconnect-kde DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -10,7 +11,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libfakekey.so:x11/libfakekey \ libwayland-client.so:graphics/wayland \ - libKF5PulseAudioQt.so:audio/pulseaudio-qt + libKF5PulseAudioQt.so:audio/pulseaudio-qt@qt5 BUILD_DEPENDS= kpeoplevcard>0:net/kpeoplevcard \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ wayland-protocols>=0:graphics/wayland-protocols \