From nobody Fri Nov 05 05:12:23 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BE7B8183C125; Fri, 5 Nov 2021 05:12:23 +0000 (UTC) (envelope-from git@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 4HlpXl4jnVz3tJj; Fri, 5 Nov 2021 05:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 81D1311E9B; Fri, 5 Nov 2021 05:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1A55CNjI057376; Fri, 5 Nov 2021 05:12:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A55CNFi057375; Fri, 5 Nov 2021 05:12:23 GMT (envelope-from git) Date: Fri, 5 Nov 2021 05:12:23 GMT Message-Id: <202111050512.1A55CNFi057375@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 2507b096e4fb - main - KDE: reduce diff on KDE Gear updates List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2507b096e4fb31d83420dc9fe3681b5b73537d20 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=2507b096e4fb31d83420dc9fe3681b5b73537d20 commit 2507b096e4fb31d83420dc9fe3681b5b73537d20 Author: Tobias C. Berner AuthorDate: 2021-11-04 19:15:42 +0000 Commit: Tobias C. Berner 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 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