Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 947339 - app-office/libalkimia-9999::kde fails to apply patch to libalkimia.pc.in
Summary: app-office/libalkimia-9999::kde fails to apply patch to libalkimia.pc.in
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:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2025-01-02 00:29 UTC by Jack
Modified: 2025-01-12 15:50 UTC (History)
1 user (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 Jack 2025-01-02 00:29:05 UTC
* Applying libalkimia-8.1.0-cmake.patch ...
patching file src/CMakeLists.txt
Hunk #1 succeeded at 241 with fuzz 2 (offset 94 lines).
patching file src/libalkimia.pc.in
Hunk #1 FAILED at 4.

It looks like the file was changed upstream, but I'm not sure if the patch is now not needed, or just needs to be adjusted.

libalkimia.pc.in:
# pkg-config configuration for libalkimia
# For information about the syntax, see pkg-config(1)

# General installation directories
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@
libdir=@CMAKE_INSTALL_LIBDIR@
includedir=@INCLUDE_INSTALL_DIR@

# Human-readable name
Name: Alkimia
# Human-readable description
Description: A library for financial data handling
Version: @ALKIMIA_LIB_VERSION@

Libs: -lalkimia@PC_TARGET_SUFFIX@
Libs.private: -l@PC_LIB@ -l@PC_TARGET_QTPREFIX@Core -l@PC_TARGET_QTPREFIX@DBus -lstdc++
Cflags: -I${includedir} -I@MP_INCLUDE_DIR@


libalkimia.pc.in.rej:
  --- src/libalkimia.pc.in
+++ src/libalkimia.pc.in
@@ -4,8 +4,8 @@
 # General installation directories
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@KDE4_LIB_DIR@
-includedir=@INCLUDE_INSTALL_DIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=${prefix}/@INCLUDE_INSTALL_DIR@
 
 # Human-readable name
 Name: Alkimia

Let me know if you still need the full build.log or any other info.
Comment 1 Jack 2025-01-02 00:35:24 UTC
I realize this package still uses Qt5.  The Qt6 migration is underway, but this package is tied to KMyMoney, which has also started the Qt6 port.  The latter or both packages have new releases planned "any time now" before they complete the migration and drop Qt5 support.
Comment 2 Larry the Git Cow gentoo-dev 2025-01-02 19:43:50 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/proj/kde.git/commit/?id=1ff44296baaa36da67ec82da907a3878e370ccbd

commit 1ff44296baaa36da67ec82da907a3878e370ccbd
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2025-01-02 19:35:37 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2025-01-02 19:40:14 +0000

    app-office/libalkimia: Re-org cmake- and pkgconfig patches, rebase
    
    Closes: https://bugs.gentoo.org/947339
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 .../libalkimia/files/libalkimia-8.1.0-cmake.patch  | 54 ----------------------
 .../libalkimia/files/libalkimia-8.1.2-cmake.patch  | 23 +++++++++
 .../files/libalkimia-8.1.2-pkgconfig.patch         | 25 ++++++++++
 .../files/libalkimia-8.1.92-pkgconfig.patch        | 25 ++++++++++
 app-office/libalkimia/libalkimia-8.9999.ebuild     |  2 +-
 app-office/libalkimia/libalkimia-9999.ebuild       |  5 +-
 6 files changed, 78 insertions(+), 56 deletions(-)
Comment 3 Larry the Git Cow gentoo-dev 2025-01-12 15:50:52 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/proj/kde.git/commit/?id=2ac1a3f2d2d9cae3cc5808bd52ee505681f33ebe

commit 2ac1a3f2d2d9cae3cc5808bd52ee505681f33ebe
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2025-01-12 15:15:50 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2025-01-12 15:50:40 +0000

    app-office/kmymoney: Port to KF6
    
    It's in git master, although pending further work before officially supported
    by some future release.
    
    See also:
    https://invent.kde.org/office/kmymoney/-/issues/49
    
    Upstream commits:
    27106a64bf2233ad83c28f11cd562b062a792e24
    fe9c9c3748286a73e3e83f274ecb9ea4b1375757
    
    Bug: https://bugs.gentoo.org/947339
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 app-office/kmymoney/kmymoney-9999.ebuild | 126 +++++++++++++++----------------
 1 file changed, 63 insertions(+), 63 deletions(-)

https://gitweb.gentoo.org/proj/kde.git/commit/?id=06f738244fdf36d8b5b02dd0e9e03453d34eedbc

commit 06f738244fdf36d8b5b02dd0e9e03453d34eedbc
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2025-01-12 12:11:57 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2025-01-12 15:34:47 +0000

    app-office/libalkimia: Port to KF6
    
    It's in git master.
    
    Even though slotting appears to be a possibility (after splitting knsrcfiles
    and translations into a ${PN}-common package), there is only a single revdep
    so the effort for side-by-side installation appears to be a waste of energy.
    
    See also:
    https://invent.kde.org/office/alkimia/-/merge_requests/19
    
    Upstream commits:
    
    c74f5ddb024979bdb4d1a4d2c320179bb47cc8da
    0c07fd803d77d917057c80832fafd97001f094d9
    227cf8303bb062cd1e5f1a4dbc7680af212be738
    4afdcdc4b2f7340bb14fd76e8749040ee229ae56
    e43e94a3fd67059e5f2c1ec7ef5ba43201cb8d6f
    d11b9943e5fbdcd139b77d8099576ef68cf9fb31
    
    Bug: https://bugs.gentoo.org/947339
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 app-office/libalkimia/libalkimia-9999.ebuild | 47 ++++++++++++++--------------
 1 file changed, 24 insertions(+), 23 deletions(-)