Index: head/x11/plasma5-plasma-workspace/Makefile =================================================================== --- head/x11/plasma5-plasma-workspace/Makefile (revision 562249) +++ head/x11/plasma5-plasma-workspace/Makefile (revision 562250) @@ -1,55 +1,56 @@ # $FreeBSD$ PORTNAME= plasma-workspace DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-plasma MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 Plasma workspace LIB_DEPENDS= libcln.so:math/cln \ libdbusmenu-qt5.so:devel/libdbusmenu-qt \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ libqalculate.so:math/libqalculate \ libwayland-client.so:graphics/wayland \ libxcb-image.so:x11/xcb-util-image \ libxcb-util.so:x11/xcb-util RUN_DEPENDS= ck-launch-session:sysutils/consolekit2\ iceauth:x11/iceauth \ xsetroot:x11/xsetroot \ xset:x11/xset \ xmessage:x11/xmessage \ ${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:x11/xkeyboard-config \ iso-codes>=0:misc/iso-codes \ ${LOCALBASE}/bin/genv:sysutils/coreutils USES= cmake compiler:c++11-lib cpe desktop-file-utils gettext kde:5 pkgconfig \ qt:5 tar:xz xorg USE_KDE= activities activities-stats activitymanagerd attica archive auth baloo bookmarks \ codecs completion config configwidgets coreaddons crash \ dbusaddons doctools emoticons filemetadata globalaccel \ guiaddons holidays i18n iconthemes idletime init itemmodels \ itemviews jobwidgets js jsembed kcmutils kdeclarative \ kdelibs4support kdesu kdewebkit kio kscreenlocker \ notifications package pty kwin libkscreen libksysguard \ newstuff notifyconfig parts people plasma-framework \ plasma-integration prison runner service solid sonnet \ texteditor textwidgets unitconversion wallet wayland \ widgetsaddons windowsystem xmlgui xmlrpcclient \ breeze_run breeze-icons_run kquickcharts_run oxygen-icons5_run \ kded_run milou_run USE_QT= concurrent core declarative dbus graphicaleffects gui network phonon4 \ printsupport qdbus quickcontrols_run script svg sql \ testlib webkit widgets x11extras xml \ paths_run \ buildtools_build qmake_build USE_XORG= ice sm x11 xau xcb xcomposite xcursor xext xfixes xft xkbfile xrender xtst CMAKE_OFF= BUILD_TESTING # In 5.15 a file was moved from x11/plasma5-plasma-desktop to x11/plasma5-plasma-workspace: CONFLICTS_INSTALL= plasma5-plasma-desktop-5.14.* .include Index: head/x11/plasma5-plasma-workspace/files/patch-MR-572.patch =================================================================== --- head/x11/plasma5-plasma-workspace/files/patch-MR-572.patch (nonexistent) +++ head/x11/plasma5-plasma-workspace/files/patch-MR-572.patch (revision 562250) @@ -0,0 +1,59 @@ +diff --git a/applets/digital-clock/package/contents/ui/DigitalClock.qml b/applets/digital-clock/package/contents/ui/DigitalClock.qml +index 1ff90e0a0b07aa3563c850c736b68da4a4a316a4..e404da522f75f77aedcf45f2255ab34cf133626a 100644 +--- applets/digital-clock/package/contents/ui/DigitalClock.qml ++++ applets/digital-clock/package/contents/ui/DigitalClock.qml +@@ -152,6 +152,7 @@ Item { + + height: 0.8 * timeLabel.height + width: dateLabel.paintedWidth ++ verticalAlignment: Text.AlignVCenter + + font.pixelSize: dateLabel.height + } +@@ -212,6 +213,8 @@ Item { + height: timeLabel.height + width: dateLabel.paintedWidth + ++ font.pixelSize: 1024 ++ verticalAlignment: Text.AlignVCenter + anchors.rightMargin: labelsGrid.columnSpacing + + fontSizeMode: Text.VerticalFit +@@ -268,7 +271,7 @@ Item { + PropertyChanges { + target: contentItem + +- height: main.showDate ? labelsGrid.height + dateLabel.height : labelsGrid.height ++ height: main.showDate ? labelsGrid.height + dateLabel.contentHeight : labelsGrid.height + width: main.width + } + +@@ -303,9 +306,15 @@ Item { + target: dateLabel + + width: main.width ++ //NOTE: in order for Text.Fit to work as intended, the actual height needs to be quite big, in order for the font to enlarge as much it needs for the available width, and then request a sensible height, for which contentHeight will need to be considered as opposed to height ++ height: PlasmaCore.Units.gridUnit * 10 + + fontSizeMode: Text.Fit +- font.minimumPixelSize: Math.max(theme.smallestFont.pixelSize, timeLabel.height) ++ verticalAlignment: Text.AlignTop ++ // Those magic numbers are purely what looks nice as maximum size, here we have it the smallest ++ // between slightly bigger than the default font (1.4 times) and a bit smaller than the time font ++ font.pixelSize: Math.min(0.7 * timeLabel.height, PlasmaCore.Theme.defaultFont.pixelSize * 1.4) ++ font.minimumPixelSize: theme.smallestFont.pixelSize + elide: Text.ElideRight + wrapMode: Text.WordWrap + } +@@ -374,8 +383,10 @@ Item { + PropertyChanges { + target: dateLabel + +- height: 0.8 * timeLabel.height ++ height: 0.7 * timeLabel.height ++ font.pixelSize: 1024 + width: Math.max(timeLabel.contentWidth, units.gridUnit * 3) ++ verticalAlignment: Text.AlignVCenter + + fontSizeMode: Text.Fit + minimumPixelSize: 1 Property changes on: head/x11/plasma5-plasma-workspace/files/patch-MR-572.patch ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property