[libalkimia]Update libalkimia to 8.1.72 (#36528)

* Update libalkimia to 8.1.72

* Update libalkimia to 8.1.72

---------

Co-authored-by: Ludovic Delabre <ldelabre54@free.fr>
This commit is contained in:
Ludovic Delabre 2024-02-06 21:40:48 +01:00 committed by GitHub
parent 81052aa9b7
commit e6c4f478e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 10 additions and 100 deletions

View File

@ -1,21 +0,0 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 643ffcf3d7b4ce59285343f92a1407927c111881..382d3c6ed244e24dec9f144c02e0c3459e8369a9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -156,10 +156,12 @@ install(
generate_export_header(alkimia BASE_NAME alk EXPORT_FILE_NAME alkimia/alk_export.h)
-if(WIN32)
- set_target_properties(alkimia PROPERTIES SUFFIX "-${ALKIMIA_LIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-else()
- set_target_properties(alkimia PROPERTIES VERSION ${ALKIMIA_LIB_VERSION} SOVERSION ${ALKIMIA_LIB_SOVERSION})
+if(BUILD_SHARED_LIBS)
+ if(WIN32)
+ set_target_properties(alkimia PROPERTIES SUFFIX "-${ALKIMIA_LIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ else()
+ set_target_properties(alkimia PROPERTIES VERSION ${ALKIMIA_LIB_VERSION} SOVERSION ${ALKIMIA_LIB_SOVERSION})
+ endif()
endif()
set_target_properties(alkimia PROPERTIES OUTPUT_NAME alkimia${ALKIMIA_LIB_SUFFIX})
set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX})

View File

@ -1,70 +0,0 @@
diff --git a/qml/CMakeLists.txt b/qml/CMakeLists.txt
index f74449b591bafd4ad0c41627139a08e29028ab21..a317307a438542e4cf26d50643057b5e9b649594 100644
--- a/qml/CMakeLists.txt
+++ b/qml/CMakeLists.txt
@@ -22,7 +22,7 @@ else()
endif()
configure_file(qmldir ${IMPORTS_DIR}/qmldir)
-add_library(qmlalkimia SHARED qmlalkimiaplugin.cpp)
+add_library(qmlalkimia qmlalkimiaplugin.cpp)
target_link_libraries(qmlalkimia ${LIBS} alkimia)
install(TARGETS qmlalkimia
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e57c94adf6c3785e5c646c7c95b586392737d686..b467849c7ff25d2ce424b30591cfe9a1e9357a46 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -103,7 +103,7 @@ endforeach()
add_definitions(-DKNSRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
ki18n_wrap_ui(alkimia_LIB_SRCS ${alkimia_UI} )
-add_library(alkimia SHARED ${alkimia_LIB_SRCS} ${alkimia_INTERNAL_SRCS} ${alkimia_LIB_HEADERS} ${alkimia_LIB_PRIVATE_HEADERS})
+add_library(alkimia ${alkimia_LIB_SRCS} ${alkimia_INTERNAL_SRCS} ${alkimia_LIB_HEADERS} ${alkimia_LIB_PRIVATE_HEADERS})
kde_target_enable_exceptions(alkimia PUBLIC)
if(BUILD_QT4)
@@ -164,7 +164,13 @@ endif()
set_target_properties(alkimia PROPERTIES OUTPUT_NAME alkimia${ALKIMIA_LIB_SUFFIX})
set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX})
-install(TARGETS alkimia
+if(${BUILD_SHARED_LIBS})
+ set(alkimia_export_targets alkimia)
+else()
+ set(alkimia_export_targets alkimia alkimia-internal)
+endif()
+
+install(TARGETS ${alkimia_export_targets}
EXPORT alkimiaTargets
${INSTALL_TARGETS_DEFAULT_ARGS}
)
@@ -228,7 +234,7 @@ configure_package_config_file(
########### install files ###############
-export(TARGETS alkimia
+export(TARGETS ${alkimia_export_targets}
FILE "${CMAKE_CURRENT_BINARY_DIR}/LibAlkimia${ALKIMIA_PATH_SUFFIX}Targets.cmake"
NAMESPACE Alkimia::
)
diff --git a/src/LibAlkimiaConfig.cmake.in b/src/LibAlkimiaConfig.cmake.in
index a8893c6fe347ce2d2fe1e0a2854a206e0e41901c..8dcfdf8c13f4306a349052d1c4194e65725a50b4 100644
--- a/src/LibAlkimiaConfig.cmake.in
+++ b/src/LibAlkimiaConfig.cmake.in
@@ -12,6 +12,15 @@ else()
endif()
find_dependency(@MP_CMAKE_MODULE@)
+if (NOT @BUILD_SHARED_LIBS@)
+ find_dependency(KF5Completion)
+ find_dependency(KF5I18n)
+ find_dependency(KF5NewStuff)
+ find_dependency(KF5IconThemes)
+ find_dependency(KF5TextWidgets)
+ find_dependency(KF5KIO)
+endif()
+
include("${CMAKE_CURRENT_LIST_DIR}/LibAlkimia@ALKIMIA_PATH_SUFFIX@Targets.cmake")
set_and_check(LIBALKIMIA_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")

View File

@ -1,12 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/alkimia
REF 595186bee8409f30e5db091fffa245fc53ad92e8
SHA512 509082e22bc0a2ce0586e1167df14fd42ac85321315c1ee2914f60e695d1e2e8beae4fc93d16d0053edb520fc391a3dbe30777638285b295e761ad70512688ca
REF "v${VERSION}"
SHA512 ec7867e439178d6ed104c388c60bfe0bad223a9e35f4d9e05f2a7b3b2b2badac74b9a872f7922f58bb2b7a1127da742c430eff7caca71388085abdd1ad12cb1d
HEAD_REF master
PATCHES
fix_explicit_shared_lib.diff
dll_names.diff # https://invent.kde.org/office/alkimia/-/commit/0ff901025a747ab31ab7efba9f8899b06774f60a
)
# Prevent KDEClangFormat from writing to source effectively blocking parallel configure

View File

@ -1,7 +1,6 @@
{
"name": "libalkimia",
"version": "8.1.70",
"port-version": 2,
"version": "8.1.72",
"description": "Common functionality for finance applications.",
"homepage": "https://community.kde.org/Alkimia/libalkimia",
"license": "LGPL-2.1-or-later",

View File

@ -4109,8 +4109,8 @@
"port-version": 9
},
"libalkimia": {
"baseline": "8.1.70",
"port-version": 2
"baseline": "8.1.72",
"port-version": 0
},
"libao": {
"baseline": "1.2.2",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ce16d689569ac3f63e5c46e9384f7e54d203bfe1",
"version": "8.1.72",
"port-version": 0
},
{
"git-tree": "7f9b0ce11bf52ea4e33323b2587234a6b40f7d94",
"version": "8.1.70",