From 4075e3befac562ac6e3968ce14b98d01aa72cb14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= Date: Sun, 20 Jul 2025 17:04:38 +0200 Subject: [PATCH] exiv2: fix doc package, cleanup INSTALL() --- media-gfx/exiv2/exiv2-0.27.7.recipe | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/media-gfx/exiv2/exiv2-0.27.7.recipe b/media-gfx/exiv2/exiv2-0.27.7.recipe index d63a34d7b..31639e1d9 100644 --- a/media-gfx/exiv2/exiv2-0.27.7.recipe +++ b/media-gfx/exiv2/exiv2-0.27.7.recipe @@ -7,7 +7,7 @@ COPYRIGHT="2004-2021 Exiv2 authors 2004-2013 Andreas Huggel 2009 Brad Schick" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/Exiv2/exiv2/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="551b1266e3aabd321f6d555dccd776128ee449d5039feafee927a1f33f7a9753" PATCHES="exiv2-$portVersion.patchset" @@ -48,7 +48,11 @@ REQUIRES_tools=" ARCHITECTURES_doc="any" PROVIDES_doc=" - exiv2${secondaryArchSuffix}_doc = $portVersion + exiv2_doc = $portVersion + " + +REPLACES_doc=" + exiv2_x86_doc " BUILD_REQUIRES=" @@ -94,17 +98,10 @@ INSTALL() prepareInstalledDevelLibs libexiv2 libexiv2-xmp fixPkgconfig - if [ -n "$secondaryArchSuffix" ]; then - sed -i 's,\/lib/x86/libexiv2-xmp.a,\/develop/lib/x86/libexiv2-xmp.a,g' \ - $prefix/$relativeLibDir/cmake/exiv2/exiv2Config-release.cmake - sed -i 's,\/include,\/develop/headers/x86,g' \ - $prefix/$relativeLibDir/cmake/exiv2/exiv2Config.cmake - else - sed -i 's,\/lib/libexiv2-xmp.a,\/develop/lib/libexiv2-xmp.a,g' \ - $prefix/$relativeLibDir/cmake/exiv2/exiv2Config-release.cmake - sed -i 's,\/include,\/develop/headers,g' \ - $prefix/$relativeLibDir/cmake/exiv2/exiv2Config.cmake - fi + sed -i "s,\/$relativeLibDir/libexiv2-xmp.a,\/$relativeDevelopLibDir/libexiv2-xmp.a,g" \ + $libDir/cmake/exiv2/exiv2Config-release.cmake + sed -i "s,\/include,\/$relativeIncludeDir,g" \ + $libDir/cmake/exiv2/exiv2Config.cmake packageEntries devel \ $developDir \