Update to 4.8.2

7 files changed, 25 insertions, 56 deletions

diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index 97405eb690c8..8ba16893bcc8 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	kmymoney
-PORTVERSION=	4.8.1.1
-PORTREVISION=	2
+PORTVERSION=	4.8.2
 CATEGORIES=	finance kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 PKGNAMESUFFIX=	-kde4
diff --git a/finance/kmymoney-kde4/distinfo b/finance/kmymoney-kde4/distinfo
index 903dede588a7..9bfff02f5dbf 100644
--- a/finance/kmymoney-kde4/distinfo
+++ b/finance/kmymoney-kde4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523493479
-SHA256 (kmymoney-4.8.1.1.tar.xz) = 2b1cbd141d51a3f4147c30c00c7d21022e761d8121f5a206092cf3548f805a34
-SIZE (kmymoney-4.8.1.1.tar.xz) = 20963444
+TIMESTAMP = 1528151455
+SHA256 (kmymoney-4.8.2.tar.xz) = d442273365b6dd852ed2e419cd0784447fdf1a41c632e5567181224d56f53051
+SIZE (kmymoney-4.8.2.tar.xz) = 20883828
diff --git a/finance/kmymoney-kde4/files/patch-CMakeLists.txt b/finance/kmymoney-kde4/files/patch-CMakeLists.txt
index 0352ba250888..f37b4a6a8eb7 100644
--- a/finance/kmymoney-kde4/files/patch-CMakeLists.txt
+++ b/finance/kmymoney-kde4/files/patch-CMakeLists.txt
@@ -1,8 +1,6 @@
 Suppress numerous CMake warnings. Upstream has CMP0071 set to OLD behavior
 in the 5.x version, and build fails if set to NEW.
 
-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)
@@ -15,28 +13,3 @@ Allow building with LibAlkimia 7.x
    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})
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney_CMakeLists.txt b/finance/kmymoney-kde4/files/patch-kmymoney_CMakeLists.txt
index 01ee560f0b82..d520a5bb23b3 100644
--- a/finance/kmymoney-kde4/files/patch-kmymoney_CMakeLists.txt
+++ b/finance/kmymoney-kde4/files/patch-kmymoney_CMakeLists.txt
@@ -1,8 +1,8 @@
 Don't update XDG mimetypes during build. This is done by the ports framework.
 
---- kmymoney/CMakeLists.txt.orig	2017-12-23 22:27:53 UTC
+--- kmymoney/CMakeLists.txt.orig	2018-05-28 07:59:03 UTC
 +++ kmymoney/CMakeLists.txt
-@@ -114,7 +114,6 @@ install(FILES org.kde.kmymoney.appdata.xml
+@@ -111,7 +111,6 @@ install(FILES org.kde.kmymoney.appdata.xml
  install(FILES x-kmymoney.xml
    DESTINATION ${XDG_MIME_INSTALL_DIR})
  
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney_dialogs_settings_CMakeLists.txt b/finance/kmymoney-kde4/files/patch-kmymoney_dialogs_settings_CMakeLists.txt
deleted file mode 100644
index 8fde853af582..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney_dialogs_settings_CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-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)
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney_plugins_ofximport_CMakeLists.txt b/finance/kmymoney-kde4/files/patch-kmymoney_plugins_ofximport_CMakeLists.txt
new file mode 100644
index 000000000000..b362fa9d853d
--- /dev/null
+++ b/finance/kmymoney-kde4/files/patch-kmymoney_plugins_ofximport_CMakeLists.txt
@@ -0,0 +1,16 @@
+kmymoneysettings.h is generated by the kmm_settings target. We need to ensure
+that it is built before kmm_ofximport.
+
+kmymoney/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp:19:10: fatal error: 'kmymoneysettings.h' file not found
+
+--- kmymoney/plugins/ofximport/CMakeLists.txt.orig	2018-06-05 11:19:49 UTC
++++ kmymoney/plugins/ofximport/CMakeLists.txt
+@@ -28,6 +28,8 @@ target_link_libraries(kmm_ofximport
+                       ${LIBALKIMIA_LIBRARIES}
+                       ${LIBOFX_LIBRARIES})
+ 
++add_dependencies(kmm_ofximport kmm_settings)
++
+ ########### install files ###############
+ 
+ install(FILES kmm_ofximport.rc
diff --git a/finance/kmymoney-kde4/pkg-plist b/finance/kmymoney-kde4/pkg-plist
index 87cacafe5de9..a005ad1328af 100644
--- a/finance/kmymoney-kde4/pkg-plist
+++ b/finance/kmymoney-kde4/pkg-plist
@@ -103,7 +103,7 @@ lib/kde4/kmm_csvimport.so
 lib/kde4/kmm_printcheck.so
 lib/kde4/kmm_reconciliationreport.so
 %%WEBOOB%%lib/kde4/kmm_weboob.so
-lib/kde4/libkonlinetasks_sepa.so
+lib/kde4/konlinetasks_sepa.so
 lib/kde4/payeeidentifier_iban_bic_delegates.so
 lib/kde4/payeeidentifier_ibanbic_storageplugin.so
 lib/kde4/payeeidentifier_nationalAccount_ui.so
@@ -120,6 +120,7 @@ lib/libkmm_payeeidentifier.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkmm_plugin.so
 lib/libkmm_plugin.so.4
 lib/libkmm_plugin.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkmm_settings.so
 lib/libkmm_widgets.so
 lib/libkmm_widgets.so.4
 lib/libkmm_widgets.so.%%KDE4_GENERIC_LIB_VERSION%%
@@ -132,8 +133,8 @@ lib/libpayeeidentifier_iban_bic_widgets.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libpayeeidentifier_nationalAccount.so
 lib/libpayeeidentifier_nationalAccount.so.4
 lib/libpayeeidentifier_nationalAccount.so.%%KDE4_GENERIC_LIB_VERSION%%
+share/appdata/org.kde.kmymoney.appdata.xml
 share/applications/kde4/org.kde.kmymoney.desktop
-share/apps/appdata/org.kde.kmymoney.appdata.xml
 share/apps/kconf_update/kmymoney.upd
 share/apps/kmm_csvexport/kmm_csvexport.rc
 share/apps/kmm_csvimport/kmm_csvimport.rc