Date: Sun, 13 Oct 2019 08:41:23 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514373 - in head/graphics/digikam: . files Message-ID: <201910130841.x9D8fNxC006059@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adridg Date: Sun Oct 13 08:41:23 2019 New Revision: 514373 URL: https://svnweb.freebsd.org/changeset/ports/514373 Log: Try to fix runtime graphics/digikam. With this patch applied to git master, digikam starts and seems to work. It still crashes on exit, though. That's an improvement on crashes-before-startup. The problem is described in the patch and in the PR: digikam bundles all kinds of stuff (which packagers have been complaining about for years) which breaks -- in this case, bundling internals of Exiv2. If this works (leaving the PR open) it will need an MFH. PR: 240466 Added: head/graphics/digikam/files/patch-remove-libxmp (contents, props changed) Modified: head/graphics/digikam/Makefile Modified: head/graphics/digikam/Makefile ============================================================================== --- head/graphics/digikam/Makefile Sun Oct 13 08:01:39 2019 (r514372) +++ head/graphics/digikam/Makefile Sun Oct 13 08:41:23 2019 (r514373) @@ -2,6 +2,7 @@ PORTNAME= digikam DISTVERSION= 6.3.0 +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= KDE/digikam/${PORTVERSION} Added: head/graphics/digikam/files/patch-remove-libxmp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/digikam/files/patch-remove-libxmp Sun Oct 13 08:41:23 2019 (r514373) @@ -0,0 +1,33 @@ +Digikam bundles libxmp. Since this is already in Exiv2, we end up +with two copies of a bunch of symbols, and when Digikam loads +both libraries, and it then initializes Exiv2, that in turn calls +into the *wrong* copy of libxmp. + +Just remove the bundled copy. + +diff --git core/app/DigikamCoreTarget.cmake core/app/DigikamCoreTarget.cmake +index bf8c9f09e7..53284724b4 100644 +--- core/app/DigikamCoreTarget.cmake ++++ core/app/DigikamCoreTarget.cmake +@@ -24,7 +24,7 @@ set(DIGIKAMCORE_OBJECTS + $<TARGET_OBJECTS:libwso2_src> + + $<TARGET_OBJECTS:libmd5_src> +- $<TARGET_OBJECTS:libxmp_src> ++ # $<TARGET_OBJECTS:libxmp_src> + $<TARGET_OBJECTS:libdng_src> + $<TARGET_OBJECTS:dngwriter_src> + +diff --git core/libs/dngwriter/CMakeLists.txt core/libs/dngwriter/CMakeLists.txt +index dc28a9c865..dc83173b37 100644 +--- core/libs/dngwriter/CMakeLists.txt ++++ core/libs/dngwriter/CMakeLists.txt +@@ -66,7 +66,7 @@ foreach(_currentfile ${libxmp_SRCS}) + endif() + endforeach() + +-add_library(libxmp_src OBJECT ${libxmp_SRCS}) ++# add_library(libxmp_src OBJECT ${libxmp_SRCS}) + + #------------------------------------------------------------------------------------ +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910130841.x9D8fNxC006059>