git: dad575bcf10a - main - x11/kdisplay: update to 5.25.0 after d06d26f8c45e

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Tue, 07 Feb 2023 22:40:25 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dad575bcf10a730b1f13b92a6c86b1d71fe91591

commit dad575bcf10a730b1f13b92a6c86b1d71fe91591
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-06-16 17:57:39 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-02-07 22:37:20 +0000

    x11/kdisplay: update to 5.25.0 after d06d26f8c45e
    
    Changes:        https://gitlab.com/kwinft/kdisplay/-/releases/kdisplay@5.25.0-beta.0
    Changes:        https://gitlab.com/kwinft/kdisplay/-/releases/kdisplay@5.25.0
---
 x11/kdisplay/Makefile                   |  8 ++------
 x11/kdisplay/distinfo                   |  8 +++-----
 x11/kdisplay/files/patch-CMakeLists.txt |  6 +++---
 x11/kdisplay/pkg-plist                  | 24 ++++++++++++------------
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/x11/kdisplay/Makefile b/x11/kdisplay/Makefile
index ab27cd032bd8..1270f109e508 100644
--- a/x11/kdisplay/Makefile
+++ b/x11/kdisplay/Makefile
@@ -1,12 +1,8 @@
 PORTNAME=	kdisplay
 DISTVERSIONPREFIX=	${PORTNAME}@
-DISTVERSION=	5.24.0
-PORTREVISION=	1
+DISTVERSION=	5.25.0
 CATEGORIES=	x11
 
-PATCH_SITES=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
-PATCHFILES+=	74cab01dbddf.patch:-p1 # https://gitlab.com/kwinft/kdisplay/-/merge_requests/26
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	App and daemon for display managing
 WWW=		https://gitlab.com/kwinft/kdisplay
@@ -27,7 +23,7 @@ USE_LDCONFIG=	yes
 USE_QT=		qmake:build buildtools:build core dbus declarative gui \
 		sensors widgets
 GL_ACCOUNT=	kwinft
-GL_COMMIT=	a4dcebd297fded753579c7aef5a874617d274b7f
+GL_COMMIT=	125fc0b53f444a14e30b7e9c882db218e1fd8609
 PLIST_SUB=	VERSION=${PORTVERSION}
 LDFLAGS+=	-Wl,--as-needed # Qt5*, KF5*
 
diff --git a/x11/kdisplay/distinfo b/x11/kdisplay/distinfo
index 17f74241a12a..5a92b1081167 100644
--- a/x11/kdisplay/distinfo
+++ b/x11/kdisplay/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1644336089
-SHA256 (kwinft-kdisplay-a4dcebd297fded753579c7aef5a874617d274b7f_GL0.tar.gz) = a73936b3bdf161a99e60463e1c52590a885214a49dbc64ba0697681500cbc93f
-SIZE (kwinft-kdisplay-a4dcebd297fded753579c7aef5a874617d274b7f_GL0.tar.gz) = 185938
-SHA256 (74cab01dbddf.patch) = 95fd6993c031586773ca2c8ec58788fb2a347ea0efb4b5e17dfd567f6192750f
-SIZE (74cab01dbddf.patch) = 3845
+TIMESTAMP = 1655402259
+SHA256 (kwinft-kdisplay-125fc0b53f444a14e30b7e9c882db218e1fd8609_GL0.tar.gz) = 9e0dd77e1a95806156ba72d1d1cd0cb47859b5cbed3be6fdb08f8fc70f3f9200
+SIZE (kwinft-kdisplay-125fc0b53f444a14e30b7e9c882db218e1fd8609_GL0.tar.gz) = 184610
diff --git a/x11/kdisplay/files/patch-CMakeLists.txt b/x11/kdisplay/files/patch-CMakeLists.txt
index 0c782fa6927e..0145544f63f2 100644
--- a/x11/kdisplay/files/patch-CMakeLists.txt
+++ b/x11/kdisplay/files/patch-CMakeLists.txt
@@ -5,9 +5,9 @@ CMake Error at /usr/local/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package):
 Call Stack (most recent call first):
   CMakeLists.txt:26 (find_package)
 
---- CMakeLists.txt.orig	2021-10-14 15:47:28 UTC
+--- CMakeLists.txt.orig	2022-06-14 20:47:09 UTC
 +++ CMakeLists.txt
-@@ -23,19 +23,27 @@ include(FeatureSummary)
+@@ -24,19 +24,27 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
  set(CMAKE_CXX_STANDARD 17)
  set(CMAKE_CXX_STANDARD_REQUIRED ON)
  
@@ -26,7 +26,7 @@ Call Stack (most recent call first):
 +)
 +
  set(MIN_DISMAN_VERSION "0.519.80")
- find_package(Disman ${MIN_DISMAN_VERSION} REQUIRED)
+ find_package(disman ${MIN_DISMAN_VERSION} REQUIRED)
  
  add_subdirectory(kcm)
  add_subdirectory(plasma-integration)
diff --git a/x11/kdisplay/pkg-plist b/x11/kdisplay/pkg-plist
index 7ab77822042b..7893f08caf06 100644
--- a/x11/kdisplay/pkg-plist
+++ b/x11/kdisplay/pkg-plist
@@ -1,5 +1,5 @@
 bin/kdisplay
-%%QT_PLUGINDIR%%/kcms/kcm_kdisplay.so
+%%QT_PLUGINDIR%%/kcm_kdisplay.so
 %%QT_PLUGINDIR%%/kf5/kded/kdisplayd.so
 %%QT_PLUGINDIR%%/plasma/applets/plasma_applet_kdisplay.so
 share/applications/org.kwinft.kdisplay.desktop
@@ -15,29 +15,29 @@ share/kpackage/kcms/kcm_kdisplay/contents/ui/Panel.qml
 share/kpackage/kcms/kcm_kdisplay/contents/ui/RotationButton.qml
 share/kpackage/kcms/kcm_kdisplay/contents/ui/Screen.qml
 share/kpackage/kcms/kcm_kdisplay/contents/ui/main.qml
-share/kpackage/kcms/kcm_kdisplay/metadata.desktop
-share/kpackage/kcms/kcm_kdisplay/metadata.json
 share/kservices5/kcm_kdisplay.desktop
 share/kservices5/plasma-applet-org.kwinft.kdisplay.desktop
 share/locale/de/LC_MESSAGES/kcm_kdisplay.mo
-share/locale/de/LC_MESSAGES/kdisplay-plasma.mo
+share/locale/de/LC_MESSAGES/plasma_applet_org.kwinft.kdisplay.mo
 share/locale/el/LC_MESSAGES/kcm_kdisplay.mo
-share/locale/el/LC_MESSAGES/kdisplay-plasma.mo
+share/locale/el/LC_MESSAGES/plasma_applet_org.kwinft.kdisplay.mo
+share/locale/es/LC_MESSAGES/kcm_kdisplay.mo
+share/locale/es/LC_MESSAGES/plasma_applet_org.kwinft.kdisplay.mo
 share/locale/fr/LC_MESSAGES/kcm_kdisplay.mo
-share/locale/fr/LC_MESSAGES/kdisplay-plasma.mo
+share/locale/fr/LC_MESSAGES/plasma_applet_org.kwinft.kdisplay.mo
 share/locale/hr/LC_MESSAGES/kcm_kdisplay.mo
-share/locale/hr/LC_MESSAGES/kdisplay-plasma.mo
+share/locale/hr/LC_MESSAGES/plasma_applet_org.kwinft.kdisplay.mo
 share/locale/it/LC_MESSAGES/kcm_kdisplay.mo
-share/locale/it/LC_MESSAGES/kdisplay-plasma.mo
+share/locale/it/LC_MESSAGES/plasma_applet_org.kwinft.kdisplay.mo
 share/locale/nb_NO/LC_MESSAGES/kcm_kdisplay.mo
-share/locale/nb_NO/LC_MESSAGES/kdisplay-plasma.mo
+share/locale/nb_NO/LC_MESSAGES/plasma_applet_org.kwinft.kdisplay.mo
 share/locale/nl/LC_MESSAGES/kcm_kdisplay.mo
-share/locale/nl/LC_MESSAGES/kdisplay-plasma.mo
+share/locale/nl/LC_MESSAGES/plasma_applet_org.kwinft.kdisplay.mo
 share/locale/pt_BR/LC_MESSAGES/kcm_kdisplay.mo
-share/locale/pt_BR/LC_MESSAGES/kdisplay-plasma.mo
+share/locale/pt_BR/LC_MESSAGES/plasma_applet_org.kwinft.kdisplay.mo
 share/locale/rm/LC_MESSAGES/kcm_kdisplay.mo
 share/locale/ru/LC_MESSAGES/kcm_kdisplay.mo
-share/locale/ru/LC_MESSAGES/kdisplay-plasma.mo
+share/locale/ru/LC_MESSAGES/plasma_applet_org.kwinft.kdisplay.mo
 share/metainfo/org.kwinft.kdisplay.appdata.xml
 share/plasma/plasmoids/org.kwinft.kdisplay/contents/ui/PresentationModeItem.qml
 share/plasma/plasmoids/org.kwinft.kdisplay/contents/ui/ScreenLayoutSelection.qml