From owner-svn-ports-all@freebsd.org Sat Aug 31 11:19:26 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EABE6CE3FC; Sat, 31 Aug 2019 11:19:26 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46LDQ65zFWz4Mc8; Sat, 31 Aug 2019 11:19:26 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 96DDC18073; Sat, 31 Aug 2019 11:19:26 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7VBJQD1020805; Sat, 31 Aug 2019 11:19:26 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7VBJPgB020799; Sat, 31 Aug 2019 11:19:25 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201908311119.x7VBJPgB020799@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Sat, 31 Aug 2019 11:19:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510364 - in head/graphics/digikam: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/graphics/digikam: . files X-SVN-Commit-Revision: 510364 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Aug 2019 11:19:27 -0000 Author: adridg Date: Sat Aug 31 11:19:25 2019 New Revision: 510364 URL: https://svnweb.freebsd.org/changeset/ports/510364 Log: Update graphics/digikam to latest upstream release, 6.2.0 This version (a) builds with current KDE Frameworks (b) doesn't need kipiplugins, because upstream moved away from them and we just moved/renamed them anyway. PR: 239950 Reported by: pkg-fallout. Robert Cina Added: head/graphics/digikam/files/patch-CMakeLists.txt (contents, props changed) Deleted: head/graphics/digikam/files/patch-doc-translated_CMakeLists.txt Modified: head/graphics/digikam/Makefile head/graphics/digikam/distinfo head/graphics/digikam/files/patch-core_CMakeLists.txt head/graphics/digikam/pkg-plist Modified: head/graphics/digikam/Makefile ============================================================================== --- head/graphics/digikam/Makefile Sat Aug 31 11:19:18 2019 (r510363) +++ head/graphics/digikam/Makefile Sat Aug 31 11:19:25 2019 (r510364) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= digikam -DISTVERSION= 6.0.0 -PORTREVISION= 6 +DISTVERSION= 6.2.0 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= KDE/digikam/${PORTVERSION} @@ -51,10 +50,9 @@ SHEBANG_FILES= core/data/scripts/digitaglinktree/digit # Disable kipiplugins, as they are built in their own port: graphics/kipiplugins. # Remember to keep that port in sync with this one. -CMAKE_ON= DIGIKAMSC_COMPILE_DIGIKAM ENABLE_OPENCV3 -CMAKE_OFF= DIGIKAMSC_COMPILE_KIPIPLUGINS +CMAKE_ON= DIGIKAMSC_COMPILE_DIGIKAM -OPTIONS_DEFINE= DOCS DOXYGEN KDEPIM KVKONTAKTE MEDIAWIKI MEDIAPLAYER MYSQL NLS WEBENGINE +OPTIONS_DEFINE= DOCS DOXYGEN KDEPIM KVKONTAKTE MEDIAPLAYER MYSQL NLS WEBENGINE OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NWEBENGINE} OPTIONS_SUB= yes @@ -85,22 +83,18 @@ MYSQL_CMAKE_ON= -DMYSQLD_PATH:PATH=${LOCALBASE}/libex MYSQL_BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER} KVKONTAKTE_DESC= vk.com Plugin -KVKONTAKTE_CMAKE_BOOL= DIGIKAMSC_COMPILE_LIBKVKONTAKTE KVKONTAKTE_LIB_DEPENDS= libKF5Vkontakte.so:net/libkvkontakte +KVKONTAKTE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_KF5Vkontakte -MEDIAWIKI_DESC= MediaWiki Plugin -MEDIAWIKI_CMAKE_BOOL= DIGIKAMSC_COMPILE_LIBMEDIAWIKI -MEDIAWIKI_LIB_DEPENDS= libKF5MediaWiki.so:net/libmediawiki - NLS_DESC= Digikam i18n translations NLS_CMAKE_BOOL= DIGIKAMSC_COMPILE_PO NLS_USES= gettext NLS_USE= KDE=i18n -WEBENGINE_DESC= Use Qt WebEngine to render contents instead of WebKit +WEBENGINE_DESC= Use Qt WebEngine instead of WebKit WEBENGINE_USE= QT=webengine WEBENGINE_USE_OFF= QT=webkit -WEBENGINE_CMAKE_BOOL= ENABLE_WEBENGINE +WEBENGINE_CMAKE_BOOL= ENABLE_QWEBENGINE PLIST_SUB= SHLIB_VER=${DISTVERSION} Modified: head/graphics/digikam/distinfo ============================================================================== --- head/graphics/digikam/distinfo Sat Aug 31 11:19:18 2019 (r510363) +++ head/graphics/digikam/distinfo Sat Aug 31 11:19:25 2019 (r510364) @@ -1,3 +1,3 @@ -TIMESTAMP = 1550639456 -SHA256 (KDE/digikam/6.0.0/digikam-6.0.0.tar.xz) = 6e4f0ee52772ea2baef38fc9b96f18ca10f165f0c5bda71d8161a4eded26fb47 -SIZE (KDE/digikam/6.0.0/digikam-6.0.0.tar.xz) = 331386500 +TIMESTAMP = 1566159606 +SHA256 (KDE/digikam/6.2.0/digikam-6.2.0.tar.xz) = 28762ea0f03a82e3b2473c0682a358c9b83f5013aec827dd5ab6556a1f29baeb +SIZE (KDE/digikam/6.2.0/digikam-6.2.0.tar.xz) = 339472960 Added: head/graphics/digikam/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/digikam/files/patch-CMakeLists.txt Sat Aug 31 11:19:25 2019 (r510364) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2019-08-30 21:55:44 UTC ++++ CMakeLists.txt +@@ -14,6 +14,8 @@ set(ECM_MIN_VERSION "1.5.0") + + cmake_minimum_required(VERSION ${CMAKE_MIN_VERSION}) + ++cmake_policy(SET CMP0063 OLD) # Suppress visibility warnings ++ + ############## ECM setup ################################################################################################################# + + find_package(ECM ${ECM_MIN_VERSION} CONFIG REQUIRED) Modified: head/graphics/digikam/files/patch-core_CMakeLists.txt ============================================================================== --- head/graphics/digikam/files/patch-core_CMakeLists.txt Sat Aug 31 11:19:18 2019 (r510363) +++ head/graphics/digikam/files/patch-core_CMakeLists.txt Sat Aug 31 11:19:25 2019 (r510364) @@ -1,6 +1,14 @@ ---- core/CMakeLists.txt.orig 2019-02-10 22:44:01 UTC +--- core/CMakeLists.txt.orig 2019-07-31 16:12:57 UTC +++ core/CMakeLists.txt -@@ -389,6 +389,11 @@ endif() +@@ -8,6 +8,7 @@ + + project(digikam) + ++cmake_policy(SET CMP0063 OLD) # Suppress visibility warnings + message(STATUS "----------------------------------------------------------------------------------") + message(STATUS "Starting CMake configuration for: ${PROJECT_NAME}") + +@@ -401,6 +402,11 @@ endif() find_package(Doxygen) find_package(Lqr-1) Modified: head/graphics/digikam/pkg-plist ============================================================================== --- head/graphics/digikam/pkg-plist Sat Aug 31 11:19:18 2019 (r510363) +++ head/graphics/digikam/pkg-plist Sat Aug 31 11:19:25 2019 (r510364) @@ -2,12 +2,150 @@ bin/cleanup_digikamdb bin/digikam bin/digitaglinktree bin/showfoto +include/digikam/digikam_core_export.h +include/digikam/digikam_database_export.h +include/digikam/digikam_export.h +include/digikam/dinfointerface.h +include/digikam/ditemslist.h +include/digikam/dmetainfoiface.h +include/digikam/dplugin.h +include/digikam/dpluginaction.h +include/digikam/dpluginauthor.h +include/digikam/dplugindialog.h +include/digikam/dplugineditor.h +include/digikam/dplugingeneric.h +include/digikam/dpreviewimage.h +include/digikam/dpreviewmanager.h +include/digikam/dsavesettingswidget.h +include/digikam/dwizarddlg.h +include/digikam/dwizardpage.h +lib/cmake/digikam/DigikamCoreConfig-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/digikam/DigikamCoreConfig.cmake +lib/cmake/digikam/DigikamDatabaseConfig-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/digikam/DigikamDatabaseConfig.cmake +lib/cmake/digikam/DigikamGuiConfig-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/digikam/DigikamGuiConfig.cmake lib/libdigikamcore.so lib/libdigikamcore.so.%%SHLIB_VER%% lib/libdigikamdatabase.so 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_AssignTemplate_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_AutoCorrection_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_BWconvert_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_BcgCorrection_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_Blur_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_Border_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_ChannelMixer_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_ColorBalance_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_ColorFX_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_Convert16To8_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_Convert8To16_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_ConvertToDNG_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_ConvertToJP2lugin_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_ConvertToJPEG_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_ConvertToPGF_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_ConvertToPNG_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_ConvertToTIFF_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_Crop_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_CurvesAdjust_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_FilmGrain_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_Flip_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_HslCorrection_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_IccConvert_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_Invert_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_LensAutoFix_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_LocalContrast_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_NoiseReduction_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_RedEyeCorrection_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_RemoveMetadata_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_Resize_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_Restoration_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_Rotate_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_Sharpen_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_TimeAdjust_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_UserScript_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_WaterMark_Plugin.so +%%QT_PLUGINDIR%%/digikam/bqm/Bqm_WhiteBalance_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_AdjustCurvesTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_AdjustLevelsTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_AntivignettingTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_AutoCorrectionTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_AutoCropTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_BWSepiaTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_BcgTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_BlurFxTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_BlurTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_BorderTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_CBTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_ChannelMixerTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_CharcoalTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_ColorFxTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_ContentAwareResizeTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_Convert16To8Tool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_Convert8To16Tool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_DistortionFxTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_EmbossTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_FilmGrainTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_FilmTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_FreeRotationTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_HSLTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_HotpixelsTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_InsertTextTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_InvertTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_LensAutoFixTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_LensDistortionTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_LocalContrastTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_NoiseReductionTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_OilPaintTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_PerspectiveTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_PrintTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_ProfileConversionTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_RainDropTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_RatioCropTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_RedEyeTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_ResizeTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_RestorationTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_SharpenTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_ShearTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_TextureTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/editor/Editor_WhiteBalanceTool_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_Box_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_Calendar_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_DigitalScanner_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_DropBox_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_ExpoBlending_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_FaceBook_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_FileCopy_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_FileTransfer_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_Flickr_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_GLViewer_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_GeolocationEdit_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_Google_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_HtmlGallery_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_ImageShack_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_ImgUr_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_IpFs_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_JAlbum_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_MediaServer_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_MediaWiki_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_MetadataEdit_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_OneDrive_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_Panorama_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_Pinterest_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_Piwigo_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_Presentation_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_PrintCreator_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_Rajce_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_SendByMail_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_SmugMug_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_TimeAdjust_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_Twitter_Plugin.so +%%KVKONTAKTE%%%%QT_PLUGINDIR%%/digikam/generic/Generic_VKontakte_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_Wallpaper_Plugin.so +%%QT_PLUGINDIR%%/digikam/generic/Generic_YandexFotki_Plugin.so man/man1/cleanup_digikamdb.1.gz man/man1/digitaglinktree.1.gz share/applications/org.kde.digikam.desktop