Update KDE Applications to 20.12

- astro/libkgeomap has been removed as there are no consumers left
- deskutils/kdepim-apps-libs has been reintegrated into other ports

There are a handful of new ports available:
- astro/kosmindoormap: Library and QML component for rendering multi-level OSM indoor maps
- deskutils/itinerary: KDE Itinerary is a digital travel assistant
- devel/kpublictransport: Access realtime public transport data
- graphics/kontrast: Color contrast checker
- textproc/markdownpart: KPart for rendering Markdown content

4 files changed, 34 insertions, 66 deletions

diff --git a/deskutils/kaddressbook/Makefile b/deskutils/kaddressbook/Makefile
index 27723d0981f1..2fbc14b4b2e6 100644
--- a/deskutils/kaddressbook/Makefile
+++ b/deskutils/kaddressbook/Makefile
@@ -20,7 +20,7 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
 		prison service sonnet textwidgets widgetsaddons xmlgui
 # pim components
 USE_KDE+=	akonadi akonadicontacts akonadisearch contacts grantleetheme \
-		imap kdepim-apps-libs kontactinterface libkdepim mime pimcommon \
+		imap kontactinterface libkdepim mime pimcommon \
 		kdepim-runtime5_run
 USE_QT=		concurrent core dbus gui network printsupport widgets xml \
 		buildtools_build qmake_build
diff --git a/deskutils/kaddressbook/distinfo b/deskutils/kaddressbook/distinfo
index a82db25c546b..a1e079abfbbe 100644
--- a/deskutils/kaddressbook/distinfo
+++ b/deskutils/kaddressbook/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604419874
-SHA256 (KDE/release-service/20.08.3/kaddressbook-20.08.3.tar.xz) = d6a60cad603993fde5bd5ea1e5bebafb16f39afc918feeb565b930016550b102
-SIZE (KDE/release-service/20.08.3/kaddressbook-20.08.3.tar.xz) = 3168192
+TIMESTAMP = 1607111072
+SHA256 (KDE/release-service/20.12.0/kaddressbook-20.12.0.tar.xz) = 6ceff2002af65c6edc0cfa98ac4b29c6fc451e48c15c853f6e65c356408dc7db
+SIZE (KDE/release-service/20.12.0/kaddressbook-20.12.0.tar.xz) = 3256028
diff --git a/deskutils/kaddressbook/files/patch-git-8aee8d40ae2a1c920d3520163d550d3b49720226.diff b/deskutils/kaddressbook/files/patch-git-8aee8d40ae2a1c920d3520163d550d3b49720226.diff
deleted file mode 100644
index 7c891d615b8c..000000000000
--- a/deskutils/kaddressbook/files/patch-git-8aee8d40ae2a1c920d3520163d550d3b49720226.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-Author: Volker Krause <vkrause@kde.org>
-Date:   Sun Oct 25 18:22:58 2020 +0100
-
-    Compile with recent Qt 5.15
-    
-    More QPrinter methods got deprecated there. DevicePixel no longer exists
-    as a unit, visually Point looks pretty much the same though.
-
-diff --git src/printing/compact/compactstyle.cpp src/printing/compact/compactstyle.cpp
-index d950a963..71e74c0f 100644
---- src/printing/compact/compactstyle.cpp
-+++ src/printing/compact/compactstyle.cpp
-@@ -168,7 +168,7 @@ void CompactStyle::print(const KContacts::Addressee::List &contacts, PrintProgre
- 
-     // print
-     QPrinter *printer = wizard()->printer();
--    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
-+    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
- 
-     progress->addMessage(i18n("Setting up document"));
- 
-diff --git src/printing/grantlee/grantleeprintstyle.cpp src/printing/grantlee/grantleeprintstyle.cpp
-index d7afe8ef..49b5e494 100644
---- src/printing/grantlee/grantleeprintstyle.cpp
-+++ src/printing/grantlee/grantleeprintstyle.cpp
-@@ -38,7 +38,7 @@ GrantleePrintStyle::~GrantleePrintStyle()
- void GrantleePrintStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
- {
-     QPrinter *printer = wizard()->printer();
--    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
-+    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
- 
-     progress->addMessage(i18n("Setting up document"));
- 
-diff --git src/printing/mike/mikesstyle.cpp src/printing/mike/mikesstyle.cpp
-index 9f698c53..81a4bd6f 100644
---- src/printing/mike/mikesstyle.cpp
-+++ src/printing/mike/mikesstyle.cpp
-@@ -107,7 +107,7 @@ MikesStyle::~MikesStyle()
- void MikesStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
- {
-     QPrinter *printer = wizard()->printer();
--    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
-+    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
- 
-     progress->addMessage(i18n("Setting up document"));
- 
-diff --git src/printing/ringbinder/ringbinderstyle.cpp src/printing/ringbinder/ringbinderstyle.cpp
-index 60a39c86..5f600d6a 100644
---- src/printing/ringbinder/ringbinderstyle.cpp
-+++ src/printing/ringbinder/ringbinderstyle.cpp
-@@ -159,7 +159,7 @@ void RingBinderPrintStyle::print(const KContacts::Addressee::List &contacts, Pri
-     config.sync();
- 
-     QPrinter *printer = wizard()->printer();
--    printer->setPageMargins(50, 20, 0, 50, QPrinter::DevicePixel);
-+    printer->setPageMargins(QMarginsF(50, 20, 0, 50), QPageLayout::Point);
- 
-     progress->addMessage(i18n("Setting up document"));
- 
diff --git a/deskutils/kaddressbook/pkg-plist b/deskutils/kaddressbook/pkg-plist
index dc7d9c86f49d..d6548552555c 100644
--- a/deskutils/kaddressbook/pkg-plist
+++ b/deskutils/kaddressbook/pkg-plist
@@ -1,6 +1,32 @@
 bin/kaddressbook
-share/qlogging-categories5/kaddressbook.categories
-share/qlogging-categories5/kaddressbook.renamecategories
+include/KPim/KAddressBookImportExport/ContactFields
+include/KPim/KAddressBookImportExport/ContactList
+include/KPim/KAddressBookImportExport/ContactSelectionDialog
+include/KPim/KAddressBookImportExport/ContactSelectionWidget
+include/KPim/KAddressBookImportExport/ExportSelectionWidget
+include/KPim/KAddressBookImportExport/ImportExportEngine
+include/KPim/KAddressBookImportExport/Plugin
+include/KPim/KAddressBookImportExport/PluginInterface
+include/KPim/KAddressBookImportExport/PluginManager
+include/KPim/kaddressbookimportexport/contactfields.h
+include/KPim/kaddressbookimportexport/contactlist.h
+include/KPim/kaddressbookimportexport/contactselectiondialog.h
+include/KPim/kaddressbookimportexport/contactselectionwidget.h
+include/KPim/kaddressbookimportexport/exportselectionwidget.h
+include/KPim/kaddressbookimportexport/importexportengine.h
+include/KPim/kaddressbookimportexport/kaddressbook_importexport_export.h
+include/KPim/kaddressbookimportexport/plugin.h
+include/KPim/kaddressbookimportexport/plugininterface.h
+include/KPim/kaddressbookimportexport/pluginmanager.h
+include/KPim/kaddressbookimportexport_version.h
+lib/cmake/KPimAddressbookImportExport/KPimAddressbookImportExportConfig.cmake
+lib/cmake/KPimAddressbookImportExport/KPimAddressbookImportExportConfigVersion.cmake
+lib/cmake/KPimAddressbookImportExport/KPimAddressbookImportExportTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/KPimAddressbookImportExport/KPimAddressbookImportExportTargets.cmake
+lib/libKPimAddressbookImportExport.so
+lib/libKPimAddressbookImportExport.so.5
+lib/libKPimAddressbookImportExport.so.%%KDE_APPLICATIONS_SHLIB_VER%%
+%%QT_MKSPECDIR%%/modules/qt_KAddressbookImportExport.pri
 lib/libkaddressbookprivate.so.5
 lib/libkaddressbookprivate.so.%%KDE_APPLICATIONS_SHLIB_VER%%
 %%QT_PLUGINDIR%%/kaddressbook_config_plugins.so
@@ -91,3 +117,5 @@ share/locale/uk/LC_MESSAGES/kaddressbook.mo
 share/locale/zh_CN/LC_MESSAGES/kaddressbook.mo
 share/locale/zh_TW/LC_MESSAGES/kaddressbook.mo
 share/metainfo/org.kde.kaddressbook.appdata.xml
+share/qlogging-categories5/kaddressbook.categories
+share/qlogging-categories5/kaddressbook.renamecategories