From nobody Mon Mar 31 08:51:25 2025 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 4ZR4cF3j3gz5rgSZ; Mon, 31 Mar 2025 08:51:25 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZR4cF30qYz3S2b; Mon, 31 Mar 2025 08:51:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743411085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=owIm/icVq0NmGn+lGV0deMGDwQM5tCbqDboB7vcuVOQ=; b=gSJRGzL8mJm+VqctChBL2GSZ+DWyeysPnUNuYhtCy4Fu8l0YzqOcg7+tuylcgKD18Wnske 2ftXOEfU2Bu8ohVImuGcwFpk9r0ztXsMS4NEPtXWYHE9LBZwlZhtdNwLrtjta3tk0+GfdJ lAC6Ki39t2vCiXJJZXKXFAyqehDE22xS/4T1v+6Oojf46Llu7icpnjAIz5oMx6mcoTBjCl yzqB4tXFriGTRECUHm81SAJh2rq1iDD2bOOEVtCNWxy36JaD089BQy1Nbo5UL13Y5sUku/ ZKunJQMOEScTE0UTee781WJ12BeCn/ZHwo4Pa1LUKHEm1ZBZFgglG8WX0hiwGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743411085; a=rsa-sha256; cv=none; b=j7brnchLyNkTPqDclsQFXCaU/98RpGuwZDMFnL4fbT/xlJlxobo6NkeE+waMCOWmmCz5M4 j7nVwchNbdps2Pp5PgCvTFo399Xcc6jn2DbMpLp2aHBPvnpb9x+hmQ7Mqm15c/qPW/ED5V DNbDBUVhHDRC7sGbVZZN5yybOFPNlPSypbxrWk1WmWLmTgnU8hGShNOdNMGoG0h8KWLZMo S4wiEkXleHogEzpketbFhlMyl3JpeXCdnqDzLe/mUuFmeUhATiSpdRRA2GFpAn3cF35dwr QCAJAJr5L+ILNi+FqpY/ZheYArT5ICM8VTPQn7Wk44cgL8kKMdkcFRHuTuA8uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743411085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=owIm/icVq0NmGn+lGV0deMGDwQM5tCbqDboB7vcuVOQ=; b=DpHDoflzToNSB7Eo5cd/ZEnD57KFGa7l7UhlagL1ayh88OY3VM2y19bzoKtRIDEJy2eLUX tW0et+kYvdapL00kd6WeZmefjTB4Fj2f5rHwaWPJkKDpje8fKJaWFA5czqwyCFeleCQhKF mr/+XUjHqgw+ZieTBrwVpkO2tPiAOyaCqVzyBbQb9lDzPlcBMYNeEJu/I+vvXrkduN3f52 Sc5uS9SuDQFK7gUKyDYWFahSDEoYtW1pcP1xARTQA4FW6Lykh8sTBEUNweh6eJIebGF0jZ e2wcCPLLcgYStTw+hQo7oc/AHm1q89ezRgNhuH/tXnfV4X28/gWD94a+eYj/4g== 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 4ZR4cF2TMBzfY1; Mon, 31 Mar 2025 08:51:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52V8pPkR055460; Mon, 31 Mar 2025 08:51:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52V8pPLa055457; Mon, 31 Mar 2025 08:51:25 GMT (envelope-from git) Date: Mon, 31 Mar 2025 08:51:25 GMT Message-Id: <202503310851.52V8pPLa055457@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: 54c1612a2a7c - main - editors/calligra: fix abuse of KDE_APPLICATIONS_VERSION 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54c1612a2a7c76f1f1b52dda7fa6026ac8144954 Auto-Submitted: auto-generated The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=54c1612a2a7c76f1f1b52dda7fa6026ac8144954 commit 54c1612a2a7c76f1f1b52dda7fa6026ac8144954 Author: Max Brazhnikov AuthorDate: 2025-03-31 08:49:54 +0000 Commit: Max Brazhnikov CommitDate: 2025-03-31 08:50:47 +0000 editors/calligra: fix abuse of KDE_APPLICATIONS_VERSION while here, add more PLIST_SUB to reduce diff on update. --- editors/calligra/Makefile | 2 ++ editors/calligra/pkg-plist | 90 +++++++++++++++++++++++----------------------- 2 files changed, 47 insertions(+), 45 deletions(-) diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 3238a34f28fc..7937e378acbf 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -57,4 +57,6 @@ CMAKE_ON= RELEASE_BUILD # Performance increase according to README.PACKAGERS CMAKE_ARGS+= -DCMAKE_CXX_FLAGS="-DKDE_NO_DEBUG_OUTPUT" +PLIST_SUB= SHLIB_VER=39 + .include diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist index 4a6c4e599f0a..20ce4bb0dad7 100644 --- a/editors/calligra/pkg-plist +++ b/editors/calligra/pkg-plist @@ -10,94 +10,94 @@ etc/xdg/calligrawordsrc etc/xdg/karbonrc lib/libRtfReader.so lib/libRtfReader.so.%%KDE_APPLICATIONS_VERSION%% -lib/libRtfReader.so.39 +lib/libRtfReader.so.%%SHLIB_VER%% lib/libautocorrection.so lib/libautocorrection.so.%%KDE_APPLICATIONS_VERSION%% -lib/libautocorrection.so.39 +lib/libautocorrection.so.%%SHLIB_VER%% lib/libbasicflakes.so lib/libbasicflakes.so.%%KDE_APPLICATIONS_VERSION%% -lib/libbasicflakes.so.39 +lib/libbasicflakes.so.%%SHLIB_VER%% lib/libcalligrasheetscore.so lib/libcalligrasheetscore.so.%%KDE_APPLICATIONS_VERSION%% -lib/libcalligrasheetscore.so.39 +lib/libcalligrasheetscore.so.%%SHLIB_VER%% lib/libcalligrasheetsengine.so lib/libcalligrasheetsengine.so.%%KDE_APPLICATIONS_VERSION%% -lib/libcalligrasheetsengine.so.39 +lib/libcalligrasheetsengine.so.%%SHLIB_VER%% lib/libcalligrasheetspartlib.so lib/libcalligrasheetspartlib.so.%%KDE_APPLICATIONS_VERSION%% -lib/libcalligrasheetspartlib.so.39 +lib/libcalligrasheetspartlib.so.%%SHLIB_VER%% lib/libcalligrasheetsui.so lib/libcalligrasheetsui.so.%%KDE_APPLICATIONS_VERSION%% -lib/libcalligrasheetsui.so.39 +lib/libcalligrasheetsui.so.%%SHLIB_VER%% lib/libcalligrastageprivate.so lib/libcalligrastageprivate.so.%%KDE_APPLICATIONS_VERSION%% -lib/libcalligrastageprivate.so.39 +lib/libcalligrastageprivate.so.%%SHLIB_VER%% lib/libflake.so lib/libflake.so.%%KDE_APPLICATIONS_VERSION%% -lib/libflake.so.39 +lib/libflake.so.%%SHLIB_VER%% lib/libkarboncommon.so lib/libkarboncommon.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkarboncommon.so.39 +lib/libkarboncommon.so.%%SHLIB_VER%% lib/libkarbonui.so lib/libkarbonui.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkarbonui.so.39 +lib/libkarbonui.so.%%SHLIB_VER%% lib/libkoformula.so lib/libkoformula.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkoformula.so.39 +lib/libkoformula.so.%%SHLIB_VER%% lib/libkomain.so lib/libkomain.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkomain.so.39 +lib/libkomain.so.%%SHLIB_VER%% lib/libkomsooxml.so lib/libkomsooxml.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkomsooxml.so.39 +lib/libkomsooxml.so.%%SHLIB_VER%% lib/libkoodf.so lib/libkoodf.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkoodf.so.39 +lib/libkoodf.so.%%SHLIB_VER%% lib/libkoodf2.so lib/libkoodf2.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkoodf2.so.39 +lib/libkoodf2.so.%%SHLIB_VER%% lib/libkoodfreader.so lib/libkoodfreader.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkoodfreader.so.39 +lib/libkoodfreader.so.%%SHLIB_VER%% lib/libkookularGenerator_odp.so lib/libkookularGenerator_odp.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkookularGenerator_odp.so.39 +lib/libkookularGenerator_odp.so.%%SHLIB_VER%% lib/libkookularGenerator_odt.so lib/libkookularGenerator_odt.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkookularGenerator_odt.so.39 +lib/libkookularGenerator_odt.so.%%SHLIB_VER%% lib/libkopageapp.so lib/libkopageapp.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkopageapp.so.39 +lib/libkopageapp.so.%%SHLIB_VER%% lib/libkoplugin.so lib/libkoplugin.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkoplugin.so.39 +lib/libkoplugin.so.%%SHLIB_VER%% lib/libkostore.so lib/libkostore.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkostore.so.39 +lib/libkostore.so.%%SHLIB_VER%% lib/libkotext.so lib/libkotext.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkotext.so.39 +lib/libkotext.so.%%SHLIB_VER%% lib/libkotextlayout.so lib/libkotextlayout.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkotextlayout.so.39 +lib/libkotextlayout.so.%%SHLIB_VER%% lib/libkovectorimage.so lib/libkovectorimage.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkovectorimage.so.39 +lib/libkovectorimage.so.%%SHLIB_VER%% lib/libkowidgets.so lib/libkowidgets.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkowidgets.so.39 +lib/libkowidgets.so.%%SHLIB_VER%% lib/libkowidgetutils.so lib/libkowidgetutils.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkowidgetutils.so.39 +lib/libkowidgetutils.so.%%SHLIB_VER%% lib/libkundo2.so lib/libkundo2.so.%%KDE_APPLICATIONS_VERSION%% -lib/libkundo2.so.39 +lib/libkundo2.so.%%SHLIB_VER%% lib/libpigmentcms.so lib/libpigmentcms.so.%%KDE_APPLICATIONS_VERSION%% -lib/libpigmentcms.so.39 +lib/libpigmentcms.so.%%SHLIB_VER%% lib/libwordsprivate.so lib/libwordsprivate.so.%%KDE_APPLICATIONS_VERSION%% -lib/libwordsprivate.so.39 +lib/libwordsprivate.so.%%SHLIB_VER%% %%QT_PLUGINDIR%%/calligra/dockers/calligra_docker_defaults.so %%QT_PLUGINDIR%%/calligra/dockers/calligra_docker_stencils.so %%QT_PLUGINDIR%%/calligra/formatfilters/calligra_filter_applixspread2kspread.so @@ -278,7 +278,7 @@ share/applications/org.kde.calligrawords_ascii.desktop %%DATADIR%%/cursors/cursor_shear.png %%DATADIR%%/cursors/zoom_in_cursor.png %%DATADIR%%/cursors/zoom_out_cursor.png -%%DATADIR%%/icons/hicolor/%%KDE_APPLICATIONS_VERSION_SHORT%%x%%KDE_APPLICATIONS_VERSION_SHORT%%/actions/insert-page-break.png +%%DATADIR%%/icons/hicolor/24x24/actions/insert-page-break.png %%DATADIR%%/icons/hicolor/16x16/actions/abs.png %%DATADIR%%/icons/hicolor/16x16/actions/animation-stage.png %%DATADIR%%/icons/hicolor/16x16/actions/bevelled.png @@ -880,9 +880,9 @@ share/applications/org.kde.calligrawords_ascii.desktop %%DATADIR%%/stencils/Central_Data_Processing/Organizer_Rack_2U.desktop %%DATADIR%%/stencils/Central_Data_Processing/Organizer_Rack_2U.odg %%DATADIR%%/stencils/Central_Data_Processing/Organizer_Rack_2U.png -%%DATADIR%%/stencils/Central_Data_Processing/Path_Painel_%%KDE_APPLICATIONS_VERSION_SHORT%%P.desktop -%%DATADIR%%/stencils/Central_Data_Processing/Path_Painel_%%KDE_APPLICATIONS_VERSION_SHORT%%P.odg -%%DATADIR%%/stencils/Central_Data_Processing/Path_Painel_%%KDE_APPLICATIONS_VERSION_SHORT%%P.png +%%DATADIR%%/stencils/Central_Data_Processing/Path_Painel_24P.desktop +%%DATADIR%%/stencils/Central_Data_Processing/Path_Painel_24P.odg +%%DATADIR%%/stencils/Central_Data_Processing/Path_Painel_24P.png %%DATADIR%%/stencils/Central_Data_Processing/Router.desktop %%DATADIR%%/stencils/Central_Data_Processing/Router.odg %%DATADIR%%/stencils/Central_Data_Processing/Router.png @@ -928,9 +928,9 @@ share/applications/org.kde.calligrawords_ascii.desktop %%DATADIR%%/stencils/Central_Data_Processing/Storage_Rack_3U_SAN.desktop %%DATADIR%%/stencils/Central_Data_Processing/Storage_Rack_3U_SAN.odg %%DATADIR%%/stencils/Central_Data_Processing/Storage_Rack_3U_SAN.png -%%DATADIR%%/stencils/Central_Data_Processing/Switch_Rack_%%KDE_APPLICATIONS_VERSION_SHORT%%P.desktop -%%DATADIR%%/stencils/Central_Data_Processing/Switch_Rack_%%KDE_APPLICATIONS_VERSION_SHORT%%P.odg -%%DATADIR%%/stencils/Central_Data_Processing/Switch_Rack_%%KDE_APPLICATIONS_VERSION_SHORT%%P.png +%%DATADIR%%/stencils/Central_Data_Processing/Switch_Rack_24P.desktop +%%DATADIR%%/stencils/Central_Data_Processing/Switch_Rack_24P.odg +%%DATADIR%%/stencils/Central_Data_Processing/Switch_Rack_24P.png %%DATADIR%%/stencils/Central_Data_Processing/Switch_Rack_16P.desktop %%DATADIR%%/stencils/Central_Data_Processing/Switch_Rack_16P.odg %%DATADIR%%/stencils/Central_Data_Processing/Switch_Rack_16P.png @@ -1891,9 +1891,9 @@ share/applications/org.kde.calligrawords_ascii.desktop %%DATADIR%%/stencils/Cisco/metro1500.desktop %%DATADIR%%/stencils/Cisco/metro1500.odg %%DATADIR%%/stencils/Cisco/metro1500.png -%%DATADIR%%/stencils/Cisco/mgx8%%KDE_APPLICATIONS_VERSION_SHORT%%0.desktop -%%DATADIR%%/stencils/Cisco/mgx8%%KDE_APPLICATIONS_VERSION_SHORT%%0.odg -%%DATADIR%%/stencils/Cisco/mgx8%%KDE_APPLICATIONS_VERSION_SHORT%%0.png +%%DATADIR%%/stencils/Cisco/mgx8240.desktop +%%DATADIR%%/stencils/Cisco/mgx8240.odg +%%DATADIR%%/stencils/Cisco/mgx8240.png %%DATADIR%%/stencils/Cisco/mgx8220.desktop %%DATADIR%%/stencils/Cisco/mgx8220.odg %%DATADIR%%/stencils/Cisco/mgx8220.png @@ -5098,7 +5098,7 @@ share/doc/HTML/sv/stage/textmenu1.png share/doc/HTML/sv/stage/textmenu2.png share/doc/HTML/sv/stage/toolsmenu01.png share/doc/HTML/sv/stage/tts.png -share/doc/HTML/sv/stage/tut%%KDE_APPLICATIONS_VERSION_SHORT%%.png +share/doc/HTML/sv/stage/tut24.png share/doc/HTML/sv/stage/tut01.png share/doc/HTML/sv/stage/tut02.png share/doc/HTML/sv/stage/tut03.png @@ -5188,10 +5188,10 @@ share/doc/HTML/uk/stage/tut21.png share/doc/HTML/uk/stage/tut25.png share/doc/HTML/uk/stage/tut26.png share/doc/HTML/uk/stage/tutorial.docbook -share/icons/hicolor/10%%KDE_APPLICATIONS_VERSION_SHORT%%x10%%KDE_APPLICATIONS_VERSION_SHORT%%/apps/calligrakarbon.png -share/icons/hicolor/10%%KDE_APPLICATIONS_VERSION_SHORT%%x10%%KDE_APPLICATIONS_VERSION_SHORT%%/apps/calligrasheets.png -share/icons/hicolor/10%%KDE_APPLICATIONS_VERSION_SHORT%%x10%%KDE_APPLICATIONS_VERSION_SHORT%%/apps/calligrastage.png -share/icons/hicolor/10%%KDE_APPLICATIONS_VERSION_SHORT%%x10%%KDE_APPLICATIONS_VERSION_SHORT%%/apps/calligrawords.png +share/icons/hicolor/1024x1024/apps/calligrakarbon.png +share/icons/hicolor/1024x1024/apps/calligrasheets.png +share/icons/hicolor/1024x1024/apps/calligrastage.png +share/icons/hicolor/1024x1024/apps/calligrawords.png share/icons/hicolor/128x128/apps/calligrakarbon.png share/icons/hicolor/128x128/apps/calligrasheets.png share/icons/hicolor/128x128/apps/calligrastage.png