Date: Fri, 5 Nov 2021 05:12:23 GMT From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2507b096e4fb - main - KDE: reduce diff on KDE Gear updates Message-ID: <202111050512.1A55CNFi057375@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=2507b096e4fb31d83420dc9fe3681b5b73537d20 commit 2507b096e4fb31d83420dc9fe3681b5b73537d20 Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2021-11-04 19:15:42 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2021-11-05 05:07:40 +0000 KDE: reduce diff on KDE Gear updates Some KDE Gear applications set a different version for the shared library than the rest of them. Those ports manually overwrote the variable used in the plist sub. Make them use a kde.mk defined value, so that only one place needs to be changed on updates. --- Mk/Uses/kde.mk | 2 ++ astro/kosmindoormap/Makefile | 2 +- sysutils/baloo-widgets/Makefile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index 3b2cacc461e4..49f72b4398a0 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -85,6 +85,8 @@ KDE_FRAMEWORKS_BRANCH?= stable # Current KDE applications. KDE_APPLICATIONS_VERSION?= 21.08.3 KDE_APPLICATIONS_SHLIB_VER?= 5.18.3 +# G as in KDE Gear, and as in "don't make the variable name longer than required" +KDE_APPLICATIONS_SHLIB_G_VER?= 21.8.3 KDE_APPLICATIONS_BRANCH?= stable # Extended KDE universe applications. diff --git a/astro/kosmindoormap/Makefile b/astro/kosmindoormap/Makefile index c729fdcc3a79..c4bb3c747dfb 100644 --- a/astro/kosmindoormap/Makefile +++ b/astro/kosmindoormap/Makefile @@ -16,6 +16,6 @@ USE_QT= core declarative gui network quick3d \ OPTIONS_DEFINE= DOCS # Override shared library version -KDE_APPLICATIONS_SHLIB_VER= 21.8.3 +KDE_APPLICATIONS_SHLIB_VER= ${KDE_APPLICATIONS_SHLIB_G_VER} .include <bsd.port.mk> diff --git a/sysutils/baloo-widgets/Makefile b/sysutils/baloo-widgets/Makefile index af766a422b23..d2ce9dfc2737 100644 --- a/sysutils/baloo-widgets/Makefile +++ b/sysutils/baloo-widgets/Makefile @@ -15,6 +15,6 @@ USE_QT= concurrent core dbus gui network testlib widgets xml \ USE_LDCONFIG= yes # Override shared library version -KDE_APPLICATIONS_SHLIB_VER= 21.8.3 +KDE_APPLICATIONS_SHLIB_VER= ${KDE_APPLICATIONS_SHLIB_G_VER} .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111050512.1A55CNFi057375>