Date: Fri, 13 Apr 2018 13:16:46 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467240 - in head: . finance finance/alkimia finance/alkimia-qt4 finance/alkimia/files finance/kmymoney-kde4 finance/kmymoney-kde4/files finance/libalkimia Message-ID: <201804131316.w3DDGk74035163@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Fri Apr 13 13:16:46 2018 New Revision: 467240 URL: https://svnweb.freebsd.org/changeset/ports/467240 Log: - Move finance/libalkimia -> finance/alkimia to follow upstream project name - Update to 7.0.1 - finance/alkimia is the Qt 5 version for the upcoming kf5 version of KMyMoney - finance/alkimia-qt4 is the Qt 4 version for the kde4 version of KMyMoney - Fix LICENSE - Default multi-precision library is now MPIR upstream, but an option has been added if you wish to use GMP instead - Add regression test support - Adjust finance/kmymoney to use the new version While here: - Add a patch to finance/kmymoney to fix a possible build failure when kmymoneysettings.h is not generated early enough. Added: head/finance/alkimia/ - copied from r467239, head/finance/libalkimia/ head/finance/alkimia-qt4/ head/finance/alkimia-qt4/Makefile (contents, props changed) head/finance/alkimia/files/ head/finance/alkimia/files/patch-CMakeLists.txt (contents, props changed) head/finance/alkimia/files/patch-autotests_CMakeLists.txt (contents, props changed) head/finance/alkimia/files/patch-src_LibAlkimiaConfig.cmake.in (contents, props changed) head/finance/alkimia/files/patch-src_libalkimia.pc.in (contents, props changed) head/finance/kmymoney-kde4/files/patch-kmymoney_dialogs_settings_CMakeLists.txt (contents, props changed) Deleted: head/finance/libalkimia/ Modified: head/MOVED head/finance/Makefile head/finance/alkimia/Makefile head/finance/alkimia/distinfo head/finance/alkimia/pkg-descr head/finance/alkimia/pkg-plist head/finance/kmymoney-kde4/Makefile head/finance/kmymoney-kde4/files/patch-CMakeLists.txt Modified: head/MOVED ============================================================================== --- head/MOVED Fri Apr 13 13:11:07 2018 (r467239) +++ head/MOVED Fri Apr 13 13:16:46 2018 (r467240) @@ -10142,3 +10142,4 @@ textproc/elasticsearch-plugin-migration||2018-04-09|El textproc/elasticsearch-plugin-sql||2018-04-09|ElasticSearch 1.x End of Life textproc/elasticsearch-river-rabbitmq||2018-04-09|ElasticSearch 1.x End of Life devel/libkgapi|devel/libkgapi-kde4|2018-04-11|Make room for KDE updates +finance/libalkimia|finance/alkimia-qt4|2018-04-13|Project renamed Modified: head/finance/Makefile ============================================================================== --- head/finance/Makefile Fri Apr 13 13:11:07 2018 (r467239) +++ head/finance/Makefile Fri Apr 13 13:16:46 2018 (r467240) @@ -20,6 +20,8 @@ SUBDIR += R-cran-tseries SUBDIR += R-cran-urca SUBDIR += R-cran-vars + SUBDIR += alkimia + SUBDIR += alkimia-qt4 SUBDIR += aqbanking SUBDIR += aqmoney SUBDIR += beanie @@ -39,7 +41,6 @@ SUBDIR += ledger SUBDIR += ledgersmb SUBDIR += ledgersmb12 - SUBDIR += libalkimia SUBDIR += libofx SUBDIR += libstocks SUBDIR += moneymanagerex Added: head/finance/alkimia-qt4/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/alkimia-qt4/Makefile Fri Apr 13 13:16:46 2018 (r467240) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +SLAVE= qt4 +MASTERDIR= ${.CURDIR}/../../finance/alkimia + +.include "${MASTERDIR}/Makefile" Modified: head/finance/alkimia/Makefile ============================================================================== --- head/finance/libalkimia/Makefile Fri Apr 13 13:11:07 2018 (r467239) +++ head/finance/alkimia/Makefile Fri Apr 13 13:16:46 2018 (r467240) @@ -1,25 +1,62 @@ # $FreeBSD$ -PORTNAME= libalkimia -PORTVERSION= 5.0.0 -PORTREVISION= 3 +PORTNAME= alkimia +PORTVERSION= 7.0.1 CATEGORIES= finance kde -MASTER_SITES= KDE/stable/alkimia/${PORTVERSION}/src +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src +PKGNAMESUFFIX= -${SLAVE} MAINTAINER= jhale@FreeBSD.org -COMMENT= KDE4 financial data handling library +COMMENT= KDE financial data handling library -LICENSE= LGPL21 +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING.LIB -LIB_DEPENDS= libgmp.so:math/gmp +# Depending on ecm via USE_KDE causes unwanted CMAKE_ARGS to be set +BUILD_DEPENDS= ${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/kf5-extra-cmake-modules -USES= cmake:outsource kde:4 pathfix tar:xz -USE_KDE= automoc4 kdelibs -USE_QT4= qmake_build moc_build rcc_build uic_build +USES= cmake:outsource pathfix tar:xz USE_LDCONFIG= yes -post-patch: - @${REINPLACE_CMD} -e 's|KDE4_LIB_DIR|LIB_INSTALL_DIR|g' \ - ${WRKSRC}/${PORTNAME}/libalkimia.pc.in +SLAVE?= qt5 +.if ${SLAVE} == qt4 +USE_QT4= corelib dbus \ + moc_build qmake_build rcc_build +# BUILD_QT4 must be set to "1" due to comparison used in src/LibAlkimiaConfig.cmake.in +CMAKE_ARGS+= -DBUILD_QT4=1 +CMAKE_OFF+= KDE_INSTALL_USE_QT_SYS_PATHS +INCLUDE_SUBDIR= Qt4 +.else +USE_QT5= core dbus \ + buildtools_build qmake_build +CMAKE_ON+= KDE_INSTALL_USE_QT_SYS_PATHS +INCLUDE_SUBDIR= Qt5 +QTVER_SUFFIX= 5 +.endif + +PLIST_SUB= INCLUDE_SUBDIR=${INCLUDE_SUBDIR} \ + QTVER_SUFFIX=${QTVER_SUFFIX} \ + VER=${PORTVERSION:R} + +OPTIONS_SINGLE= MPLIB +OPTIONS_SINGLE_MPLIB= GMP MPIR +OPTIONS_DEFINE= TEST +OPTIONS_DEFAULT= MPIR +OPTIONS_SUB= yes +MPLIB_DESC= Multi-precision library (MPIR preferred) + +GMP_LIB_DEPENDS= libgmp.so:math/gmp +GMP_CMAKE_BOOL= CMAKE_DISABLE_FIND_PACKAGE_MPIR + +MPIR_DESC= MPIR (multiple precision arithmetic) support +MPIR_LIB_DEPENDS= libmpir.so:math/mpir + +.if ${SLAVE} == qt4 +TEST_USE= QT4=qtestlib +.else +TEST_USE= QT5=testlib +.endif +TEST_CMAKE_BOOL= BUILD_TESTING +TEST_TEST_TARGET= test .include <bsd.port.mk> Modified: head/finance/alkimia/distinfo ============================================================================== --- head/finance/libalkimia/distinfo Fri Apr 13 13:11:07 2018 (r467239) +++ head/finance/alkimia/distinfo Fri Apr 13 13:16:46 2018 (r467240) @@ -1,2 +1,3 @@ -SHA256 (libalkimia-5.0.0.tar.xz) = eea8a2a0f6788a1b9fd464b370598ed6e55353fb40da53375e6f022e71526cb5 -SIZE (libalkimia-5.0.0.tar.xz) = 28400 +TIMESTAMP = 1523611128 +SHA256 (alkimia-7.0.1.tar.xz) = 42c49025b3f8489dcbc5df55101ef95bc920e160b9d5ecf573a88062883931bb +SIZE (alkimia-7.0.1.tar.xz) = 38400 Added: head/finance/alkimia/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/alkimia/files/patch-CMakeLists.txt Fri Apr 13 13:16:46 2018 (r467240) @@ -0,0 +1,34 @@ +Make tests conditional + +--- CMakeLists.txt.orig 2018-03-15 19:28:26 UTC ++++ CMakeLists.txt +@@ -15,7 +15,7 @@ include(FeatureSummary) + # check for PkgConfig, Qt and MPIR/GMP + find_package(PkgConfig) + if(BUILD_QT4) +- find_package(Qt4 REQUIRED COMPONENTS QtCore QtDBus QtTest) ++ find_package(Qt4 REQUIRED COMPONENTS QtCore QtDBus) + set(QT_USE_LIBSPREFIX Qt4::Qt) + set(ALKIMIA_LIB_SUFFIX "") + set(ALKIMIA_INCLUDE_SUFFIX "Qt4") +@@ -23,7 +23,7 @@ if(BUILD_QT4) + set(PC_TARGET_QTPREFIX Qt) + set(PC_TARGET_SUFFIX) + else() +- find_package(Qt5 REQUIRED COMPONENTS Core DBus Test) ++ find_package(Qt5 REQUIRED COMPONENTS Core DBus) + set(QT_USE_LIBSPREFIX Qt5::) + set(ALKIMIA_LIB_SUFFIX "5") + set(ALKIMIA_INCLUDE_SUFFIX "Qt5") +@@ -56,6 +56,10 @@ find_package(Doxygen) + feature_summary(WHAT ALL) + + add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) ++include_directories(${MP_INCLUDE_DIR}) + + add_subdirectory(src) +-add_subdirectory(autotests) ++ ++if(BUILD_TESTING) ++ add_subdirectory(autotests) ++endif() Added: head/finance/alkimia/files/patch-autotests_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/alkimia/files/patch-autotests_CMakeLists.txt Fri Apr 13 13:16:46 2018 (r467240) @@ -0,0 +1,15 @@ +Find testlib (moved from ../CMakeLists.txt) + +--- autotests/CMakeLists.txt.orig 2018-03-15 19:28:26 UTC ++++ autotests/CMakeLists.txt +@@ -1,8 +1,10 @@ + include(ECMAddTests) + + if(BUILD_QT4) ++ find_package(Qt4 REQUIRED COMPONENTS QtTest) + set(TEST_LIB ${QT_QTTEST_LIBRARY}) + else() ++ find_package(Qt5 REQUIRED COMPONENTS Test) + set(TEST_LIB Qt5::Test) + endif() + Added: head/finance/alkimia/files/patch-src_LibAlkimiaConfig.cmake.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/alkimia/files/patch-src_LibAlkimiaConfig.cmake.in Fri Apr 13 13:16:46 2018 (r467240) @@ -0,0 +1,20 @@ +Upstream fixes for KMM 4.8 (fixed in 7.0.2) + +--- src/LibAlkimiaConfig.cmake.in.orig 2018-03-15 19:28:26 UTC ++++ src/LibAlkimiaConfig.cmake.in +@@ -2,6 +2,8 @@ + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + ++include(CMakeFindDependencyMacro) ++ + if("@BUILD_QT4@" STREQUAL "1") + find_package(Qt4 COMPONENTS QtCore QtDBus) + else() +@@ -12,5 +14,6 @@ find_dependency(@MP_CMAKE_MODULE@) + + include("${CMAKE_CURRENT_LIST_DIR}/LibAlkimia@ALKIMIA_PATH_SUFFIX@Targets.cmake") + ++set_and_check(LIBALKIMIA_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") + set_property(TARGET Alkimia::alkimia PROPERTY INTERFACE_INCLUDE_DIRECTORIES "@PACKAGE_INCLUDE_INSTALL_DIR@" ${@MP_CMAKE_MODULE@_INCLUDE_DIR}) + message(STATUS "Found LibAlkimia: ${CMAKE_CURRENT_LIST_DIR}/LibAlkimia@ALKIMIA_PATH_SUFFIX@Config.cmake (found version \"@ALKIMIA_LIB_VERSION@\")") Added: head/finance/alkimia/files/patch-src_libalkimia.pc.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/alkimia/files/patch-src_libalkimia.pc.in Fri Apr 13 13:16:46 2018 (r467240) @@ -0,0 +1,25 @@ +--- src/libalkimia.pc.in.orig 2018-03-15 19:28:26 UTC ++++ src/libalkimia.pc.in +@@ -3,9 +3,9 @@ + + # General installation directories + prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@KDE4_LIB_DIR@ +-includedir=@INCLUDE_INSTALL_DIR@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/@LIB_INSTALL_DIR@ ++includedir=${prefix}/@INCLUDE_INSTALL_DIR@ + + # Human-readable name + Name: Alkimia +@@ -13,7 +13,7 @@ Name: Alkimia + 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++ ++Libs: -L${libdir} -lalkimia@PC_TARGET_SUFFIX@ ++Libs.private: -l@PC_LIB@ -l@PC_TARGET_QTPREFIX@Core -l@PC_TARGET_QTPREFIX@DBus + Cflags: -I${includedir} -I@MP_INCLUDE_DIR@ + Modified: head/finance/alkimia/pkg-descr ============================================================================== --- head/finance/libalkimia/pkg-descr Fri Apr 13 13:11:07 2018 (r467239) +++ head/finance/alkimia/pkg-descr Fri Apr 13 13:16:46 2018 (r467240) @@ -1,8 +1,7 @@ Libalkimia is a library with common classes and functionality used by finance -applications for KDE 4. +applications for KDE. Currently, it supports a common class to represent monetary values with arbitrary precision. WWW: http://community.kde.org/Alkimia/libalkimia -WWW: http://kde-apps.org/content/show.php/libalkimia?content=137323 Modified: head/finance/alkimia/pkg-plist ============================================================================== --- head/finance/libalkimia/pkg-plist Fri Apr 13 13:11:07 2018 (r467239) +++ head/finance/alkimia/pkg-plist Fri Apr 13 13:16:46 2018 (r467240) @@ -1,12 +1,14 @@ -include/kde4/alkimia/alk_export.h -include/kde4/alkimia/alkcompany.h -include/kde4/alkimia/alkquoteitem.h -include/kde4/alkimia/alkvalue.h -lib/cmake/LibAlkimia/LibAlkimiaConfig.cmake -lib/cmake/LibAlkimia/LibAlkimiaConfigVersion.cmake -lib/cmake/LibAlkimia/LibAlkimiaTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/LibAlkimia/LibAlkimiaTargets.cmake -lib/libalkimia.so -lib/libalkimia.so.5 -lib/libalkimia.so.5.0.0 -libdata/pkgconfig/libalkimia.pc +include/alkimia/%%INCLUDE_SUBDIR%%/alkimia/alk_export.h +include/alkimia/%%INCLUDE_SUBDIR%%/alkimia/alkcompany.h +include/alkimia/%%INCLUDE_SUBDIR%%/alkimia/alkquoteitem.h +include/alkimia/%%INCLUDE_SUBDIR%%/alkimia/alkvalue.h +%%GMP%%lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/FindGMP.cmake +%%MPIR%%lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/FindMPIR.cmake +lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/LibAlkimia%%QTVER_SUFFIX%%Config.cmake +lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/LibAlkimia%%QTVER_SUFFIX%%ConfigVersion.cmake +lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/LibAlkimia%%QTVER_SUFFIX%%Targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/LibAlkimia%%QTVER_SUFFIX%%-%%VER%%/LibAlkimia%%QTVER_SUFFIX%%Targets.cmake +lib/libalkimia%%QTVER_SUFFIX%%.so +lib/libalkimia%%QTVER_SUFFIX%%.so.7 +lib/libalkimia%%QTVER_SUFFIX%%.so.7.0.1 +libdata/pkgconfig/libalkimia%%QTVER_SUFFIX%%.pc Modified: head/finance/kmymoney-kde4/Makefile ============================================================================== --- head/finance/kmymoney-kde4/Makefile Fri Apr 13 13:11:07 2018 (r467239) +++ head/finance/kmymoney-kde4/Makefile Fri Apr 13 13:16:46 2018 (r467240) @@ -2,6 +2,7 @@ PORTNAME= kmymoney PORTVERSION= 4.8.1.1 +PORTREVISION= 1 CATEGORIES= finance kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src PKGNAMESUFFIX= -kde4 @@ -13,8 +14,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_graph.so:devel/boost-libs \ - libalkimia.so:finance/libalkimia \ - libgmp.so:math/gmp \ + libalkimia.so:finance/alkimia-qt4 \ libgpgme.so:security/gpgme \ libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error Modified: head/finance/kmymoney-kde4/files/patch-CMakeLists.txt ============================================================================== --- head/finance/kmymoney-kde4/files/patch-CMakeLists.txt Fri Apr 13 13:11:07 2018 (r467239) +++ head/finance/kmymoney-kde4/files/patch-CMakeLists.txt Fri Apr 13 13:16:46 2018 (r467240) @@ -1,7 +1,9 @@ Suppress numerous CMake warnings. Upstream has CMP0071 set to OLD behavior in the 5.x version, and build fails if set to NEW. ---- CMakeLists.txt.orig 2018-04-12 15:58:03 UTC +Allow building with LibAlkimia 7.x + +--- CMakeLists.txt.orig 2017-12-23 22:30:29 UTC +++ CMakeLists.txt @@ -9,6 +9,9 @@ set(CMAKE_AUTOMOC TRUE) @@ -13,3 +15,28 @@ in the 5.x version, and build fails if set to NEW. if(POLICY CMP0017) cmake_policy(SET CMP0017 NEW) endif(POLICY CMP0017) +@@ -118,11 +121,19 @@ if(DOXYGEN_FOUND) + endif(DOXYGEN_FOUND) + + find_package(LibAlkimia REQUIRED) +-#TODO: remove when LibAlkimia minimum version will be raised +-if (NOT LIBALKIMIA_LIBRARIES AND LIBALKIMIA_LIBRARY) +- # LibAlkimia 4.3.2 does not properly define LIBALKIMIA_LIBRARIES +- find_package(GMP REQUIRED) +- set(LIBALKIMIA_LIBRARIES ${GMP_LIBRARIES} ${LIBALKIMIA_LIBRARY} ) ++if("${LibAlkimia_VERSION_MAJOR}" EQUAL 7 OR "${LibAlkimia_VERSION_MAJOR}" GREATER 7) ++ set(LIBALKIMIA_LIBRARIES Alkimia::alkimia) ++else() ++ #TODO: remove when LibAlkimia minimum version will be raised ++ if (NOT "${LIBALKIMIA_LIBRARIES}" AND "${LIBALKIMIA_LIBRARY}") ++ # LibAlkimia 4.3.2 does not properly define LIBALKIMIA_LIBRARIES ++ find_package(GMP REQUIRED) ++ set(LIBALKIMIA_LIBRARIES ${GMP_LIBRARIES} ${LIBALKIMIA_LIBRARY} ) ++ endif() ++endif() ++# make sure LIBALKIMIA_LIBRARIES is set ++if("${LibAlkimia_FOUND}" AND NOT "${LIBALKIMIA_LIBRARIES}") ++ set(LIBALKIMIA_LIBRARIES Alkimia::alkimia) + endif() + # make sure we have the matching version of LibAlkimia (not too new) + if(${LibAlkimia_FOUND}) Added: head/finance/kmymoney-kde4/files/patch-kmymoney_dialogs_settings_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/kmymoney-kde4/files/patch-kmymoney_dialogs_settings_CMakeLists.txt Fri Apr 13 13:16:46 2018 (r467240) @@ -0,0 +1,20 @@ +Fix intermittent build failures when kmymoneysettings.h is not generated +early enough. + +--- kmymoney/dialogs/settings/CMakeLists.txt.orig 2018-04-13 10:02:11 UTC ++++ kmymoney/dialogs/settings/CMakeLists.txt +@@ -4,6 +4,8 @@ add_custom_command( + COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${CMAKE_CURRENT_BINARY_DIR}/ ${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc + ) + ++add_custom_target(generate-kmymoneysettings_h DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.h) ++ + set (libsettings_a_SOURCES + ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp + ksettingscolors.cpp +@@ -31,4 +33,5 @@ kde4_add_ui_files(libsettings_a_SOURCES ${libsettings_ + + kde4_add_library(settings STATIC ${libsettings_a_SOURCES}) + ++add_dependencies(settings generate-kmymoneysettings_h) + add_dependencies(settings widgets kmm_config)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804131316.w3DDGk74035163>