From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 518E6139117 for ; Thu, 14 Nov 2019 15:59:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6FC9DE087E; Thu, 14 Nov 2019 15:59:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B78CE087E for ; Thu, 14 Nov 2019 15:59:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 09E7234CDBB for ; Thu, 14 Nov 2019 15:59:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 16A968AB for ; Thu, 14 Nov 2019 15:59:54 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1573747175.74f4ec456198c500f81f8294da29b1a2f9daee71.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/, media-gfx/exiv2/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/exiv2/exiv2-0.27.2.ebuild media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch X-VCS-Directories: media-gfx/exiv2/ media-gfx/exiv2/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 74f4ec456198c500f81f8294da29b1a2f9daee71 X-VCS-Branch: master Date: Thu, 14 Nov 2019 15:59:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 72204c55-8d72-4038-bce4-1523e9b92f6d X-Archives-Hash: 7fa006fbe8bb5e256d52e62f377fe662 commit: 74f4ec456198c500f81f8294da29b1a2f9daee71 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Nov 14 14:08:25 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Nov 14 15:59:35 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74f4ec45 media-gfx/exiv2: Fix build against >=net-libs/libssh-0.9.2 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/exiv2/exiv2-0.27.2.ebuild | 2 + .../exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch | 56 ++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/media-gfx/exiv2/exiv2-0.27.2.ebuild b/media-gfx/exiv2/exiv2-0.27.2.ebuild index e70d4f902f1..3d6060c5535 100644 --- a/media-gfx/exiv2/exiv2-0.27.2.ebuild +++ b/media-gfx/exiv2/exiv2-0.27.2.ebuild @@ -45,6 +45,8 @@ RDEPEND="${DEPEND}" DOCS=( README.md doc/ChangeLog doc/cmd.txt ) +PATCHES=( "${FILESDIR}/${P}-libssh-0.9.2.patch" ) + S="${S}-Source" pkg_setup() { diff --git a/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch b/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch new file mode 100644 index 00000000000..abf165b83f4 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch @@ -0,0 +1,56 @@ +From c59eb810728572fde84492d43a932dcac89746d6 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 14 Nov 2019 15:06:38 +0100 +Subject: [PATCH] EXIV2_ENABLE_SSH: Fix compatibility with >=libssh-0.9.2 + +0.9.1 remains broken regardless and is beyond fixing in this place. + +Build-tested with both libssh 0.9.0 and 0.9.2. + +Solution copied from KDE's kio-extras commit 24506c2af8d1904a99538543804306c6c2b81ca2 +--- + cmake/findDependencies.cmake | 13 +++++++++++-- + src/CMakeLists.txt | 3 +-- + 2 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake +index a458a0c9..ec3a43f5 100644 +--- a/cmake/findDependencies.cmake ++++ b/cmake/findDependencies.cmake +@@ -26,8 +26,17 @@ if( EXIV2_ENABLE_WEBREADY ) + + if( EXIV2_ENABLE_SSH ) + find_package(libssh CONFIG REQUIRED) +- endif( ) +-endif( ) ++ # Define an imported target to have compatibility with <=libssh-0.9.0 ++ # libssh-0.9.1 is broken regardless. ++ if(NOT TARGET ssh) ++ add_library(ssh SHARED IMPORTED) ++ set_target_properties(ssh PROPERTIES ++ IMPORTED_LOCATION "${LIBSSH_LIBRARIES}" ++ INTERFACE_INCLUDE_DIRECTORIES "${LIBSSH_INCLUDE_DIR}" ++ ) ++ endif() ++ endif() ++endif() + + if (EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP) + message(FATAL_ERROR "EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP are mutually exclusive. You can only choose one of them") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 27f8dbb1..bdd83fa0 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -173,8 +173,7 @@ target_include_directories(exiv2lib_int PUBLIC + if (EXIV2_ENABLE_WEBREADY) + + if( EXIV2_ENABLE_SSH ) +- target_include_directories(exiv2lib SYSTEM PUBLIC ${LIBSSH_INCLUDE_DIR}) +- target_link_libraries(exiv2lib PUBLIC ${LIBSSH_LIBRARIES}) ++ target_link_libraries(exiv2lib PUBLIC ssh) + endif() + + if( EXIV2_ENABLE_CURL ) +-- +2.24.0 +