Next Qt plumber update. Switch KMyMoney and libassuan from Qt5 to Qt6.
diff --git a/productivity/kmymoney/Makefile b/productivity/kmymoney/Makefile
index d3f16c2361c..6163e358af5 100644
--- a/productivity/kmymoney/Makefile
+++ b/productivity/kmymoney/Makefile
@@ -1,51 +1,63 @@
USE_WXNEEDED = Yes
-COMMENT = accounting for KDE 5
+COMMENT = personal finance manager
-V = 5.1.3
+V = 5.2.0
DISTNAME = kmymoney-${V}
-REVISION = 10
CATEGORIES = productivity x11
HOMEPAGE = https://kmymoney.org
-SHARED_LIBS += kmm_csvimportercore 0.0 # 5.1.2
-SHARED_LIBS += kmm_icons 0.0 # 5.1.2
-SHARED_LIBS += kmm_menus 0.0 # 5.1.2
-SHARED_LIBS += kmm_models 0.0 # 5.1.2
-SHARED_LIBS += kmm_mymoney 1.0 # 5.1.2
-SHARED_LIBS += kmm_payeeidentifier 0.0 # 5.1.0
-SHARED_LIBS += kmm_plugin 0.0 # 5.1.2
-SHARED_LIBS += kmm_printer 0.0 # 5.1.2
-SHARED_LIBS += kmm_settings 0.0 # 5.1.2
-SHARED_LIBS += kmm_widgets 1.0 # 5.1.2
+SHARED_LIBS += kmm_csvimportercore 1.0 # 5.2.0
+SHARED_LIBS += kmm_icons 1.0 # 5.2.0
+SHARED_LIBS += kmm_menus 1.0 # 5.2.0
+SHARED_LIBS += kmm_models 1.0 # 5.2.0
+SHARED_LIBS += kmm_mymoney 2.0 # 5.2.0
+SHARED_LIBS += kmm_payeeidentifier 1.0 # 5.1.0
+SHARED_LIBS += kmm_plugin 1.0 # 5.2.0
+SHARED_LIBS += kmm_printer 1.0 # 5.2.0
+SHARED_LIBS += kmm_settings 1.0 # 5.2.0
+SHARED_LIBS += kmm_widgets 2.0 # 5.2.0
+
+SHARED_LIBS += kmm_base_dialogs 0.0 # 0.0
+SHARED_LIBS += kmm_base_widgets 0.0 # 0.0
+SHARED_LIBS += kmm_extended_dialogs 0.0 # 0.0
+SHARED_LIBS += kmm_gpgfile 0.0 # 0.0
+SHARED_LIBS += kmm_keychain 0.0 # 0.0
+SHARED_LIBS += kmm_menuactionexchanger 0.0 # 0.0
+SHARED_LIBS += kmm_selections 0.0 # 0.0
+SHARED_LIBS += kmm_templates 0.0 # 0.0
+SHARED_LIBS += kmm_webconnect 0.0 # 0.0
+SHARED_LIBS += kmm_wizard 0.0 # 0.0
+SHARED_LIBS += kmm_yesno 0.0 # 0.0
+SHARED_LIBS += onlinetask_interfaces 0.0 # 0.0
MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
# GPLv2+
PERMIT_PACKAGE = Yes
-SITES = ${SITE_KDE:=stable/kmymoney/${V}/src/}
-
-WANTLIB += ${COMPILER_LIBCXX} KChart KF5Activities KF5Archive
-WANTLIB += KF5Auth KF5AuthCore KF5Bookmarks KF5Codecs KF5Completion
-WANTLIB += KF5ConfigCore KF5ConfigGui KF5ConfigWidgets KF5CoreAddons
-WANTLIB += KF5Holidays KF5I18n KF5IconThemes KF5ItemModels KF5ItemViews
-WANTLIB += KF5JobWidgets KF5KCMUtils KF5KIOCore KF5KIOFileWidgets
-WANTLIB += KF5KIOGui KF5KIONTLM KF5KIOWidgets KF5Notifications
-WANTLIB += KF5Service KF5Solid KF5SonnetUi KF5TextWidgets KF5Wallet
-WANTLIB += KF5WidgetsAddons KF5WindowSystem KF5XmlGui Qt5Concurrent
-WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Positioning Qt5PrintSupport
-WANTLIB += Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickWidgets Qt5Sql
-WANTLIB += Qt5WebChannel Qt5WebEngineCore Qt5WebEngineWidgets
-WANTLIB += Qt5Widgets Qt5Xml X11 alkimia5 aqbanking assuan c db
-WANTLIB += db_cxx gmp gpgme gpgmepp gwengui-cpp gwengui-qt5 gwenhywfar
-WANTLIB += ical icalss icalvcal icui18n icuuc m ofx ${MODPY_WANTLIB}
-WANTLIB += sqlcipher
+SITES = ${SITE_KDE:=stable/kmymoney/${V}/}
+EXTRACT_SUFX = .tar.xz
+
+WANTLIB += ${COMPILER_LIBCXX} GL KChart6 KF6Archive KF6Bookmarks
+WANTLIB += KF6Codecs KF6ColorScheme KF6Completion KF6ConfigCore
+WANTLIB += KF6ConfigGui KF6ConfigWidgets KF6CoreAddons KF6GuiAddons
+WANTLIB += KF6Holidays KF6I18n KF6ItemModels KF6ItemViews KF6JobWidgets
+WANTLIB += KF6KCMUtils KF6KCMUtilsCore KF6KCMUtilsQuick KF6KIOCore
+WANTLIB += KF6KIOFileWidgets KF6KIOGui KF6KIOWidgets KF6Notifications
+WANTLIB += KF6Service KF6Solid KF6SonnetUi KF6TextWidgets KF6WidgetsAddons
+WANTLIB += KF6XmlGui Qt6Concurrent Qt6Core Qt6Core5Compat Qt6DBus
+WANTLIB += Qt6Gui Qt6Network Qt6OpenGL Qt6Positioning Qt6PrintSupport
+WANTLIB += Qt6Qml Qt6QmlMeta Qt6QmlModels Qt6QmlWorkerScript Qt6Quick
+WANTLIB += Qt6Sql Qt6WebChannel Qt6WebEngineCore Qt6WebEngineWidgets
+WANTLIB += Qt6Widgets Qt6Xml alkimia6 assuan c db db_cxx gmp gpgme
+WANTLIB += gpgmepp ical icalss icalvcal icudata icui18n icuuc
+WANTLIB += m ofx ${MODPY_WANTLIB} qgpgmeqt6 sqlcipher
MODULES = lang/python \
- devel/kf5
+ devel/kf6
CONFIGURE_STYLE = cmake
@@ -53,7 +65,7 @@ BUILD_DEPENDS = devel/boost \
devel/gettext,-tools \
misc/shared-mime-info \
textproc/libical,-glib \
- x11/qt5/qtsensors
+ x11/qt6/qtsensors
RUN_DEPENDS = devel/desktop-file-utils \
misc/p5-Finance-Quote \
@@ -65,53 +77,52 @@ RUN_DEPENDS = devel/desktop-file-utils \
www/woob \
x11/gtk+4,-guic
-LIB_DEPENDS = databases/sqlcipher \
+LIB_DEPENDS = databases/db/v4 \
+ databases/sqlcipher \
devel/gmp \
- devel/gwenhywfar \
- devel/kf5/kactivities \
- devel/kf5/karchive \
- devel/kf5/kauth \
- devel/kf5/kbookmarks \
- devel/kf5/kcmutils \
- devel/kf5/kcodecs \
- devel/kf5/kcompletion \
- devel/kf5/kconfig \
- devel/kf5/kconfigwidgets \
- devel/kf5/kcoreaddons \
- devel/kf5/kholidays \
- devel/kf5/ki18n \
- devel/kf5/kiconthemes \
- devel/kf5/kio \
- devel/kf5/kitemmodels \
- devel/kf5/kitemviews \
- devel/kf5/kjobwidgets \
- devel/kf5/knotifications \
- devel/kf5/kservice \
- devel/kf5/ktextwidgets \
- devel/kf5/kwallet \
- devel/kf5/kwidgetsaddons \
- devel/kf5/kwindowsystem \
- devel/kf5/kxmlgui \
- devel/kf5/solid \
- devel/kf5/sonnet \
+ devel/kf6/karchive \
+ devel/kf6/kbookmarks \
+ devel/kf6/kcmutils \
+ devel/kf6/kcodecs \
+ devel/kf6/kcolorscheme \
+ devel/kf6/kcompletion \
+ devel/kf6/kconfig \
+ devel/kf6/kconfigwidgets \
+ devel/kf6/kcoreaddons \
+ devel/kf6/kguiaddons \
+ devel/kf6/kholidays \
+ devel/kf6/ki18n \
+ devel/kf6/kio \
+ devel/kf6/kitemmodels \
+ devel/kf6/kitemviews \
+ devel/kf6/kjobwidgets \
+ devel/kf6/knotifications \
+ devel/kf6/kservice \
+ devel/kf6/ktextwidgets \
+ devel/kf6/kwidgetsaddons \
+ devel/kf6/kxmlgui \
+ devel/kf6/solid \
+ devel/kf6/sonnet \
devel/libofx \
- graphics/kdiagram \
- productivity/aqbanking \
- productivity/libalkimia>=8.0 \
+ graphics/kdiagram-qt6 \
+ productivity/libalkimia>=8.2 \
security/gpgme,-qt \
security/libassuan \
textproc/icu4c \
textproc/libical \
- x11/qt5/qtdeclarative \
- x11/qt5/qtlocation \
- x11/qt5/qtwebchannel \
- x11/qt5/qtwebengine
+ x11/qt6/qt5compat \
+ x11/qt6/qtdeclarative \
+ x11/qt6/qtpositioning \
+ x11/qt6/qtwebchannel \
+ x11/qt6/qtwebengine
CONFIGURE_ARGS = -DUSE_QT_DESIGNER=OFF \
- -DENABLE_WEBENGINE=ON \
- -DOPT_KF5_COMPONENTS=OFF \
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+DEBUG_PACKAGES = ${BUILD_PACKAGES}
+
+CONFIGURE_ARGS += -DBUILD_WITH_QT6=ON
+
TEST_IS_INTERACTIVE = X11
.include <bsd.port.mk>
diff --git a/productivity/kmymoney/distinfo b/productivity/kmymoney/distinfo
index eaa249e5981..d291fb251e5 100644
--- a/productivity/kmymoney/distinfo
+++ b/productivity/kmymoney/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kmymoney-5.1.3.tar.xz) = OTi4B4tzkboy4Su0I5di+uE0aDoMLsGnUQXDAso+Xj8=
-SIZE (kmymoney-5.1.3.tar.xz) = 12647372
+SHA256 (kmymoney-5.2.0.tar.xz) = 8wiwoil/IvQ9m75GtMfcaqwIvVlEVOY1qETQar2k0zw=
+SIZE (kmymoney-5.2.0.tar.xz) = 11132112
diff --git a/productivity/kmymoney/patches/patch-CMakeLists_txt b/productivity/kmymoney/patches/patch-CMakeLists_txt
index dfffae93e5f..077e10e1293 100644
--- a/productivity/kmymoney/patches/patch-CMakeLists_txt
+++ b/productivity/kmymoney/patches/patch-CMakeLists_txt
@@ -1,50 +1,31 @@
-- Remove linker, compiler flags
-- fix libofx detection
-
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -114,7 +114,7 @@ if (PkgConfig_FOUND)
- endif()
-
- find_package(Qt5 5.6 REQUIRED COMPONENTS
-- Core DBus Widgets Svg Xml Test PrintSupport)
-+ Core DBus Widgets Svg Xml Test PrintSupport WebChannel Positioning Sensors Quick)
- find_package(Qt5 5.6 OPTIONAL_COMPONENTS
- Sql Concurrent QuickWidgets WebEngineWidgets WebKitWidgets)
-
-@@ -267,7 +267,7 @@ if(ENABLE_OFXIMPORTER)
- set(PATH_TO_LIBOFX_HEADER "${PATH_TO_LIBOFX_HEADER}/libofx/libofx.h")
- unset(LIBOFX_HAVE_CLIENTUID)
- unset(LIBOFX_HAVE_CLIENTUID CACHE) #not doing this will prevent updating below check
-- check_struct_has_member("struct OfxFiLogin" clientuid ${PATH_TO_LIBOFX_HEADER} LIBOFX_HAVE_CLIENTUID LANGUAGE CXX)
-+ check_struct_has_member("struct OfxFiLogin" clientuid "${LIBOFX_INCLUDE_DIR}" LIBOFX_HAVE_CLIENTUID LANGUAGE CXX)
- endif()
-
- if (LIBOFX_HAVE_CLIENTUID)
-@@ -402,12 +402,13 @@ kde_enable_exceptions()
+@@ -426,12 +426,14 @@ kde_enable_exceptions()
# There is no way to detect linker in cmake (see https://gitlab.kitware.com/cmake/cmake/issues/17596)
# and linkers aren't compatible with each other, so we need to assume something
-if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
-+if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang" AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang"
++ AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-dead_strip -Wl,-undefined,error")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-dead_strip -Wl,-undefined,error -Wl,-mark_dead_strippable_dylib")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dead_strip -Wl,-undefined,error")
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-+elseif((CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
++elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"
+ AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
# TODO: remove multiple definitions of payeeIdentifierLoader::createPayeeIdentifierFromSqlDatabase
-@@ -445,7 +446,8 @@ endif()
+@@ -482,7 +484,9 @@ endif()
# IDEA: Set on a per target base
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
-+if((CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
-+ AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"
++ OR CMAKE_CXX_COMPILER_ID MATCHES "AppleClang"
++ AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
# DebugKMM, Debugfull, Profile
set(CMAKE_CXX_FLAGS_DEBUGKMM
"-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
diff --git a/productivity/kmymoney/patches/patch-cmake_modules_FindLibOfx_cmake b/productivity/kmymoney/patches/patch-cmake_modules_FindLibOfx_cmake
deleted file mode 100644
index 45214e69dfd..00000000000
--- a/productivity/kmymoney/patches/patch-cmake_modules_FindLibOfx_cmake
+++ /dev/null
@@ -1,158 +0,0 @@
-Use CMake to find libofx instead of just relying on pkgconf.
-From FeeBSD
-
-Index: cmake/modules/FindLibOfx.cmake
---- cmake/modules/FindLibOfx.cmake.orig
-+++ cmake/modules/FindLibOfx.cmake
-@@ -5,6 +5,7 @@
- # LIBOFX_INCLUDE_DIR - the LibOfx include directory
- # LIBOFX_LIBRARIES - Link these to LibOfx
- # LIBOFX_DEFINITIONS - Compiler switches required for using LibOfx
-+# LIBOFX_VERSION_STRING - version of LibOfx found (since CMake 2.8.8)
-
- # SPDX-FileCopyrightText: 2006 Alexander Neundorf <neundorf@kde.org>
- # Copied from FindLibXslt.cmake, 2009, Guillaume DE BURE, <gdebure@yahoo.com>
-@@ -12,95 +13,66 @@
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-+include(FindPackageHandleStandardArgs)
-+
- if(NOT LIBOFX_MIN_VERSION)
- set(LIBOFX_MIN_VERSION "0.9.4")
- endif(NOT LIBOFX_MIN_VERSION)
-
--IF (LIBOFX_INCLUDE_DIR AND LIBOFX_LIBRARIES)
-- # in cache already
-- SET(LIBOFX_FIND_QUIETLY TRUE)
--ENDIF (LIBOFX_INCLUDE_DIR AND LIBOFX_LIBRARIES)
-+# use pkg-config to get the directories and then use these values
-+# in the find_path() and find_library() calls
-+find_package(PkgConfig QUIET)
-+pkg_check_modules(PC_LIBOFX QUIET libofx>=${LIBOFX_MIN_VERSION})
-+set(LIBOFX_DEFINITIONS ${PC_LIBOFX_CFLAGS_OTHER})
-
--IF (NOT WIN32 AND NOT APPLE)
-- # use pkg-config to get the directories and then use these values
-- # in the FIND_PATH() and FIND_LIBRARY() calls
-- FIND_PACKAGE(PkgConfig)
-+find_path(LIBOFX_INCLUDE_DIR
-+ NAMES libofx/libofx.h
-+ HINTS ${PC_OFX_INCLUDEDIR}
-+)
-
-- # according to https://svnweb.freebsd.org/ports/head/finance/kmymoney/files/patch-cmake_modules_FindLibOfx.cmake?view=markup
-- # FreeBSD needs a little different variable name here to setup the LibOFX package infrastructure for us.
-- if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-- PKG_CHECK_MODULES(PC_OFX libofx>=${LIBOFX_MIN_VERSION})
-- else (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-- PKG_CHECK_MODULES(LIBOFX libofx>=${LIBOFX_MIN_VERSION})
-- endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-+find_library(LIBOFX_LIBRARIES
-+ NAMES ofx libofx
-+ HINTS ${PC_OFX_LIBDIR}
-+)
-
-- FIND_PATH(LIBOFX_INCLUDE_DIR libofx/libofx.h
-- PATHS
-- ${LIBOFX_INCLUDE_DIRS}
-- ${PC_OFX_INCLUDE_DIRS}
-- )
-+if(PC_LIBOFX_VERSION)
-+ set(LIBOFX_VERSION_STRING ${PC_LIBOFX_VERSION})
-+elseif(LIBOFX_INCLUDE_DIR AND EXISTS "${LIBOFX_INCLUDE_DIR}/libofx/libofx.h")
-+ file(STRINGS "${LIBOFX_INCLUDE_DIR}/libofx/libofx.h" libofx_version_str
-+ REGEX "^#define[\t ]+LIBOFX_VERSION_RELEASE_STRING[\t ]+\".*\"")
-+ string(REGEX REPLACE "^#define[\t ]+LIBOFX_VERSION_RELEASE_STRING[\t ]+\"([^\"]*)\".*" "\\1"
-+ LIBOFX_VERSION_STRING "${libofx_version_str}")
-+ unset(libofx_version_str)
-+endif()
-
--ELSE (NOT WIN32 AND NOT APPLE)
-- FIND_PATH(LIBOFX_INCLUDE_DIR libofx/libofx.h
-- PATHS
-- ${PC_OFX_INCLUDEDIR}
-- ${PC_OFX_INCLUDE_DIRS}
-- )
--
-- FIND_LIBRARY(LIBOFX_LIBRARIES NAMES ofx libofx
-- PATHS
-- ${PC_OFX_LIBDIR}
-- ${PC_OFX_LIBRARY_DIRS}
-- )
--
-- IF (LIBOFX_INCLUDE_DIR AND LIBOFX_LIBRARIES)
-- SET(LIBOFX_FOUND TRUE)
-- ELSE (LIBOFX_INCLUDE_DIR AND LIBOFX_LIBRARIES)
-- SET(LIBOFX_FOUND FALSE)
-- ENDIF (LIBOFX_INCLUDE_DIR AND LIBOFX_LIBRARIES)
--ENDIF (NOT WIN32 AND NOT APPLE)
--
--IF (LIBOFX_FOUND)
-- IF (NOT LIBOFX_FIND_QUIETLY)
-- MESSAGE(STATUS "Found LibOfx: ${LIBOFX_LIBRARY_DIRS}")
-- ENDIF (NOT LIBOFX_FIND_QUIETLY)
--ELSE (LIBOFX_FOUND)
-- IF (LibOfx_FIND_REQUIRED)
-- MESSAGE(FATAL_ERROR "Could NOT find LibOfx")
-- ENDIF (LibOfx_FIND_REQUIRED)
--ENDIF (LIBOFX_FOUND)
--
- # since on Windows for now libofx is a static library we need to add libopensp and libiconv (just like when linking libofx)
--IF (WIN32)
-- SET(OPENSP_FOUND FALSE)
-- FIND_PATH(OPENSP_INCLUDES ParserEventGeneratorKit.h
-- $ENV{KDEROOT}/include/opensp
-- )
-+if(WIN32)
-+ find_path(OPENSP_INCLUDE_DIR
-+ NAMES ParserEventGeneratorKit.h
-+ HINTS $ENV{KDEROOT}/include/opensp $ENV{KDEROOT}/include/OpenSP
-+ )
-
-- FIND_LIBRARY(OPENSP_LIBRARIES
-- NAMES sp133 libosp
-- PATHS
-- $ENV{KDEROOT}/lib
-- )
-+ find_library(OPENSP_LIBRARIES
-+ NAMES osp libosp sp133
-+ HINTS $ENV{KDEROOT}/lib
-+ )
-
-- FIND_LIBRARY(ICONV_LIBRARIES iconv)
-+ find_library(ICONV_LIBRARIES iconv)
-
-- IF (OPENSP_INCLUDES AND OPENSP_OPENSP_LIBRARIES)
-- set(OPENSP_FOUND TRUE)
-- ENDIF (OPENSP_INCLUDES AND OPENSP_OPENSP_LIBRARIES)
-+ find_package_handle_standard_args(OpenSP
-+ REQUIRED_VARS OPENSP_LIBRARIES OPENSP_INCLUDE_DIR
-+ )
-+ find_package_handle_standard_args(iconv
-+ REQUIRED_VARS ICONV_LIBRARIES
-+ )
-
-- IF (OPENSP_FOUND)
-- IF (NOT OPENSP_FIND_QUIETLY)
-- MESSAGE(STATUS "Found OPENSP library: ${OPENSP_LIBRARIES}")
-- ENDIF (NOT OPENSP_FIND_QUIETLY)
-+ set(LIBOFX_LIBRARIES ${LIBOFX_LIBRARIES} ${OPENSP_LIBRARIES} ${ICONV_LIBRARIES})
-+endif()
-
-- ELSE (OPENSP_FOUND)
-- IF (OPENSP_FIND_REQUIRED)
-- MESSAGE(FATAL_ERROR "Could NOT find OPENSP library\nPlease install it first")
-- ENDIF (OPENSP_FIND_REQUIRED)
-- ENDIF (OPENSP_FOUND)
-- SET(LIBOFX_LIBRARIES ${LIBOFX_LIBRARIES} ${OPENSP_LIBRARIES} ${ICONV_LIBRARIES})
--ENDIF (WIN32)
--
--MARK_AS_ADVANCED(LIBOFX_INCLUDE_DIR LIBOFX_LIBRARIES )
-+find_package_handle_standard_args(LibOFX
-+ REQUIRED_VARS LIBOFX_LIBRARIES LIBOFX_INCLUDE_DIR
-+ VERSION_VAR LIBOFX_VERSION_STRING
-+)
-+
-+mark_as_advanced(LIBOFX_INCLUDE_DIR LIBOFX_LIBRARIES)
-
diff --git a/productivity/kmymoney/patches/patch-kmymoney_kmymoney_cpp b/productivity/kmymoney/patches/patch-kmymoney_kmymoney_cpp
new file mode 100644
index 00000000000..e8bc3a4e5d0
--- /dev/null
+++ b/productivity/kmymoney/patches/patch-kmymoney_kmymoney_cpp
@@ -0,0 +1,13 @@
+Index: kmymoney/kmymoney.cpp
+--- kmymoney/kmymoney.cpp.orig
++++ kmymoney/kmymoney.cpp
+@@ -1038,7 +1038,8 @@ KMyMoneyApp::KMyMoneyApp(QWidget* parent)
+ * 3) in a separate, minimal test case, loading libsqlite3 explicitly
+ * with QLibrary::ExportExternalSymbolsHint makes libsqlcipher non-functional
+ */
+- sqlite3_key(nullptr, nullptr, 0);
++ // XXX Stupid call ends with a segmentation fault
++ // sqlite3_key(nullptr, nullptr, 0);
+
No comments:
Post a Comment