[PREVIEW] KDE Plasma 6

app-admin/appstream/01-appstream/beyond

@@ -1,2 +1,2 @@
 abinfo "Removing Qt components ..."
-rm -rv "$PKGDIR"/usr/{include/AppStreamQt,lib/cmake,lib/libAppStreamQt.*}
+rm -rv "$PKGDIR"/usr/{include/AppStreamQt,include/AppStreamQt5,lib/cmake,lib/libAppStreamQt.*,lib/libAppStreamQt5.*}

app-admin/appstream/01-appstream/defines

@@ -2,13 +2,14 @@ PKGNAME=appstream
 PKGSEC=admin
 PKGDEP="libxml2 polkit protobuf snowball xapian-core yaml libxmlb librsvg"
 BUILDDEP="docbook-xsl gobject-introspection gperf gtk-doc intltool qt-5 \
-          xmlto vala"
+          qt-6 xmlto vala gi-docgen"
 PKGDES="Provides a standard for creating app stores across distributions"
 
 MESON_AFTER="-Dstemming=true \
              -Dsystemd=true \
              -Dvapi=true \
              -Dqt=true \
+             -Dqt-versions=5,6 \
              -Dcompose=true \
              -Dapt-support=true \
              -Dgir=true \

app-admin/appstream/02-appstream-qt/defines

@@ -1,4 +1,4 @@
 PKGNAME=appstream-qt
 PKGSEC=admin
-PKGDEP="appstream qt-5"
+PKGDEP="appstream qt-5 qt-6"
 PKGDES="Qt bindings for AppStream"

app-admin/appstream/spec

@@ -1,5 +1,4 @@
-VER=0.16.0
-REL=2
-SRCS="tbl::https://www.freedesktop.org/software/appstream/releases/AppStream-$VER.tar.xz"
-CHKSUMS="sha256::6430cce80ddfcda5a35270edf80f71e78f437ca5104183f765af9f3ed048e170"
+VER=1.0.3
+SRCS="git::commit=tags/v${VER}::https://github.com/ximion/appstream.git"
+CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=10385"

app-admin/flatpak/spec

@@ -1,4 +1,5 @@
 VER=1.14.10
+REL=1
 SRCS="git::commit=tags/$VER::https://github.com/flatpak/flatpak \
       file::rename=flathub.flatpakrepo::https://flathub.org/repo/flathub.flatpakrepo"
 CHKSUMS="SKIP \

app-admin/packagekit/spec

@@ -1,4 +1,4 @@
-VER=1.2.8
+VER=1.3.0
 SRCS="git::commit=tags/v$VER::https://github.com/PackageKit/PackageKit"
 CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=8932"

app-admin/signon/autobuild/defines

@@ -1,8 +1,8 @@
 PKGNAME=signon
 PKGSEC=admin
-PKGDEP="qt-5"
+PKGDEP="qt-6"
 BUILDDEP="doxygen"
 PKGDES="A D-Bus service which performs user authentication on behalf of its clients"
 
-USEQT5=1
+QTPREFIX=/usr/lib/qt6
 ABMK="LIBDIR=/usr/lib"

app-admin/signon/spec

@@ -1,5 +1,4 @@
-VER=8.60
-REL=5
-SRCS="git::commit=tags/VERSION_$VER::https://gitlab.com/accounts-sso/signond.git"
+VER=8.61
+SRCS="git::commit=c8ad98249af541514ff7a81634d3295e712f1a39::https://gitlab.com/nicolasfella/signond.git"
 CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=6530"

app-devel/extra-cmake-modules/autobuild/defines

@@ -1,13 +1,13 @@
 PKGNAME=extra-cmake-modules
 PKGSEC=devel
 PKGDEP=""
-BUILDDEP="python-3 qt-5 sphinx"
+BUILDDEP="python-3 qt-6 sphinx"
 PKGDES="Extra modules and scripts for CMake"
 
 CMAKE_AFTER="-DBUILD_HTML_DOCS=ON \
              -DBUILD_MAN_DOCS=ON \
              -DBUILD_QTHELP_DOCS=ON \
-             -DBUILD_WITH_QT6=OFF \
+             -DBUILD_TESTING=OFF \
              -DSKIP_LICENSE_TESTS=ON \
              -DDOC_INSTALL_DIR=/usr/share/doc/$PKGNAME"
 

app-devel/extra-cmake-modules/spec

@@ -1,4 +1,4 @@
-VER=5.115.0
-SRCS="tbl::https://download.kde.org/stable/frameworks/${VER%.*}/extra-cmake-modules-$VER.tar.xz"
-CHKSUMS="sha256::ee3e35f6a257526b8995a086dd190528a8ef4b3854b1e457b8122701b0ce45ee"
+VER=6.9.0
+SRCS="git::commit=tags/v${VER}::https://invent.kde.org/frameworks/extra-cmake-modules.git"
+CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=8762"

app-i18n/fcitx5-configtool/01-configtool/defines

@@ -1,7 +1,7 @@
 PKGNAME="fcitx5-configtool"
 PKGSEC=x11
-PKGDEP="fcitx5-qt kwidgetsaddons kitemviews qt-5"
-BUILDDEP="extra-cmake-modules kdeclarative kirigami2 ninja plasma-framework \
+PKGDEP="fcitx5-qt kwidgetsaddons kitemviews qt-6"
+BUILDDEP="extra-cmake-modules kdeclarative kirigami ninja libplasma \
           python-3"
 PKGDES="Configuration tool for Fcitx 5"
 
@@ -10,5 +10,3 @@ PKGREP="kcm-fcitx5"
 PKGBREAK="kcm-fcitx5<=20200615"
 
 PKGEPOCH=1
-
-CMAKE_AFTER="-DUSE_QT6=OFF"

app-i18n/fcitx5-configtool/spec

@@ -1,4 +1,5 @@
 VER=5.1.7
+REL=1
 SRCS="git::commit=tags/$VER::https://github.com/fcitx/fcitx5-configtool"
 CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=138233"

app-multimedia/strawberry/autobuild/defines

@@ -1,15 +1,13 @@
 PKGNAME=strawberry
 PKGSEC=sound
 PKGDEP="chromaprint dbus fftw gstreamer glib gnutls libcdio libgpod libmtp \
-        protobuf pulseaudio qt-5 sqlite taglib tagparser"
+        protobuf pulseaudio qt-6 sqlite taglib tagparser"
 BUILDDEP="boost"
 PKGDES="A music player and library organizer"
 
-# Note: No, not Qt 6, not yet.
-# FIXME: -DUSE_TAGPARSER=OFF, broken from upstream, missing headers.
 CMAKE_AFTER="-DBUILD_WERROR=OFF \
-             -DBUILD_WITH_QT5=ON \
-             -DBUILD_WITH_QT6=OFF \
+             -DBUILD_WITH_QT5=OFF \
+             -DBUILD_WITH_QT6=ON \
              -DENABLE_ALSA=ON \
              -DENABLE_AUDIOCD=ON \
              -DENABLE_DBUS=ON \

app-multimedia/strawberry/spec

@@ -1,5 +1,4 @@
-VER=1.0.23
-REL=2
+VER=1.1.3
 SRCS="git::commit=tags/$VER::https://github.com/strawberrymusicplayer/strawberry"
 CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=19048"

app-network/freerdp-2/autobuild/defines

@@ -0,0 +1,70 @@
+PKGNAME=freerdp-2
+PKGSEC=net
+PKGDEP="alsa-lib cups faac faad2 ffmpeg fuse-3 gsm gst-plugins-base-1-0 krb5 \
+        lame libcl libusb linux-pam openh264 openssl pcsclite pulseaudio \
+        sdl2-ttf soxr wayland webkit2gtk x11-lib"
+BUILDDEP="docbook-xsl opencl-registry-api"
+PKGDES="A free implementation of the Remote Desktop Protocol (RDP)"
+
+CMAKE_AFTER="-DWITH_ALSA=ON \
+             -DWITH_CAIRO=ON \
+             -DWITH_CHANNELS=ON \
+             -DWITH_CLIENT=ON \
+             -DWITH_CLIEN_CHANNELS=ON \
+             -DWITH_CLIENT_COMMON=ON \
+             -DWITH_CLIENT_INTERFACE=ON \
+             -DWITH_CUPS=ON \
+             -DWITH_DSP_FFMPEG=ON \
+             -DWITH_FAAC=ON \
+             -DWITH_FAAD2=ON \
+             -DWITH_FFMPEG=ON \
+             -DWITH_GSM=ON \
+             -DWITH_GSSAPI=ON \
+             -DWITH_ICU=ON \
+             -DWITH_IPP=OFF \
+             -DWITH_JPEG=ON \
+             -DWITH_LAME=ON \
+             -DWITH_LIBSYSTEMD=ON \
+             -DWITH_MANPAGES=ON \
+             -DWITH_OPENCL=OFF \
+             -DWITH_OPENH264=ON \
+             -DWITH_OPENSLES=OFF \
+             -DWITH_OPENSSL=ON \
+             -DWITH_OSS=OFF \
+             -DWITH_PAM=ON \
+             -DWITH_PCSC=ON \
+             -DWITH_PROXY=ON \
+             -DWITH_PROXY_MODULES=ON \
+             -DWITH_PULSE=ON \
+             -DWITH_SERVER=ON \
+             -DWITH_SERVER_CHANNELS=ON \
+             -DWITH_SERVER_INTERFACE=ON \
+             -DWITH_SHADOW=ON \
+             -DWITH_SMARTCARD_INSPECT=ON \
+             -DWITH_SOXR=ON \
+             -DWITH_SWSCALE=ON \
+             -DWITH_VAAPI=ON \
+             -DWITH_WAYLAND=ON \
+             -DWITH_WINPR_TOOLS=ON \
+             -DWITH_X11=ON \
+             -DWITH_XCURSOR=ON \
+             -DWITH_XDAMAGE=ON \
+             -DWITH_XEXT=ON \
+             -DWITH_XFIXES=ON \
+             -DWITH_XI=ON \
+             -DWITH_XINERAMA=ON \
+             -DWITH_XKBFILE=ON \
+             -DWITH_XRANDR=ON \
+             -DWITH_XRENDER=ON \
+             -DWITH_XSHM=ON \
+             -DWITH_XTEST=ON \
+             -DWITH_XV=ON \
+             -DWITH_ZLIB=ON \
+             -DWITH_THIRD_PARTY=OFF \
+             -DCMAKE_C_FLAGS='-Wno-incompatible-pointer-types -Wno-int-conversion' \
+             -DCMAKE_INSTALL_LIBDIR=/usr/lib"
+PKGEPOCH=2
+
+PKGBREAK="gnome-boxes<=42.3-1 gnome-remote-desktop<=42.4 \
+          gtk-frdp<=3.37.1+git20220411 remmina<=1.4.31-1 vinagre<=3.22.0-6 \
+          weston<=14.0.0"

app-network/freerdp-2/autobuild/patches/0001-fix-ffmpeg-deprecations.patch

@@ -0,0 +1,141 @@
+From d0c5b1ae4289c7f3cde3fbc031cb4a3160df05ff Mon Sep 17 00:00:00 2001
+From: Armin Novak <[email protected]>
+Date: Wed, 7 Jun 2023 11:46:07 +0200
+Subject: [PATCH] [codec,dsp] fix ffmpeg deprecations
+
+---
+ libfreerdp/codec/dsp_ffmpeg.c | 54 +++++++++++++++++++++++++++--------
+ 1 file changed, 42 insertions(+), 12 deletions(-)
+
+diff --git a/libfreerdp/codec/dsp_ffmpeg.c b/libfreerdp/codec/dsp_ffmpeg.c
+index 2c93a667750e..ebba52b147d2 100644
+--- a/libfreerdp/codec/dsp_ffmpeg.c
++++ b/libfreerdp/codec/dsp_ffmpeg.c
+@@ -224,18 +224,17 @@ static void ffmpeg_close_context(FREERDP_DSP_CONTEXT* context)
+ static BOOL ffmpeg_open_context(FREERDP_DSP_CONTEXT* context)
+ {
+ 	int ret;
+-	int layout;
+-	const AUDIO_FORMAT* format;
+
+ 	if (!context || context->isOpen)
+ 		return FALSE;
+
+-	format = &context->format;
++	const AUDIO_FORMAT* format = &context->format;
+
+ 	if (!format)
+ 		return FALSE;
+-
+-	layout = av_get_default_channel_layout(format->nChannels);
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(57, 28, 100)
++	const int layout = av_get_default_channel_layout(format->nChannels);
++#endif
+ 	context->id = ffmpeg_get_avcodec(format);
+
+ 	if (ffmpeg_codec_is_filtered(context->id, context->encoder))
+@@ -271,8 +270,12 @@ static BOOL ffmpeg_open_context(FREERDP_DSP_CONTEXT* context)
+ 			break;
+ 	}
+
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(57, 28, 100)
+ 	context->context->channels = format->nChannels;
+ 	context->context->channel_layout = layout;
++#else
++	av_channel_layout_default(&context->context->ch_layout, format->nChannels);
++#endif
+ 	context->context->sample_rate = format->nSamplesPerSec;
+ 	context->context->block_align = format->nBlockAlign;
+ 	context->context->bit_rate = format->nAvgBytesPerSec * 8;
+@@ -315,8 +318,12 @@ static BOOL ffmpeg_open_context(FREERDP_DSP_CONTEXT* context)
+ 	if (!context->rcontext)
+ 		goto fail;
+
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(57, 28, 100)
+ 	context->frame->channel_layout = layout;
+ 	context->frame->channels = format->nChannels;
++#else
++	av_channel_layout_default(&context->frame->ch_layout, format->nChannels);
++#endif
+ 	context->frame->sample_rate = format->nSamplesPerSec;
+ 	context->frame->format = AV_SAMPLE_FMT_S16;
+
+@@ -331,13 +338,21 @@ static BOOL ffmpeg_open_context(FREERDP_DSP_CONTEXT* context)
+ 		context->resampled->sample_rate = format->nSamplesPerSec;
+ 	}
+
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(57, 28, 100)
+ 	context->resampled->channel_layout = layout;
+ 	context->resampled->channels = format->nChannels;
++#else
++	av_channel_layout_default(&context->resampled->ch_layout, format->nChannels);
++#endif
+
+ 	if (context->context->frame_size > 0)
+ 	{
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(57, 28, 100)
+ 		context->buffered->channel_layout = context->resampled->channel_layout;
+ 		context->buffered->channels = context->resampled->channels;
++#else
++		av_channel_layout_copy(&context->buffered->ch_layout, &context->resampled->ch_layout);
++#endif
+ 		context->buffered->format = context->resampled->format;
+ 		context->buffered->nb_samples = context->context->frame_size;
+
+@@ -458,14 +473,20 @@ static BOOL ffmpeg_fill_frame(AVFrame* frame, const AUDIO_FORMAT* inputFormat, c
+                               size_t size)
+ {
+ 	int ret, bpp;
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(57, 28, 100)
+ 	frame->channels = inputFormat->nChannels;
++	frame->channel_layout = av_get_default_channel_layout(frame->channels);
++#else
++	av_channel_layout_default(&frame->ch_layout, inputFormat->nChannels);
++#endif
+ 	frame->sample_rate = inputFormat->nSamplesPerSec;
+ 	frame->format = ffmpeg_sample_format(inputFormat);
+-	frame->channel_layout = av_get_default_channel_layout(frame->channels);
++
+ 	bpp = av_get_bytes_per_sample(frame->format);
+ 	frame->nb_samples = size / inputFormat->nChannels / bpp;
+
+-	if ((ret = avcodec_fill_audio_frame(frame, frame->channels, frame->format, data, size, 1)) < 0)
++	if ((ret = avcodec_fill_audio_frame(frame, inputFormat->nChannels, frame->format, data, size,
++	                                    1)) < 0)
+ 	{
+ 		const char* err = av_err2str(ret);
+ 		WLog_ERR(TAG, "Error during audio frame fill %s [%d]", err, ret);
+@@ -547,7 +568,12 @@ static BOOL ffmpeg_decode(AVCodecContext* dec_ctx, AVPacket* pkt, AVFrame* frame
+ 		}
+
+ 		{
+-			const size_t data_size = resampled->channels * resampled->nb_samples * 2;
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(57, 28, 100)
++			const size_t channels = resampled->channels;
++#else
++			const size_t channels = resampled->ch_layout.nb_channels;
++#endif
++			const size_t data_size = channels * resampled->nb_samples * 2;
+ 			Stream_EnsureRemainingCapacity(out, data_size);
+ 			Stream_Write(out, resampled->data[0], data_size);
+ 		}
+@@ -745,10 +771,14 @@ BOOL freerdp_dsp_ffmpeg_encode(FREERDP_DSP_CONTEXT* context, const AUDIO_FORMAT*
+ 			if (inSamples + (int)context->bufferedSamples > context->context->frame_size)
+ 				inSamples = context->context->frame_size - (int)context->bufferedSamples;
+
+-			rc =
+-			    av_samples_copy(context->buffered->extended_data, context->resampled->extended_data,
+-			                    (int)context->bufferedSamples, copied, inSamples,
+-			                    context->context->channels, context->context->sample_fmt);
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(57, 28, 100)
++			const int channels = context->context->channels;
++#else
++			const int channels = context->context->ch_layout.nb_channels;
++#endif
++			rc = av_samples_copy(context->buffered->extended_data,
++			                     context->resampled->extended_data, (int)context->bufferedSamples,
++			                     copied, inSamples, channels, context->context->sample_fmt);
+ 			rest -= inSamples;
+ 			copied += inSamples;
+ 			context->bufferedSamples += (UINT32)inSamples;
+