From owner-svn-ports-all@freebsd.org Sun Oct 13 08:41:24 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 1F99EF1CAA; Sun, 13 Oct 2019 08:41:24 +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 46rZsw04Ksz3C9r; Sun, 13 Oct 2019 08:41:24 +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 C0A8E1A64C; Sun, 13 Oct 2019 08:41:23 +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 x9D8fNi8006061; Sun, 13 Oct 2019 08:41:23 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9D8fNxC006059; Sun, 13 Oct 2019 08:41:23 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201910130841.x9D8fNxC006059@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Sun, 13 Oct 2019 08:41:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514373 - 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: 514373 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: Sun, 13 Oct 2019 08:41:24 -0000 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 + $ + + $ +- $ ++ # $ + $ + $ + +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}) + + #------------------------------------------------------------------------------------ +