git: f946bcf06582 - main - graphics/digikam: Update to 8.3.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 28 Apr 2024 02:03:23 UTC
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=f946bcf06582de9ed34d4e822a0a31bb9c2b116b commit f946bcf06582de9ed34d4e822a0a31bb9c2b116b Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2024-04-27 07:42:31 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2024-04-28 02:02:54 +0000 graphics/digikam: Update to 8.3.0 Unversion the distfiles location. The main application distfiles are already versioned and it is wasteful to user disk space and user/host bandwidth to redownload the very large, seldom-changing neural network data into a separate directory with each update. Add AUTOTAGS option to install data required for automatically tagging images. Non-default, as with the FACEDETECT option, as this would significantly increase the default package size and the files needed for this functionality can still be easily downloaded and used by any individual user locally via a dialog in the program. All of the previously available sound options for the Media Player (OPENAL, PORTAUDIO, and PULSEAUDIO) were removed upstream and are no longer relevant. Remove other unneeded dependencies and in the case of boost, it is only needed at build (headers only). Improve Makefile order more in line to what PHB and, to an extent, what portclippy(1) suggest. https://www.digikam.org/news/2024-03-17-8.3.0_release_announcement/ --- graphics/digikam/Makefile | 89 +- graphics/digikam/distinfo | 44 +- graphics/digikam/files/patch-core_CMakeLists.txt | 11 - .../files/patch-core_app_DigikamCoreTarget.cmake | 25 - .../files/patch-core_cmake_rules_RulesFFmpeg.cmake | 24 + .../patch-core_cmake_rules_RulesKDEFramework.cmake | 14 - ...atch-core_utilities_extrasupport_CMakeLists.txt | 11 - ...ilities_extrasupport_addressbook_CMakeLists.txt | 22 - graphics/digikam/pkg-plist | 1219 +++++++++++++++++++- 9 files changed, 1311 insertions(+), 148 deletions(-) diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index 6d268a886c6a..92a2c555127e 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -1,17 +1,18 @@ PORTNAME= digikam -DISTVERSION= 8.2.0 -PORTREVISION= 4 +DISTVERSION= 8.3.0 +DISTVERSIONSUFFIX= -1 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} \ - https://files.kde.org/digikam/%SUBDIR%/:aesthetic,face,shape \ - https://kde-applicationdata.mirrors.omnilance.com/digikam/%SUBDIR%/:aesthetic,face,shape \ - https://mirrors.ocf.berkeley.edu/kde-applicationdata/digikam/%SUBDIR%/:aesthetic,face,shape + https://files.kde.org/digikam/%SUBDIR%/:aesthetic,autotags,face,shape \ + https://kde-applicationdata.mirrors.omnilance.com/digikam/%SUBDIR%/:aesthetic,autotags,face,shape \ + https://mirrors.ocf.berkeley.edu/kde-applicationdata/digikam/%SUBDIR%/:aesthetic,autotags,face,shape MASTER_SITE_SUBDIR= aestheticdetector/:aesthetic \ + autotags/:autotags \ facesengine/dnnface/:face \ facesengine/shape-predictor/:shape # One bit changed in the naming convention .. DISTFILES= digiKam-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX} -DIST_SUBDIR= KDE/${PORTNAME}/${PORTVERSION} +DIST_SUBDIR= KDE/${PORTNAME} EXTRACT_ONLY= digiKam-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX} MAINTAINER= kde@FreeBSD.org @@ -21,61 +22,65 @@ WWW= https://www.digikam.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= boost-libs>=0:devel/boost-libs LIB_DEPENDS= libKF5Sane.so:graphics/libksane \ - libboost_graph.so:devel/boost-libs \ libexiv2.so:graphics/exiv2 \ libexpat.so:textproc/expat2 \ libgphoto2.so:graphics/libgphoto2 \ - libicalss.so:devel/libical \ libjasper.so:graphics/jasper \ liblcms2.so:graphics/lcms2 \ liblensfun.so:graphics/lensfun \ libopencv_core.so:graphics/opencv \ libheif.so:graphics/libheif \ - libpgf.so:graphics/libpgf \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libx265.so:multimedia/x265 +RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool USES= bison cmake compiler:c++17-lang desktop-file-utils eigen:3 gl \ gnome jpeg kde:5 magick pkgconfig qt:5 \ shebangfix tar:xz xorg -USE_GL= gl glu +USE_GL= opengl glu USE_GNOME= glib20 libxml2 libxslt -USE_KDE= archive auth bookmarks calendarcore codecs completion config \ - configwidgets coreaddons crash doctools filemetadata guiaddons \ - i18n iconthemes itemmodels itemviews jobwidgets \ - kdelibs4support kio libkipi marble notifications notifyconfig \ - parts service solid sonnet textwidgets threadweaver \ - unitconversion widgetsaddons windowsystem xmlgui \ +USE_KDE= auth calendarcore codecs completion config configwidgets \ + coreaddons doctools filemetadata i18n iconthemes jobwidgets \ + kio notifications notifyconfig service solid sonnet \ + threadweaver widgetsaddons windowsystem xmlgui \ ecm:build +USE_LDCONFIG= yes USE_QT= concurrent core dbus declarative gui location network \ - networkauth opengl printsupport sql webchannel webengine \ + networkauth opengl printsupport sql svg webchannel webengine \ widgets x11extras xml xmlpatterns \ buildtools:build qmake:build USE_XORG= ice sm x11 xext -USE_LDCONFIG= yes SHEBANG_FILES= core/data/scripts/digitaglinktree/digitaglinktree -WITH_CCACHE_BUILD= yes - CMAKE_ON= BUILD_WITH_CCACHE DIGIKAMSC_COMPILE_DIGIKAM ENABLE_KFILEMETADATASUPPORT \ CMAKE_DISABLE_FIND_PACKAGE_VAAPI -OPTIONS_DEFINE= FACEDETECT KDEPIM MEDIAPLAYER NLS -OPTIONS_GROUP= MP -MP_DESC= Media player options -OPTIONS_GROUP_MP= OPENAL PORTAUDIO PULSEAUDIO +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} + +PLIST_SUB= SHLIB_VER=${DISTVERSION} + +WITH_CCACHE_BUILD= yes + +OPTIONS_DEFINE= AUTOTAGS FACEDETECT KDEPIM MEDIAPLAYER NLS OPTIONS_MULTI= DB DB_DESC= Database options OPTIONS_MULTI_DB= MYSQL MYSQL_INTERNAL SQLITE3 -OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NFACEDETECT} \ - ${OPTIONS_GROUP_MP:NPORTAUDIO:NPULSEAUDIO} \ +OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NAUTOTAGS:NFACEDETECT} \ ${OPTIONS_MULTI_DB:NMYSQL_INTERNAL} OPTIONS_SUB= yes -FACEDETECT_DESC= Install data required for face detection (~420MB) +AUTOTAGS_DESC= Install data required for autotagging (~436 MiB) +AUTOTAGS_DISTFILES= classification_classes_ILSVRC2012.txt:autotags \ + coco.names:autotags \ + resnet50.onnx:autotags \ + yolov5n_batch_16_s320.onnx:autotags \ + yolov5x_batch_16_s320.onnx:autotags + +FACEDETECT_DESC= Install data required for face detection (~419 MiB) FACEDETECT_DISTFILES= weights_inceptionv3_299.pb:aesthetic \ deploy.prototxt:face \ openface_nn4.small2.v1.t7:face \ @@ -85,14 +90,14 @@ FACEDETECT_DISTFILES= weights_inceptionv3_299.pb:aesthetic \ shapepredictor.dat:shape KDEPIM_DESC= KDEPim Addressbook support -KDEPIM_USE= KDE=akonadi,akonadicontacts,contacts,grantleetheme KDEPIM_USES= grantlee:5 +KDEPIM_USE= KDE=akonadi,akonadicontacts,contacts,grantleetheme,itemmodels KDEPIM_CMAKE_BOOL= ENABLE_AKONADICONTACTSUPPORT MEDIAPLAYER_DESC= Enable media player -MEDIAPLAYER_LIB_DEPENDS= libass.so:multimedia/libass \ - libavcodec.so:multimedia/ffmpeg -MEDIAPLAYER_USE= XORG=xv +MEDIAPLAYER_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ + libvdpau.so:multimedia/libvdpau +MEDIAPLAYER_USE= QT=multimedia XORG=xv MEDIAPLAYER_CMAKE_BOOL= ENABLE_MEDIAPLAYER MEDIAPLAYER_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_FFmpeg @@ -108,25 +113,17 @@ MYSQL_INTERNAL_VARS= IGNORE_WITH_MYSQL="80 81" MYSQL_INTERNAL_IMPLIES= MYSQL NLS_DESC= Digikam i18n translations -NLS_CMAKE_BOOL= DIGIKAMSC_COMPILE_PO -NLS_USES= gettext +NLS_USES= gettext-tools NLS_USE= KDE=i18n - -OPENAL_USES= openal -OPENAL_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenAL -OPENAL_IMPLIES= MEDIAPLAYER - -PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio -PORTAUDIO_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Portaudio -PORTAUDIO_IMPLIES= MEDIAPLAYER - -PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -PULSEAUDIO_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_PulseAudio -PULSEAUDIO_IMPLIES= MEDIAPLAYER +NLS_CMAKE_BOOL= DIGIKAMSC_COMPILE_PO SQLITE3_USE= QT=sql-sqlite3:run -PLIST_SUB= SHLIB_VER=${DISTVERSION} +post-install-AUTOTAGS-on: + @${MKDIR} ${STAGEDIR}${DATADIR}/facesengine +.for f in ${AUTOTAGS_DISTFILES:C/:.*//} + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${f} ${STAGEDIR}${DATADIR}/facesengine +.endfor post-install-FACEDETECT-on: @${MKDIR} ${STAGEDIR}${DATADIR}/facesengine diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo index b8476a8f747e..bb95bedf0a0b 100644 --- a/graphics/digikam/distinfo +++ b/graphics/digikam/distinfo @@ -1,17 +1,27 @@ -TIMESTAMP = 1701611793 -SHA256 (KDE/digikam/8.2.0/digiKam-8.2.0.tar.xz) = 2f7fcb559b123ed9ecae5a5aef6f4560eee5f49206d9d1746dec9ab6c8fb38bf -SIZE (KDE/digikam/8.2.0/digiKam-8.2.0.tar.xz) = 48172600 -SHA256 (KDE/digikam/8.2.0/weights_inceptionv3_299.pb) = 8923e3daff71c07533b9023ef32c69d8c058d1e0931d76d8b81241a201138538 -SIZE (KDE/digikam/8.2.0/weights_inceptionv3_299.pb) = 88007527 -SHA256 (KDE/digikam/8.2.0/deploy.prototxt) = f62621cac923d6f37bd669298c428bb7ee72233b5f8c3389bb893e35ebbcf795 -SIZE (KDE/digikam/8.2.0/deploy.prototxt) = 28092 -SHA256 (KDE/digikam/8.2.0/openface_nn4.small2.v1.t7) = 9b72d54aeb24a64a8135dca8e792f7cc675c99a884a6940350a6cedcf7b7ba08 -SIZE (KDE/digikam/8.2.0/openface_nn4.small2.v1.t7) = 31510785 -SHA256 (KDE/digikam/8.2.0/res10_300x300_ssd_iter_140000_fp16.caffemodel) = 510ffd2471bd81e3fcc88a5beb4eae4fb445ccf8333ebc54e7302b83f4158a76 -SIZE (KDE/digikam/8.2.0/res10_300x300_ssd_iter_140000_fp16.caffemodel) = 5351047 -SHA256 (KDE/digikam/8.2.0/yolov3-face.cfg) = f6563bd6923fd6500d2c2d6025f32ebdba916a85e5c9798351d916909f62aaf5 -SIZE (KDE/digikam/8.2.0/yolov3-face.cfg) = 8334 -SHA256 (KDE/digikam/8.2.0/yolov3-wider_16000.weights) = a88f3b3882e3cce1e553a81d42beef6202cb9afc3db88e7944f9ffbcc369e7df -SIZE (KDE/digikam/8.2.0/yolov3-wider_16000.weights) = 246305388 -SHA256 (KDE/digikam/8.2.0/shapepredictor.dat) = 6f3d2a59dc30c7c9166983224dcf5732b25de734fff1e36ff1f3047ef90ed82b -SIZE (KDE/digikam/8.2.0/shapepredictor.dat) = 67740572 +TIMESTAMP = 1714199752 +SHA256 (KDE/digikam/digiKam-8.3.0-1.tar.xz) = 05b145ff7f2f2005fa21bc579c152ab23c8191b678ff2944c8f0406d6b9de6d8 +SIZE (KDE/digikam/digiKam-8.3.0-1.tar.xz) = 55664168 +SHA256 (KDE/digikam/classification_classes_ILSVRC2012.txt) = 4eb3da435cf544e4a6f390f62c84cb9c9bb68cf8b14e97f8a063452382e5efd2 +SIZE (KDE/digikam/classification_classes_ILSVRC2012.txt) = 21675 +SHA256 (KDE/digikam/coco.names) = 634a1132eb33f8091d60f2c346ababe8b905ae08387037aed883953b7329af84 +SIZE (KDE/digikam/coco.names) = 625 +SHA256 (KDE/digikam/resnet50.onnx) = 490e2761519cbf8a4433f880c2aa16b457730085cf9a8aab1e43d82bcadba4f1 +SIZE (KDE/digikam/resnet50.onnx) = 102146365 +SHA256 (KDE/digikam/yolov5n_batch_16_s320.onnx) = 43cf201144e6918354892a2fda7ccb07b3df1abc136ddac3b5c968dffc847009 +SIZE (KDE/digikam/yolov5n_batch_16_s320.onnx) = 7616008 +SHA256 (KDE/digikam/yolov5x_batch_16_s320.onnx) = e56b5024e6d29f8a35dbfbdd67bbdb69593fb67bfb275915081f9a463fcd355b +SIZE (KDE/digikam/yolov5x_batch_16_s320.onnx) = 347010839 +SHA256 (KDE/digikam/weights_inceptionv3_299.pb) = 8923e3daff71c07533b9023ef32c69d8c058d1e0931d76d8b81241a201138538 +SIZE (KDE/digikam/weights_inceptionv3_299.pb) = 88007527 +SHA256 (KDE/digikam/deploy.prototxt) = f62621cac923d6f37bd669298c428bb7ee72233b5f8c3389bb893e35ebbcf795 +SIZE (KDE/digikam/deploy.prototxt) = 28092 +SHA256 (KDE/digikam/openface_nn4.small2.v1.t7) = 9b72d54aeb24a64a8135dca8e792f7cc675c99a884a6940350a6cedcf7b7ba08 +SIZE (KDE/digikam/openface_nn4.small2.v1.t7) = 31510785 +SHA256 (KDE/digikam/res10_300x300_ssd_iter_140000_fp16.caffemodel) = 510ffd2471bd81e3fcc88a5beb4eae4fb445ccf8333ebc54e7302b83f4158a76 +SIZE (KDE/digikam/res10_300x300_ssd_iter_140000_fp16.caffemodel) = 5351047 +SHA256 (KDE/digikam/yolov3-face.cfg) = f6563bd6923fd6500d2c2d6025f32ebdba916a85e5c9798351d916909f62aaf5 +SIZE (KDE/digikam/yolov3-face.cfg) = 8334 +SHA256 (KDE/digikam/yolov3-wider_16000.weights) = a88f3b3882e3cce1e553a81d42beef6202cb9afc3db88e7944f9ffbcc369e7df +SIZE (KDE/digikam/yolov3-wider_16000.weights) = 246305388 +SHA256 (KDE/digikam/shapepredictor.dat) = 6f3d2a59dc30c7c9166983224dcf5732b25de734fff1e36ff1f3047ef90ed82b +SIZE (KDE/digikam/shapepredictor.dat) = 67740572 diff --git a/graphics/digikam/files/patch-core_CMakeLists.txt b/graphics/digikam/files/patch-core_CMakeLists.txt deleted file mode 100644 index dfde33d77e4c..000000000000 --- a/graphics/digikam/files/patch-core_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- core/CMakeLists.txt.orig 2023-11-29 09:52:21 UTC -+++ core/CMakeLists.txt -@@ -270,7 +270,7 @@ PRINT_OPTIONAL_LIBRARY_STATUS("flex" "htt - PRINT_OPTIONAL_LIBRARY_STATUS("doxygen" "https://github.com/doxygen/doxygen" "(version >= 1.8.0)" "digiKam will be compiled without API documentation building support." Doxygen_FOUND) - PRINT_OPTIONAL_LIBRARY_STATUS("ccache" "https://ccache.dev" "(version >= 3.0.0)" "digiKam will be compiled without CCACHE build support." HAVE_CCACHE) - PRINT_OPTIONAL_LIBRARY_STATUS("flex" "https://github.com/westes/flex" "(version >= 2.5.0)" "digiKam will be compiled without Panorama support." FLEX_FOUND) --PRINT_OPTIONAL_LIBRARY_STATUS("libakonadicontact" "https://invent.kde.org/pim/akonadi-contacts" "(version >= ${AKONADI_MIN_VERSION})" "digiKam will be compiled without KDE desktop address book support." KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) -+PRINT_OPTIONAL_LIBRARY_STATUS("libakonadicontact" "https://invent.kde.org/pim/akonadi-contacts" "(version >= ${AKONADI_MIN_VERSION})" "digiKam will be compiled without KDE desktop address book support." KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) - PRINT_OPTIONAL_LIBRARY_STATUS("libimagemagick" "https://github.com/ImageMagick/ImageMagick.git" "(version >= 6.7.0)" "digiKam will be compiled without ImageMagick codecs." HAVE_IMAGE_MAGICK) - PRINT_OPTIONAL_LIBRARY_STATUS("libeigen3" "https://github.com/eigenteam/eigen-git-mirror" "(version >= 3.0.0)" "digiKam will be compiled without Refocus tool support." Eigen3_FOUND) - PRINT_OPTIONAL_LIBRARY_STATUS("libgphoto2" "https://github.com/gphoto/libgphoto2" "(version >= 2.4.0)" "digiKam will be compiled without GPhoto2 camera drivers support." Gphoto2_FOUND) diff --git a/graphics/digikam/files/patch-core_app_DigikamCoreTarget.cmake b/graphics/digikam/files/patch-core_app_DigikamCoreTarget.cmake deleted file mode 100644 index 999d5ef739b5..000000000000 --- a/graphics/digikam/files/patch-core_app_DigikamCoreTarget.cmake +++ /dev/null @@ -1,25 +0,0 @@ ---- core/app/DigikamCoreTarget.cmake.orig 2023-11-29 09:52:21 UTC -+++ core/app/DigikamCoreTarget.cmake -@@ -81,7 +81,7 @@ endif() - - endif() - --if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) -+if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) - - set(DIGIKAMCORE_OBJECTS - ${DIGIKAMCORE_OBJECTS} -@@ -395,11 +395,11 @@ endif() - - endif() - --if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) -+if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) - - target_link_libraries(digikamcore - PRIVATE -- KF${QT_VERSION_MAJOR}::AkonadiContact -+ KPim${QT_VERSION_MAJOR}::AkonadiContact - ) - - endif() diff --git a/graphics/digikam/files/patch-core_cmake_rules_RulesFFmpeg.cmake b/graphics/digikam/files/patch-core_cmake_rules_RulesFFmpeg.cmake new file mode 100644 index 000000000000..5b7418618d73 --- /dev/null +++ b/graphics/digikam/files/patch-core_cmake_rules_RulesFFmpeg.cmake @@ -0,0 +1,24 @@ +FFmpeg is only needed for the optional Media Player. Don't try to find it +otherwise. RulesFFmpeg was split out from RulesMediaPlayer in [1], but was +not blocked in the ENABLE_MEDIAPLAYER conditional that it was previously +under, making FFmpeg unconditionally required. + +[1] https://invent.kde.org/graphics/digikam/-/commit/44da06a0b008eb4030ae59e57c11a1341c157c8c + +--- core/cmake/rules/RulesFFmpeg.cmake.orig 2024-03-16 04:40:45 UTC ++++ core/cmake/rules/RulesFFmpeg.cmake +@@ -4,6 +4,8 @@ + # SPDX-License-Identifier: BSD-3-Clause + # + ++if(ENABLE_MEDIAPLAYER) ++ + find_package(FFmpeg REQUIRED COMPONENTS AVCODEC + AVDEVICE + AVFILTER +@@ -105,3 +107,5 @@ endif() + ) + + endif() ++ ++endif(ENABLE_MEDIAPLAYER) diff --git a/graphics/digikam/files/patch-core_cmake_rules_RulesKDEFramework.cmake b/graphics/digikam/files/patch-core_cmake_rules_RulesKDEFramework.cmake deleted file mode 100644 index d5e97aea888b..000000000000 --- a/graphics/digikam/files/patch-core_cmake_rules_RulesKDEFramework.cmake +++ /dev/null @@ -1,14 +0,0 @@ ---- core/cmake/rules/RulesKDEFramework.cmake.orig 2023-11-29 09:52:21 UTC -+++ core/cmake/rules/RulesKDEFramework.cmake -@@ -40,9 +40,9 @@ if(ENABLE_AKONADICONTACTSUPPORT) - find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET - OPTIONAL_COMPONENTS - Akonadi -- AkonadiContact # For KDE Mail Contacts support. -- Contacts # API for contacts/address book data. - ) -+ find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} QUIET) -+ find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} QUIET) - - endif() - diff --git a/graphics/digikam/files/patch-core_utilities_extrasupport_CMakeLists.txt b/graphics/digikam/files/patch-core_utilities_extrasupport_CMakeLists.txt deleted file mode 100644 index a341301aad83..000000000000 --- a/graphics/digikam/files/patch-core_utilities_extrasupport_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- core/utilities/extrasupport/CMakeLists.txt.orig 2023-11-29 09:52:21 UTC -+++ core/utilities/extrasupport/CMakeLists.txt -@@ -4,7 +4,7 @@ - # SPDX-License-Identifier: BSD-3-Clause - # - --if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) -+if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) - add_subdirectory(addressbook) - endif() - diff --git a/graphics/digikam/files/patch-core_utilities_extrasupport_addressbook_CMakeLists.txt b/graphics/digikam/files/patch-core_utilities_extrasupport_addressbook_CMakeLists.txt deleted file mode 100644 index b63cac11c675..000000000000 --- a/graphics/digikam/files/patch-core_utilities_extrasupport_addressbook_CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ ---- core/utilities/extrasupport/addressbook/CMakeLists.txt.orig 2023-11-29 09:52:21 UTC -+++ core/utilities/extrasupport/addressbook/CMakeLists.txt -@@ -14,7 +14,7 @@ include_directories($<TARGET_PROPERTY:Qt${QT_VERSION_M - $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::I18n,INTERFACE_INCLUDE_DIRECTORIES> - ) - --if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) -+if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) - include_directories( - $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::AkonadiCore,INTERFACE_INCLUDE_DIRECTORIES> - $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::Contacts,INTERFACE_INCLUDE_DIRECTORIES> -@@ -35,7 +35,7 @@ target_link_libraries(akonadiiface PRIVATE Qt${QT_VERS - - target_link_libraries(akonadiiface PRIVATE Qt${QT_VERSION_MAJOR}::Core KF${QT_VERSION_MAJOR}::I18n) - --if(KF${QT_VERSION_MAJOR}AkonadiContact_FOUND) -- target_include_directories(core_akonadiiface_obj PRIVATE $<TARGET_PROPERTY:KF${QT_VERSION_MAJOR}::AkonadiContact,INTERFACE_INCLUDE_DIRECTORIES>) -- target_link_libraries(akonadiiface PRIVATE KF${QT_VERSION_MAJOR}::AkonadiContact KF${QT_VERSION_MAJOR}::Contacts) -+if(KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND) -+ target_include_directories(core_akonadiiface_obj PRIVATE $<TARGET_PROPERTY:KPim${QT_VERSION_MAJOR}::AkonadiContact,INTERFACE_INCLUDE_DIRECTORIES>) -+ target_link_libraries(akonadiiface PRIVATE KPim${QT_VERSION_MAJOR}::AkonadiContact KF${QT_VERSION_MAJOR}::Contacts) - endif() diff --git a/graphics/digikam/pkg-plist b/graphics/digikam/pkg-plist index 3d851786e854..6c3ecf6d012d 100644 --- a/graphics/digikam/pkg-plist +++ b/graphics/digikam/pkg-plist @@ -123,7 +123,9 @@ lib/libdigikamdatabase.so.%%SHLIB_VER%% lib/libdigikamgui.so lib/libdigikamgui.so.%%SHLIB_VER%% %%QT_PLUGINDIR%%/digikam/bqm/Bqm_AntiVignetting_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_ApplyMetadata_Plugin.so %%QT_PLUGINDIR%%/digikam/bqm/Bqm_AssignLabels_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_AssignTags_Plugin.so %%QT_PLUGINDIR%%/digikam/bqm/Bqm_AssignTemplate_Plugin.so %%QT_PLUGINDIR%%/digikam/bqm/Bqm_Assigncaptions_Plugin.so %%QT_PLUGINDIR%%/digikam/bqm/Bqm_AutoCorrection_Plugin.so @@ -259,13 +261,29 @@ lib/libdigikamgui.so.%%SHLIB_VER%% %%MEDIAPLAYER%%%%QT_PLUGINDIR%%/digikam/generic/Generic_VideoSlideShow_Plugin.so %%QT_PLUGINDIR%%/digikam/generic/Generic_Wallpaper_Plugin.so %%QT_PLUGINDIR%%/digikam/generic/Generic_iNaturalist_Plugin.so +%%QT_PLUGINDIR%%/digikam/marble/AtmospherePlugin.so +%%QT_PLUGINDIR%%/digikam/marble/CachePlugin.so +%%QT_PLUGINDIR%%/digikam/marble/CompassFloatItem.so +%%QT_PLUGINDIR%%/digikam/marble/CrosshairsPlugin.so +%%QT_PLUGINDIR%%/digikam/marble/GpsbabelPlugin.so +%%QT_PLUGINDIR%%/digikam/marble/GpxPlugin.so +%%QT_PLUGINDIR%%/digikam/marble/GraticulePlugin.so +%%QT_PLUGINDIR%%/digikam/marble/JsonPlugin.so +%%QT_PLUGINDIR%%/digikam/marble/KmlPlugin.so +%%QT_PLUGINDIR%%/digikam/marble/MapScaleFloatItem.so +%%QT_PLUGINDIR%%/digikam/marble/MeasureTool.so +%%QT_PLUGINDIR%%/digikam/marble/NavigationFloatItem.so +%%QT_PLUGINDIR%%/digikam/marble/NominatimReverseGeocodingPlugin.so +%%QT_PLUGINDIR%%/digikam/marble/OsmPlugin.so +%%QT_PLUGINDIR%%/digikam/marble/OverviewMap.so +%%QT_PLUGINDIR%%/digikam/marble/Pn2Plugin.so +%%QT_PLUGINDIR%%/digikam/marble/PntPlugin.so +%%QT_PLUGINDIR%%/digikam/marble/ProgressFloatItem.so %%QT_PLUGINDIR%%/digikam/rawimport/RawImport_ART_Plugin.so %%QT_PLUGINDIR%%/digikam/rawimport/RawImport_DarkTable_Plugin.so %%QT_PLUGINDIR%%/digikam/rawimport/RawImport_Native_Plugin.so %%QT_PLUGINDIR%%/digikam/rawimport/RawImport_RawTherapee_Plugin.so %%QT_PLUGINDIR%%/digikam/rawimport/RawImport_UFRaw_Plugin.so -share/man/man1/cleanup_digikamdb.1.gz -share/man/man1/digitaglinktree.1.gz share/applications/org.kde.digikam.desktop share/applications/org.kde.showfoto.desktop %%DATADIR%%/about/css/bootstrap-theme.min.css @@ -364,18 +382,24 @@ share/applications/org.kde.showfoto.desktop %%DATADIR%%/data/stone-texture.png %%DATADIR%%/data/target.png %%DATADIR%%/data/togglemouseover.png +%%DATADIR%%/data/video-digikam.mp4 %%DATADIR%%/data/wall-pattern.png %%DATADIR%%/data/wall-texture.png %%DATADIR%%/data/wood-pattern.png %%DATADIR%%/database/dbconfig.xml %%DATADIR%%/database/mysql-global.conf +%%AUTOTAGS%%%%DATADIR%%/facesengine/classification_classes_ILSVRC2012.txt +%%AUTOTAGS%%%%DATADIR%%/facesengine/coco.names %%FACEDETECT%%%%DATADIR%%/facesengine/deploy.prototxt %%FACEDETECT%%%%DATADIR%%/facesengine/openface_nn4.small2.v1.t7 %%FACEDETECT%%%%DATADIR%%/facesengine/res10_300x300_ssd_iter_140000_fp16.caffemodel +%%AUTOTAGS%%%%DATADIR%%/facesengine/resnet50.onnx %%FACEDETECT%%%%DATADIR%%/facesengine/shapepredictor.dat %%FACEDETECT%%%%DATADIR%%/facesengine/weights_inceptionv3_299.pb %%FACEDETECT%%%%DATADIR%%/facesengine/yolov3-face.cfg %%FACEDETECT%%%%DATADIR%%/facesengine/yolov3-wider_16000.weights +%%AUTOTAGS%%%%DATADIR%%/facesengine/yolov5n_batch_16_s320.onnx +%%AUTOTAGS%%%%DATADIR%%/facesengine/yolov5x_batch_16_s320.onnx %%DATADIR%%/geoiface/backend-googlemaps-js.js %%DATADIR%%/geoiface/backend-googlemaps.html %%DATADIR%%/geoiface/cluster-circle-00ff00-selected.png @@ -412,6 +436,1195 @@ share/applications/org.kde.showfoto.desktop %%DATADIR%%/geolocationedit/bookmarks-marker.png %%DATADIR%%/geolocationedit/searchmarker-normal.png %%DATADIR%%/geolocationedit/searchmarker-selected.png +%%DATADIR%%/marble/bitmaps/airport.png +%%DATADIR%%/marble/bitmaps/annotation.png +%%DATADIR%%/marble/bitmaps/antarctic_shelves.png +%%DATADIR%%/marble/bitmaps/bookmark.png +%%DATADIR%%/marble/bitmaps/border_1.png +%%DATADIR%%/marble/bitmaps/border_2.png +%%DATADIR%%/marble/bitmaps/border_disputed.png +%%DATADIR%%/marble/bitmaps/border_maritime.png +%%DATADIR%%/marble/bitmaps/city_1_orange.png +%%DATADIR%%/marble/bitmaps/city_1_red.png +%%DATADIR%%/marble/bitmaps/city_1_white.png +%%DATADIR%%/marble/bitmaps/city_1_yellow.png +%%DATADIR%%/marble/bitmaps/city_2_orange.png +%%DATADIR%%/marble/bitmaps/city_2_red.png +%%DATADIR%%/marble/bitmaps/city_2_white.png +%%DATADIR%%/marble/bitmaps/city_2_yellow.png +%%DATADIR%%/marble/bitmaps/city_3_orange.png +%%DATADIR%%/marble/bitmaps/city_3_red.png +%%DATADIR%%/marble/bitmaps/city_3_white.png +%%DATADIR%%/marble/bitmaps/city_3_yellow.png +%%DATADIR%%/marble/bitmaps/city_4_orange.png +%%DATADIR%%/marble/bitmaps/city_4_red.png +%%DATADIR%%/marble/bitmaps/city_4_white.png +%%DATADIR%%/marble/bitmaps/city_4_yellow.png +%%DATADIR%%/marble/bitmaps/coordinate.png +%%DATADIR%%/marble/bitmaps/crater.png +%%DATADIR%%/marble/bitmaps/cursor_bc.png +%%DATADIR%%/marble/bitmaps/cursor_bl.png +%%DATADIR%%/marble/bitmaps/cursor_br.png +%%DATADIR%%/marble/bitmaps/cursor_cl.png +%%DATADIR%%/marble/bitmaps/cursor_cr.png +%%DATADIR%%/marble/bitmaps/cursor_tc.png +%%DATADIR%%/marble/bitmaps/cursor_tl.png +%%DATADIR%%/marble/bitmaps/cursor_tr.png +%%DATADIR%%/marble/bitmaps/default_location.png +%%DATADIR%%/marble/bitmaps/earth_apollo.jpg +%%DATADIR%%/marble/bitmaps/editarrows/arrow-diagonal-topleft-active.png +%%DATADIR%%/marble/bitmaps/editarrows/arrow-diagonal-topleft.png +%%DATADIR%%/marble/bitmaps/editarrows/arrow-diagonal-topright-active.png +%%DATADIR%%/marble/bitmaps/editarrows/arrow-diagonal-topright.png +%%DATADIR%%/marble/bitmaps/editarrows/arrow-horizontal-active.png +%%DATADIR%%/marble/bitmaps/editarrows/arrow-horizontal.png +%%DATADIR%%/marble/bitmaps/editarrows/arrow-rotation-bottomleft-active.png +%%DATADIR%%/marble/bitmaps/editarrows/arrow-rotation-bottomleft.png +%%DATADIR%%/marble/bitmaps/editarrows/arrow-rotation-bottomright-active.png +%%DATADIR%%/marble/bitmaps/editarrows/arrow-rotation-bottomright.png +%%DATADIR%%/marble/bitmaps/editarrows/arrow-rotation-topleft-active.png +%%DATADIR%%/marble/bitmaps/editarrows/arrow-rotation-topleft.png +%%DATADIR%%/marble/bitmaps/editarrows/arrow-rotation-topright-active.png +%%DATADIR%%/marble/bitmaps/editarrows/arrow-rotation-topright.png +%%DATADIR%%/marble/bitmaps/editarrows/arrow-vertical-active.png +%%DATADIR%%/marble/bitmaps/editarrows/arrow-vertical.png +%%DATADIR%%/marble/bitmaps/folder.png +%%DATADIR%%/marble/bitmaps/glacier.png +%%DATADIR%%/marble/bitmaps/highway_footway.png +%%DATADIR%%/marble/bitmaps/highway_motorway.png +%%DATADIR%%/marble/bitmaps/highway_path.png +%%DATADIR%%/marble/bitmaps/highway_primary.png +%%DATADIR%%/marble/bitmaps/highway_secondary.png +%%DATADIR%%/marble/bitmaps/highway_tertiary.png +%%DATADIR%%/marble/bitmaps/highway_track.png +%%DATADIR%%/marble/bitmaps/highway_trunk.png +%%DATADIR%%/marble/bitmaps/highway_unclassified.png +%%DATADIR%%/marble/bitmaps/lake.png +%%DATADIR%%/marble/bitmaps/lake_historic.png +%%DATADIR%%/marble/bitmaps/manned_landing.png +%%DATADIR%%/marble/bitmaps/mountain_1.png +%%DATADIR%%/marble/bitmaps/nation.png +%%DATADIR%%/marble/bitmaps/notes_closed.png +%%DATADIR%%/marble/bitmaps/notes_open.png +%%DATADIR%%/marble/bitmaps/observatory.png +%%DATADIR%%/marble/bitmaps/ocean.png +%%DATADIR%%/marble/bitmaps/osm.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/allotments.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/beach.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/cliff.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/cliff2.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/danger.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/embankment.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/forest.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/glacier.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/grave_yard_christian.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/grave_yard_generic.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/grave_yard_jewish.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/grey_vertical_hatch.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/ice.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/military_red_hatch.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/orchard.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/quarry.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/rock_overlay.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/scree_overlay.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/scrub.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/vineyard.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/wetland.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/wetland_bog.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/wetland_mangrove.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/wetland_marsh.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/wetland_reed.png +%%DATADIR%%/marble/bitmaps/osmcarto/patterns/wetland_swamp.png +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_10x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_10x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_10x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_10x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_11x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_11x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_11x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_11x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_1x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_1x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_1x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_1x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_2x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_2x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_2x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_2x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_3x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_3x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_3x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_3x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_4x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_4x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_4x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_4x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_5x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_5x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_5x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_5x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_6x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_6x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_6x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_6x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_7x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_7x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_7x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_7x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_8x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_8x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_8x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_8x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_9x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_9x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_9x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/motorway_9x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_10x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_10x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_10x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_10x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_11x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_11x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_11x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_11x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_1x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_1x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_1x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_1x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_2x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_2x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_2x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_2x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_3x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_3x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_3x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_3x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_4x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_4x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_4x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_4x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_5x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_5x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_5x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_5x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_6x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_6x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_6x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_6x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_7x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_7x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_7x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_7x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_8x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_8x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_8x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_8x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_9x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_9x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_9x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/primary_9x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_10x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_10x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_10x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_10x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_11x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_11x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_11x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_11x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_1x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_1x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_1x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_1x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_2x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_2x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_2x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_2x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_3x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_3x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_3x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_3x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_4x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_4x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_4x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_4x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_5x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_5x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_5x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_5x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_6x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_6x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_6x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_6x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_7x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_7x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_7x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_7x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_8x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_8x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_8x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_8x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_9x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_9x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_9x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/secondary_9x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_10x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_10x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_10x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_10x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_11x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_11x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_11x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_11x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_1x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_1x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_1x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_1x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_2x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_2x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_2x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_2x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_3x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_3x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_3x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_3x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_4x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_4x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_4x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_4x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_5x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_5x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_5x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_5x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_6x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_6x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_6x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_6x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_7x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_7x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_7x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_7x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_8x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_8x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_8x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_8x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_9x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_9x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_9x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/tertiary_9x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_10x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_10x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_10x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_10x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_11x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_11x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_11x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_11x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_1x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_1x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_1x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_1x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_2x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_2x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_2x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_2x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_3x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_3x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_3x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_3x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_4x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_4x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_4x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_4x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_5x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_5x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_5x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_5x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_6x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_6x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_6x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_6x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_7x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_7x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_7x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_7x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_8x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_8x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_8x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_8x4.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_9x1.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_9x2.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_9x3.svg +%%DATADIR%%/marble/bitmaps/osmcarto/shields/svg/trunk_9x4.svg +%%DATADIR%%/marble/bitmaps/other.png +%%DATADIR%%/marble/bitmaps/playa.png +%%DATADIR%%/marble/bitmaps/pole_1.png +%%DATADIR%%/marble/bitmaps/pole_2.png +%%DATADIR%%/marble/bitmaps/redflag_22.png +%%DATADIR%%/marble/bitmaps/redflag_32.png +%%DATADIR%%/marble/bitmaps/river.png +%%DATADIR%%/marble/bitmaps/robotic_rover.png +%%DATADIR%%/marble/bitmaps/satellite.png +%%DATADIR%%/marble/bitmaps/shadowframe.png +%%DATADIR%%/marble/bitmaps/shipwreck.png +%%DATADIR%%/marble/bitmaps/stars/star_0_blue.png +%%DATADIR%%/marble/bitmaps/stars/star_0_bluewhite.png +%%DATADIR%%/marble/bitmaps/stars/star_0_garnetred.png +%%DATADIR%%/marble/bitmaps/stars/star_0_orange.png +%%DATADIR%%/marble/bitmaps/stars/star_0_red.png +%%DATADIR%%/marble/bitmaps/stars/star_0_white.png +%%DATADIR%%/marble/bitmaps/stars/star_0_yellow.png +%%DATADIR%%/marble/bitmaps/stars/star_3_blue.png +%%DATADIR%%/marble/bitmaps/stars/star_3_bluewhite.png +%%DATADIR%%/marble/bitmaps/stars/star_3_garnetred.png +%%DATADIR%%/marble/bitmaps/stars/star_3_orange.png +%%DATADIR%%/marble/bitmaps/stars/star_3_red.png +%%DATADIR%%/marble/bitmaps/stars/star_3_white.png +%%DATADIR%%/marble/bitmaps/stars/star_3_yellow.png +%%DATADIR%%/marble/bitmaps/unmanned_hard_landing.png +%%DATADIR%%/marble/bitmaps/unmanned_soft_landing.png +%%DATADIR%%/marble/bitmaps/urban_area.png +%%DATADIR%%/marble/bitmaps/valley.png +%%DATADIR%%/marble/bitmaps/volcano_1.png +%%DATADIR%%/marble/bitmaps/waypoint.png +%%DATADIR%%/marble/bitmaps/wikipedia.png +%%DATADIR%%/marble/flags/flag_ad.svg +%%DATADIR%%/marble/flags/flag_ae.svg +%%DATADIR%%/marble/flags/flag_af.svg +%%DATADIR%%/marble/flags/flag_ag.svg +%%DATADIR%%/marble/flags/flag_ai.svg +%%DATADIR%%/marble/flags/flag_al.svg +%%DATADIR%%/marble/flags/flag_am.svg +%%DATADIR%%/marble/flags/flag_an.svg +%%DATADIR%%/marble/flags/flag_ao.svg +%%DATADIR%%/marble/flags/flag_aq.svg +%%DATADIR%%/marble/flags/flag_ar.svg +%%DATADIR%%/marble/flags/flag_as.svg +%%DATADIR%%/marble/flags/flag_at.svg +%%DATADIR%%/marble/flags/flag_au.svg +%%DATADIR%%/marble/flags/flag_aw.svg +%%DATADIR%%/marble/flags/flag_ax.svg +%%DATADIR%%/marble/flags/flag_az.svg +%%DATADIR%%/marble/flags/flag_ba.svg +%%DATADIR%%/marble/flags/flag_bb.svg +%%DATADIR%%/marble/flags/flag_bd.svg +%%DATADIR%%/marble/flags/flag_be.svg +%%DATADIR%%/marble/flags/flag_bf.svg +%%DATADIR%%/marble/flags/flag_bg.svg +%%DATADIR%%/marble/flags/flag_bh.svg +%%DATADIR%%/marble/flags/flag_bi.svg +%%DATADIR%%/marble/flags/flag_bj.svg +%%DATADIR%%/marble/flags/flag_bm.svg +%%DATADIR%%/marble/flags/flag_bn.svg +%%DATADIR%%/marble/flags/flag_bo.svg +%%DATADIR%%/marble/flags/flag_br.svg +%%DATADIR%%/marble/flags/flag_bs.svg +%%DATADIR%%/marble/flags/flag_bt.svg +%%DATADIR%%/marble/flags/flag_bv.svg +%%DATADIR%%/marble/flags/flag_bw.svg +%%DATADIR%%/marble/flags/flag_by.svg +%%DATADIR%%/marble/flags/flag_bz.svg +%%DATADIR%%/marble/flags/flag_ca.svg +%%DATADIR%%/marble/flags/flag_cc.svg +%%DATADIR%%/marble/flags/flag_cd.svg +%%DATADIR%%/marble/flags/flag_cf.svg +%%DATADIR%%/marble/flags/flag_cg.svg +%%DATADIR%%/marble/flags/flag_ch.svg +%%DATADIR%%/marble/flags/flag_ci.svg +%%DATADIR%%/marble/flags/flag_ck.svg +%%DATADIR%%/marble/flags/flag_cl.svg +%%DATADIR%%/marble/flags/flag_cm.svg +%%DATADIR%%/marble/flags/flag_cn.svg +%%DATADIR%%/marble/flags/flag_co.svg +%%DATADIR%%/marble/flags/flag_cr.svg +%%DATADIR%%/marble/flags/flag_cu.svg +%%DATADIR%%/marble/flags/flag_cv.svg +%%DATADIR%%/marble/flags/flag_cx.svg +%%DATADIR%%/marble/flags/flag_cy.svg +%%DATADIR%%/marble/flags/flag_cz.svg +%%DATADIR%%/marble/flags/flag_de.svg +%%DATADIR%%/marble/flags/flag_dj.svg +%%DATADIR%%/marble/flags/flag_dk.svg +%%DATADIR%%/marble/flags/flag_dm.svg +%%DATADIR%%/marble/flags/flag_do.svg +%%DATADIR%%/marble/flags/flag_dz.svg +%%DATADIR%%/marble/flags/flag_ec.svg +%%DATADIR%%/marble/flags/flag_ee.svg +%%DATADIR%%/marble/flags/flag_eg.svg +%%DATADIR%%/marble/flags/flag_eh.svg +%%DATADIR%%/marble/flags/flag_er.svg +%%DATADIR%%/marble/flags/flag_es.svg +%%DATADIR%%/marble/flags/flag_et.svg +%%DATADIR%%/marble/flags/flag_fi.svg +%%DATADIR%%/marble/flags/flag_fj.svg +%%DATADIR%%/marble/flags/flag_fk.svg +%%DATADIR%%/marble/flags/flag_fm.svg +%%DATADIR%%/marble/flags/flag_fo.svg +%%DATADIR%%/marble/flags/flag_fr.svg +%%DATADIR%%/marble/flags/flag_ga.svg +%%DATADIR%%/marble/flags/flag_gb.svg +%%DATADIR%%/marble/flags/flag_gd.svg +%%DATADIR%%/marble/flags/flag_ge.svg +%%DATADIR%%/marble/flags/flag_gf.svg +%%DATADIR%%/marble/flags/flag_gg.svg +%%DATADIR%%/marble/flags/flag_gh.svg +%%DATADIR%%/marble/flags/flag_gi.svg +%%DATADIR%%/marble/flags/flag_gl.svg +%%DATADIR%%/marble/flags/flag_gm.svg +%%DATADIR%%/marble/flags/flag_gn.svg +%%DATADIR%%/marble/flags/flag_gp.svg +%%DATADIR%%/marble/flags/flag_gq.svg +%%DATADIR%%/marble/flags/flag_gr.svg +%%DATADIR%%/marble/flags/flag_gs.svg +%%DATADIR%%/marble/flags/flag_gt.svg +%%DATADIR%%/marble/flags/flag_gu.svg +%%DATADIR%%/marble/flags/flag_gw.svg +%%DATADIR%%/marble/flags/flag_gy.svg +%%DATADIR%%/marble/flags/flag_hk.svg +%%DATADIR%%/marble/flags/flag_hm.svg +%%DATADIR%%/marble/flags/flag_hn.svg +%%DATADIR%%/marble/flags/flag_hr.svg +%%DATADIR%%/marble/flags/flag_ht.svg +%%DATADIR%%/marble/flags/flag_hu.svg +%%DATADIR%%/marble/flags/flag_id.svg +%%DATADIR%%/marble/flags/flag_ie.svg +%%DATADIR%%/marble/flags/flag_il.svg +%%DATADIR%%/marble/flags/flag_im.svg +%%DATADIR%%/marble/flags/flag_in.svg +%%DATADIR%%/marble/flags/flag_io.svg +%%DATADIR%%/marble/flags/flag_iq.svg +%%DATADIR%%/marble/flags/flag_ir.svg +%%DATADIR%%/marble/flags/flag_is.svg +%%DATADIR%%/marble/flags/flag_it.svg +%%DATADIR%%/marble/flags/flag_je.svg +%%DATADIR%%/marble/flags/flag_jm.svg +%%DATADIR%%/marble/flags/flag_jo.svg +%%DATADIR%%/marble/flags/flag_jp.svg +%%DATADIR%%/marble/flags/flag_ke.svg +%%DATADIR%%/marble/flags/flag_kg.svg +%%DATADIR%%/marble/flags/flag_kh.svg +%%DATADIR%%/marble/flags/flag_ki.svg +%%DATADIR%%/marble/flags/flag_km.svg +%%DATADIR%%/marble/flags/flag_kn.svg +%%DATADIR%%/marble/flags/flag_kp.svg +%%DATADIR%%/marble/flags/flag_kr.svg +%%DATADIR%%/marble/flags/flag_kw.svg +%%DATADIR%%/marble/flags/flag_ky.svg +%%DATADIR%%/marble/flags/flag_kz.svg +%%DATADIR%%/marble/flags/flag_la.svg +%%DATADIR%%/marble/flags/flag_lb.svg +%%DATADIR%%/marble/flags/flag_lc.svg +%%DATADIR%%/marble/flags/flag_li.svg +%%DATADIR%%/marble/flags/flag_lk.svg +%%DATADIR%%/marble/flags/flag_lr.svg +%%DATADIR%%/marble/flags/flag_ls.svg +%%DATADIR%%/marble/flags/flag_lt.svg +%%DATADIR%%/marble/flags/flag_lu.svg +%%DATADIR%%/marble/flags/flag_lv.svg +%%DATADIR%%/marble/flags/flag_ly.svg +%%DATADIR%%/marble/flags/flag_ma.svg +%%DATADIR%%/marble/flags/flag_mc.svg +%%DATADIR%%/marble/flags/flag_md.svg +%%DATADIR%%/marble/flags/flag_me.svg +%%DATADIR%%/marble/flags/flag_mg.svg +%%DATADIR%%/marble/flags/flag_mh.svg +%%DATADIR%%/marble/flags/flag_mk.svg +%%DATADIR%%/marble/flags/flag_ml.svg +%%DATADIR%%/marble/flags/flag_mm.svg +%%DATADIR%%/marble/flags/flag_mn.svg +%%DATADIR%%/marble/flags/flag_mo.svg +%%DATADIR%%/marble/flags/flag_mp.svg +%%DATADIR%%/marble/flags/flag_mq.svg +%%DATADIR%%/marble/flags/flag_mr.svg +%%DATADIR%%/marble/flags/flag_ms.svg +%%DATADIR%%/marble/flags/flag_mt.svg +%%DATADIR%%/marble/flags/flag_mu.svg +%%DATADIR%%/marble/flags/flag_mv.svg +%%DATADIR%%/marble/flags/flag_mw.svg +%%DATADIR%%/marble/flags/flag_mx.svg +%%DATADIR%%/marble/flags/flag_my.svg +%%DATADIR%%/marble/flags/flag_mz.svg *** 694 LINES SKIPPED ***