Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 903532 - app-office/calligra depends on kde-frameworks/kdelibs4support (was: depends on kde-frameworks/kross for FEATURE_SCRIPTING)
Summary: app-office/calligra depends on kde-frameworks/kdelibs4support (was: depends o...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gentoo KDE team
URL: https://invent.kde.org/office/calligr...
Whiteboard:
Keywords: InOverlay
Depends on: 939296
Blocks: kf5-portingaids-removal
  Show dependency tree
 
Reported: 2023-03-29 12:10 UTC by Andreas Sturmlechner
Modified: 2024-09-09 18:31 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Andreas Sturmlechner gentoo-dev 2023-03-29 12:10:33 UTC
Feature is disabled as "unmaintained" by default, but the dependency is needlessly unconditional upstream and we enable BUILD_UNMAINTAINED in case of IUSE=calligra_features_stage, so requires patching.
Comment 1 Andreas Sturmlechner gentoo-dev 2023-03-29 12:45:07 UTC
kde-frameworks/kdelibs4support was ported away from in git master[/to be 3.4 if at all] already.

https://invent.kde.org/office/calligra/-/commit/139fe9de4ac3efcec552c3cadc29a2fb1ae6369a
https://invent.kde.org/office/calligra/-/commit/0b68f0629446562d65778993aec127b424d926a3
Comment 2 Larry the Git Cow gentoo-dev 2023-03-29 12:46:50 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67543f8bb06015c098c3adea74641e27d531045

commit b67543f8bb06015c098c3adea74641e27d531045
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2023-03-29 12:35:05 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2023-03-29 12:46:26 +0000

    app-office/calligra: Drop unused KF5Kross dep, use patchset
    
    See also:
    https://invent.kde.org/office/calligra/-/merge_requests/79
    
    Bug: https://bugs.gentoo.org/903532
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 app-office/calligra/Manifest                       |   1 +
 app-office/calligra/calligra-3.2.1-r5.ebuild       |  20 +-
 app-office/calligra/calligra-3.2.1-r6.ebuild       | 193 +++++++++
 .../files/calligra-3.1.89-no-arch-detection.patch  |  17 -
 .../files/calligra-3.2.1-clang-16-c++17.patch      | 359 -----------------
 .../calligra/files/calligra-3.2.1-cmake-3.16.patch |  86 ----
 .../files/calligra-3.2.1-cxx17-fixes.patch         | 443 ---------------------
 .../calligra-3.2.1-cxx17-for-poppler-22.patch      |  31 --
 .../calligra/files/calligra-3.2.1-imath-1.patch    |  30 --
 .../calligra/files/calligra-3.2.1-imath-2.patch    |  25 --
 .../calligra/files/calligra-3.2.1-openexr-3.patch  |  93 -----
 .../files/calligra-3.2.1-poppler-22.03.0-1.patch   |  73 ----
 .../files/calligra-3.2.1-poppler-22.03.0-2.patch   |  94 -----
 .../files/calligra-3.2.1-poppler-22.04.0.patch     |  25 --
 14 files changed, 205 insertions(+), 1285 deletions(-)
Comment 3 Larry the Git Cow gentoo-dev 2023-03-29 13:04:50 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8781d04c0e3966ff97d0e8c24b9d4d6b954c792

commit c8781d04c0e3966ff97d0e8c24b9d4d6b954c792
Author:     Sam James <sam@gentoo.org>
AuthorDate: 2023-03-29 12:35:08 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2023-03-29 12:56:45 +0000

    package.mask: Last rite kde-apps/kross-interpreters
    
    Only supports imminently-EOL ruby27, depends on obsolete QtScript instead
    of QML. Support for other languages was removed long ago, e.g. python support
    is stuck on python2-only. Kross itself is on the chopping block too.
    
    Bug: https://bugs.gentoo.org/810493
    Bug: https://bugs.gentoo.org/903532
    Signed-off-by: Sam James <sam@gentoo.org>

 profiles/base/package.use.mask | 4 ++++
 profiles/package.mask          | 8 ++++++++
 2 files changed, 12 insertions(+)
Comment 4 Larry the Git Cow gentoo-dev 2024-07-12 18:37:09 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/proj/kde.git/commit/?id=95d8cf16652994a8258108f24d1d3c5b739fc9f1

commit 95d8cf16652994a8258108f24d1d3c5b739fc9f1
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2024-07-12 18:23:34 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2024-07-12 18:33:26 +0000

    app-office/calligra: Port to KF6
    
    Upstream commits:
    b521108c75668d43e2f6d23c4a5cad0ab4ff6d0c (!)
    afb2049d785e7db374d574e675e8ceaad1b1d606
    0b68f0629446562d65778993aec127b424d926a3
    3073d00995f3fe74edd4f0f3f87bd2c8b58ed4ca
    /9dfa7b059e45884eb248c5fc0630b5a7fe43fd92
    38f04b4ce76a6420568d1be6cac7776f247f4390
    def2ca6a362701dd25a7950cb00ada669ddd1d9c
    9197e4b3a43b8d614772f43a31f92729f598e72a
    2821efdb5ad1f9aca8036636f7aff197de8a6da7
    ff32b06dfbbbadae5de3695de6f6914a62c2b62f
    adee19863d5b5a65a1ae8cccdb2d526d2a989e37
    
    Bug: https://bugs.gentoo.org/903532
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 app-office/calligra/calligra-9999.ebuild           | 118 ++++++++-------------
 .../calligra/files/calligra-3.2.1-okularpart.patch |  78 --------------
 app-office/calligra/metadata.xml                   |   1 -
 3 files changed, 46 insertions(+), 151 deletions(-)
Comment 5 Larry the Git Cow gentoo-dev 2024-09-09 18:31:59 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b6a44466702df5581551fd2d1626ce6844c0a0

commit f0b6a44466702df5581551fd2d1626ce6844c0a0
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2024-09-09 18:15:18 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2024-09-09 18:29:20 +0000

    app-office/calligra: add 4.0.1
    
    Closes: https://bugs.gentoo.org/939296
    Closes: https://bugs.gentoo.org/903532
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 app-office/calligra/Manifest              |   1 +
 app-office/calligra/calligra-4.0.1.ebuild | 153 ++++++++++++++++++++++++++++++
 app-office/calligra/metadata.xml          |   1 +
 3 files changed, 155 insertions(+)