From owner-svn-ports-head@freebsd.org Thu Jan 21 22:18:39 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6A8474E165A; Thu, 21 Jan 2021 22:18:39 +0000 (UTC) (envelope-from adridg@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 4DMGxq2NkJz3Gk5; Thu, 21 Jan 2021 22:18:39 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 40905134F8; Thu, 21 Jan 2021 22:18:39 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10LMIdJ3086537; Thu, 21 Jan 2021 22:18:39 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10LMIc4c086535; Thu, 21 Jan 2021 22:18:38 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202101212218.10LMIc4c086535@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Thu, 21 Jan 2021 22:18:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r562250 - in head/x11/plasma5-plasma-workspace: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/x11/plasma5-plasma-workspace: . files X-SVN-Commit-Revision: 562250 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2021 22:18:39 -0000 Author: adridg Date: Thu Jan 21 22:18:38 2021 New Revision: 562250 URL: https://svnweb.freebsd.org/changeset/ports/562250 Log: Backport a x11/plasma5-plasma-workspace fix for date-size in vertical panels If you use a vertical panel, and have the digital clock, and use a date-format with spaces (e.g. anything but ISO format) then the font- size of the date display would blow up after logging in. This patch is already upstream for 5.21, but it annoys me so pull it into our packaging as well. Added: head/x11/plasma5-plasma-workspace/files/patch-MR-572.patch (contents, props changed) Modified: head/x11/plasma5-plasma-workspace/Makefile Modified: head/x11/plasma5-plasma-workspace/Makefile ============================================================================== --- head/x11/plasma5-plasma-workspace/Makefile Thu Jan 21 22:07:26 2021 (r562249) +++ head/x11/plasma5-plasma-workspace/Makefile Thu Jan 21 22:18:38 2021 (r562250) @@ -2,6 +2,7 @@ PORTNAME= plasma-workspace DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-plasma MAINTAINER= kde@FreeBSD.org Added: head/x11/plasma5-plasma-workspace/files/patch-MR-572.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/plasma5-plasma-workspace/files/patch-MR-572.patch Thu Jan 21 22:18:38 2021 (r562250) @@ -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