diff --git a/kde-misc/kdiff3/kdiff3-1.8.5.recipe b/kde-misc/kdiff3/kdiff3-1.9.3.recipe similarity index 93% rename from kde-misc/kdiff3/kdiff3-1.8.5.recipe rename to kde-misc/kdiff3/kdiff3-1.9.3.recipe index f6ddfeeb5..f12c321cf 100644 --- a/kde-misc/kdiff3/kdiff3-1.8.5.recipe +++ b/kde-misc/kdiff3/kdiff3-1.9.3.recipe @@ -13,14 +13,13 @@ DESCRIPTION="KDiff3 is a diff and merge program that: * Automatic merging of version control history ($Log$), * and has an intuitive graphical user interface." HOMEPAGE="https://github.com/KDE/kdiff3/" -COPYRIGHT=" - 2016-2020 Michael Reeves +COPYRIGHT="2016-2020 Michael Reeves 2002-2014 Joachim Eibl " LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/kdiff3/kdiff3-$portVersion.tar.xz" -CHECKSUM_SHA256="bc92f7d04eb123f9c56dbe3047af67bf715240fa99487ac1d1ccf2a45e0854c1" +CHECKSUM_SHA256="317bf5c7e27cba81bce7e1a7a579105443133b633cbb71bc1f169e86a235af9c" SOURCE_DIR="kdiff3-$portVersion" ADDITIONAL_FILES="kdiff3.rdef.in" @@ -41,6 +40,7 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libboost_system$secondaryArchSuffix lib:libKF5Auth$secondaryArchSuffix lib:libKF5Bookmarks$secondaryArchSuffix lib:libKF5Codecs$secondaryArchSuffix @@ -71,7 +71,8 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.77 + extra_cmake_modules$secondaryArchSuffix >= 5.86 + devel:libboost_system$secondaryArchSuffix >= 1.69.0 devel:libKF5Auth$secondaryArchSuffix devel:libKF5Bookmarks$secondaryArchSuffix devel:libKF5Codecs$secondaryArchSuffix @@ -110,10 +111,12 @@ BUILD() { sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt - sed -e '/DocTools/ s/^#*/#/' -i CMakeLists.txt + mkdir -p build cd build + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$prefix \ -DCMAKE_INSTALL_BINDIR=$commandBinDir \ -DSHARE_INSTALL_PREFIX=$dataDir \