mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

graphics/digikam: update to 6.0.0

Browse Source 
Announcement: https://www.digikam.org/news/2019-02-10-6.0.0_release_announcement/
This commit is contained in:
Tobias C. Berner 2019-03-08 22:47:54 +00:00
parent 8b09e03920
commit 20042ce290
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=495084
11 changed files with 229 additions and 1681 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
graphics/digikam/Makefile
View File

@ -1,10 +1,9 @@
# $FreeBSD$
PORTNAME= digikam
DISTVERSION= 5.9.0
PORTREVISION= 8
DISTVERSION= 6.0.0
CATEGORIES= graphics kde
MASTER_SITES= KDE/stable/${PORTNAME}
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}
DIST_SUBDIR= KDE/digikam/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
@ -30,17 +29,18 @@ LIB_DEPENDS= libKF5KGeoMap.so:astro/libkgeomap \
libpng.so:graphics/png \
libtiff.so:graphics/tiff
USES= cmake compiler:c++11-lib eigen:3 jpeg kde:5 pkgconfig \
qt:5 shebangfix tar:xz
USES= bison cmake compiler:c++11-lib desktop-file-utils eigen:3 gl jpeg \
kde:5 pkgconfig qt:5 shebangfix tar:xz
USE_GL= gl glu
USE_GNOME= glib20 libxml2 libxslt
USE_KDE= archive auth bookmarks calendarcore codecs completion config \
configwidgets coreaddons crash doctools ecm filemetadata \
guiaddons i18n iconthemes itemviews jobwidgets kdelibs4support \
guiaddons i18n iconthemes itemmodels itemviews jobwidgets kdelibs4support \
kio marble libkipi notifications notifyconfig parts service \
solid sonnet textwidgets threadweaver unitconversion \
widgetsaddons windowsystem xmlgui
USE_QT= concurrent core dbus gui network opengl printsupport sql \
webkit widgets x11extras xml \
widgets x11extras xml xmlpatterns \
sql-sqlite3_run \
buildtools_build qmake_build
USE_XORG= ice sm x11 xext
@ -53,8 +53,8 @@ SHEBANG_FILES= core/data/scripts/digitaglinktree/digitaglinktree
CMAKE_ON= DIGIKAMSC_COMPILE_DIGIKAM ENABLE_OPENCV3
CMAKE_OFF= DIGIKAMSC_COMPILE_KIPIPLUGINS
OPTIONS_DEFINE= DOCS MULTIMEDIA MYSQL NLS
OPTIONS_DEFAULT= ${OPTIONS_DEFINE}
OPTIONS_DEFINE= DOCS DOXYGEN KDEPIM KVKONTAKTE MEDIAWIKI MEDIAPLAYER MYSQL NLS WEBENGINE
OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NWEBENGINE}
OPTIONS_SUB= yes
DOCS_DESC= Digikam documentation
@ -62,11 +62,20 @@ DOCS_CMAKE_BOOL= DIGIKAMSC_COMPILE_DOC
DOCS_USES= gettext
DOCS_USE= KDE=doctools
MULTIMEDIA_DESC= Multimedia support
MULTIMEDIA_CMAKE_BOOL= ENABLE_MEDIAPLAYER
MULTIMEDIA_LIB_DEPENDS= libQtAV.so:multimedia/QtAV
DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
DOXYGEN_IMPLIES= DOCS
KDEPIM_DESC= KDEPim Addressbook support
KDEPIM_USE= KDE=akonadi,akonadicontacts,contacts
KDEPIM_CMAKE_BOOL= ENABLE_AKONADICONTACTSUPPORT
KDEPIM_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_KF5AkonadiContact
MEDIAPLAYER_DESC= Enable mediaplayer
MEDIAPLAYER_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \
libQtAV.so:multimedia/QtAV
MEDIAPLAYER_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_FFmpeg \
CMAKE_DISABLE_FIND_PACKAGE_QtAV
MYSQL_USES= qt:5
MYSQL_USE= MYSQL=server QT=sql-mysql_run
MYSQL_CMAKE_BOOL= ENABLE_INTERNALMYSQL \
ENABLE_MYSQLSUPPORT
@ -74,11 +83,24 @@ MYSQL_CMAKE_ON= -DMYSQLD_PATH:PATH=${LOCALBASE}/libexec \
-DMYSQL_TOOLS_PATH:PATH=${LOCALBASE}/bin
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
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_USE= QT=webengine
WEBENGINE_USE_OFF= QT=webkit
WEBENGINE_CMAKE_BOOL= ENABLE_WEBENGINE
PLIST_SUB= SHLIB_VER=${DISTVERSION}
post-extract:

6
graphics/digikam/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1523649938
SHA256 (KDE/digikam/5.9.0/digikam-5.9.0.tar.xz) = 660d32eedcfd6fe1a75170a651fab068ae62f7f092ae710771a2f32a1c550d1b
SIZE (KDE/digikam/5.9.0/digikam-5.9.0.tar.xz) = 132931184
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

6
graphics/digikam/files/patch-core_CMakeLists.txt
View File

@ -1,6 +1,6 @@
--- core/CMakeLists.txt.orig 2016-11-06 10:43:00 UTC
--- core/CMakeLists.txt.orig 2019-02-10 22:44:01 UTC
+++ core/CMakeLists.txt
@@ -314,6 +314,11 @@ endif()
@@ -389,6 +389,11 @@ endif()
find_package(Doxygen)
find_package(Lqr-1)
@ -10,5 +10,5 @@
+ link_directories(${LQR-1_LIBDIR})
+endif()
# -- libgphoto2 rules --------------------------------------------------------------------------
# -- libgphoto2 rules ----------------------------------------------------------

10
graphics/digikam/files/patch-core_app_CMakeLists.txt
View File

@ -1,10 +0,0 @@
--- core/app/CMakeLists.txt.orig 2016-11-06 10:43:01 UTC
+++ core/app/CMakeLists.txt
@@ -151,6 +151,7 @@ target_link_libraries(digikamcore
libdng
libraw
+ kvm
)
if(ENABLE_DBUS)

4
graphics/digikam/files/patch-core_app_utils_digikam__version.h.cmake.in
View File

@ -1,4 +1,4 @@
--- core/app/utils/digikam_version.h.cmake.in.orig 2018-06-16 08:50:14 UTC
--- core/app/utils/digikam_version.h.cmake.in.orig 2019-02-10 22:44:01 UTC
+++ core/app/utils/digikam_version.h.cmake.in
@@ -34,7 +34,7 @@
@ -6,6 +6,6 @@
-#include "gitversion.h"
+#define GITVERSION ""
#include "daboutdata.h"
namespace Digikam
{

20
graphics/digikam/files/patch-core_libs_CMakeLists.txt
View File

@ -1,20 +0,0 @@
Move models up before the other subdirs that depend on them.
--- core/libs/CMakeLists.txt.orig 2017-07-29 18:36:36.642660000 +0200
+++ core/libs/CMakeLists.txt 2017-07-29 18:37:55.886981000 +0200
@@ -57,6 +57,7 @@
add_subdirectory(dimg)
add_subdirectory(dmetadata)
+add_subdirectory(models)
add_subdirectory(database)
add_subdirectory(dngwriter)
add_subdirectory(dtrash)
@@ -71,7 +72,6 @@
add_subdirectory(threads)
add_subdirectory(versionmanager)
add_subdirectory(notificationmanager)
-add_subdirectory(models)
add_subdirectory(template)
add_subdirectory(dialogs)
add_subdirectory(kmemoryinfo)

24
graphics/digikam/files/patch-core_libs_kmemoryinfo_kmemoryinfo__backend.cpp
View File

@ -1,24 +0,0 @@
--- core/libs/kmemoryinfo/kmemoryinfo_backend.cpp.orig 2016-11-06 10:43:01 UTC
+++ core/libs/kmemoryinfo/kmemoryinfo_backend.cpp
@@ -117,7 +117,7 @@ kvm_t* sg_get_kvm()
return kvmd;
}
- kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL);
+ kvmd = kvm_openfiles(NULL, "/dev/null", NULL, O_RDONLY, NULL);
if (kvmd == NULL)
{
@@ -219,9 +219,9 @@ int get_mem_stats(Digikam::KMemoryInfo::
int mib[2];
u_long physmem;
size_t size;
- u_long free_count;
- u_long cache_count;
- u_long inactive_count;
+ u_int free_count;
+ u_int cache_count;
+ u_int inactive_count;
int pagesize;
#endif // defined(Q_OS_FREEBSD) || defined(Q_OS_DFBSD)

11
graphics/digikam/files/patch-core_libs_pgfutils_PGFplatform.h
View File

@ -1,11 +0,0 @@
--- core/libs/pgfutils/PGFplatform.h.orig 2016-11-06 10:43:01 UTC
+++ core/libs/pgfutils/PGFplatform.h
@@ -485,7 +485,7 @@ __inline int MulDiv(int nNumber, int nNu
#define FSFromStart SEEK_SET
#define FSFromCurrent SEEK_CUR
#define FSFromEnd SEEK_END
-#define nullptr NULL
+
//-------------------------------------------------------------------------------
// IO Error constants

11
graphics/digikam/files/patch-extra_kipi-plugins_common_libkipiplugins_tools_kpversion.cpp
View File

@ -1,11 +0,0 @@
--- extra/kipi-plugins/common/libkipiplugins/tools/kpversion.cpp.orig 2018-06-16 09:09:44 UTC
+++ extra/kipi-plugins/common/libkipiplugins/tools/kpversion.cpp
@@ -21,7 +21,7 @@
* ============================================================ */
#include "kpversion.h"
-#include "gitversion.h"
+#define GITVERSION ""
namespace pluginsVersion {

58
graphics/digikam/files/patch-git_f4e9887 Normal file
View File

@ -0,0 +1,58 @@
From f4e988761fec7d7a75c2789e752b5419b4a84213 Mon Sep 17 00:00:00 2001
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Date: Fri, 2 Nov 2018 13:15:41 +0100
Subject: [PATCH] Don't redefine nulltpr on FreeBSD
FreeBSDs `/usr/include/sys/_null.h` defines
```
[...]
#if __cplusplus >= 201103L
#define NULL nullptr
[...]
```
This leads to compilation errors:
```
core/libs/dimg/loaders/pgfloader.cpp:295:27: error: use of undeclared identifier 'NULL'
NULL,
^
/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL'
#define NULL nullptr
^
core/libs/pgfutils/libpgf/PGFplatform.h:488:20: note: expanded from macro 'nullptr'
#define nullptr NULL
^
core/libs/dimg/loaders/pgfloader.cpp:455:26: error: use of undeclared identifier 'NULL'
NULL,
^
/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL'
#define NULL nullptr
^
core/libs/pgfutils/libpgf/PGFplatform.h:488:20: note: expanded from macro 'nullptr'
#define nullptr NULL
^
2 errors generated.
ninja: build stopped: subcommand failed.
```
---
core/libs/pgfutils/libpgf/PGFplatform.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/core/libs/pgfutils/libpgf/PGFplatform.h b/core/libs/pgfutils/libpgf/PGFplatform.h
index ee803c36f4..e8df6d99ba 100644
--- core/libs/pgfutils/libpgf/PGFplatform.h
+++ core/libs/pgfutils/libpgf/PGFplatform.h
@@ -485,7 +485,9 @@ __inline int MulDiv(int nNumber, int nNumerator, int nDenominator) {
#define FSFromStart SEEK_SET
#define FSFromCurrent SEEK_CUR
#define FSFromEnd SEEK_END
+#if !(defined(__FreeBSD__) && (__cplusplus >= 201103L))
#define nullptr NULL
+#endif
//-------------------------------------------------------------------------------
// IO Error constants
--
2.19.1

1712
graphics/digikam/pkg-plist
View File

File diff suppressed because it is too large Load Diff