diff --git a/kde-misc/kdiff3/kdiff3-1.10.7.recipe b/kde-misc/kdiff3/kdiff3-1.10.7.recipe deleted file mode 100644 index 38c33ec0a..000000000 --- a/kde-misc/kdiff3/kdiff3-1.10.7.recipe +++ /dev/null @@ -1,149 +0,0 @@ -SUMMARY="A diff and merge tool" -DESCRIPTION="KDiff3 is a diff and merge program that: - -* compares or merges two or three text input files or directories, -* shows the differences line by line and character by character (!), -* provides an automatic merge-facility and -* an integrated editor for comfortable solving of merge-conflicts, -* supports Unicode, UTF-8 and other codecs, autodetection via byte-order-mark \ -'BOM' -* supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.), -* Printing of differences, -* Manual alignment of lines, -* Automatic merging of version control history ($Log$), -* and has an intuitive graphical user interface." -HOMEPAGE="https://github.com/KDE/kdiff3/" -COPYRIGHT="2016-2024 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="ba3f4acbf4ac748aebefc85f59caf653d45fe859a48c34af89918224a767c5e3" -SOURCE_DIR="kdiff3-$portVersion" -ADDITIONAL_FILES="kdiff3.rdef.in" - -ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - -commandSuffix=$secondaryArchSuffix -commandBinDir=$binDir -if [ "$targetArchitecture" = x86_gcc2 ]; then - commandSuffix= - commandBinDir=$prefix/bin -fi - -PROVIDES=" - kdiff3$secondaryArchSuffix = $portVersion - app:KDiff3 = $portVersion - cmd:kdiff3$commandSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libboost_system$secondaryArchSuffix - lib:libKF5Auth$secondaryArchSuffix - lib:libKF5Bookmarks$secondaryArchSuffix - lib:libKF5Codecs$secondaryArchSuffix - lib:libKF5Completion$secondaryArchSuffix - lib:libKF5ConfigCore$secondaryArchSuffix - lib:libKF5ConfigWidgets$secondaryArchSuffix - lib:libKF5CoreAddons$secondaryArchSuffix - lib:libKF5Crash$secondaryArchSuffix - lib:libKF5DocTools$secondaryArchSuffix - lib:libKF5I18n$secondaryArchSuffix - lib:libKF5IconThemes$secondaryArchSuffix - lib:libKF5ItemViews$secondaryArchSuffix - lib:libKF5JobWidgets$secondaryArchSuffix - lib:libKF5KIOCore$secondaryArchSuffix - lib:libKF5Parts$secondaryArchSuffix - lib:libKF5Service$secondaryArchSuffix - lib:libKF5Solid$secondaryArchSuffix - lib:libKF5SonnetCore$secondaryArchSuffix - lib:libKF5TextWidgets$secondaryArchSuffix - lib:libKF5WidgetsAddons$secondaryArchSuffix - lib:libKF5WindowSystem$secondaryArchSuffix - lib:libKF5XmlGui$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix - lib:libQt5Gui$secondaryArchSuffix - lib:libQt5PrintSupport$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix - devel:libboost_system$secondaryArchSuffix >= 1.83.0 - devel:libKF5Auth$secondaryArchSuffix - devel:libKF5Bookmarks$secondaryArchSuffix - devel:libKF5Codecs$secondaryArchSuffix - devel:libKF5Completion$secondaryArchSuffix - devel:libKF5ConfigCore$secondaryArchSuffix - devel:libKF5ConfigWidgets$secondaryArchSuffix - devel:libKF5CoreAddons$secondaryArchSuffix - devel:libKF5Crash$secondaryArchSuffix - devel:libKF5DocTools$secondaryArchSuffix - devel:libKF5I18n$secondaryArchSuffix - devel:libKF5IconThemes$secondaryArchSuffix - devel:libKF5ItemViews$secondaryArchSuffix - devel:libKF5JobWidgets$secondaryArchSuffix - devel:libKF5KIOCore$secondaryArchSuffix - devel:libKF5Parts$secondaryArchSuffix - devel:libKF5Service$secondaryArchSuffix - devel:libKF5Solid$secondaryArchSuffix - devel:libKF5SonnetCore$secondaryArchSuffix - devel:libKF5TextWidgets$secondaryArchSuffix - devel:libKF5WidgetsAddons$secondaryArchSuffix - devel:libKF5WindowSystem$secondaryArchSuffix - devel:libKF5XmlGui$secondaryArchSuffix - devel:libQt5Core$secondaryArchSuffix - devel:libQt5Gui$secondaryArchSuffix - devel:libQt5PrintSupport$secondaryArchSuffix - devel:libQt5Widgets$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:g++$secondaryArchSuffix - cmd:lrelease$secondaryArchSuffix >= 5 - cmd:make - " - -BUILD() -{ - sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt - sed -e '/kdoctools_install(po)/ 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 \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ - -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 - - make $jobArgs -} - -INSTALL() -{ - cd build - make install - - local APP_SIGNATURE="application/x-vnd.qt5-kdiff3" - local MAJOR="`echo "$portVersion" | cut -d. -f1`" - local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="`echo "$portVersion" | cut -d. -f3`" - local LONG_INFO="$SUMMARY" - sed \ - -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ - -e "s|@MAJOR@|$MAJOR|" \ - -e "s|@MIDDLE@|$MIDDLE|" \ - -e "s|@MINOR@|$MINOR|" \ - -e "s|@LONG_INFO@|$LONG_INFO|" \ - $portDir/additional-files/kdiff3.rdef.in > kdiff3.rdef - - addResourcesToBinaries kdiff3.rdef $commandBinDir/kdiff3 - addAppDeskbarSymlink $commandBinDir/kdiff3 KDiff3 -} diff --git a/kde-misc/kdiff3/kdiff3-1.12.2.recipe b/kde-misc/kdiff3/kdiff3-1.12.2.recipe new file mode 100644 index 000000000..405e1b494 --- /dev/null +++ b/kde-misc/kdiff3/kdiff3-1.12.2.recipe @@ -0,0 +1,147 @@ +SUMMARY="A diff and merge tool" +DESCRIPTION="KDiff3 is a diff and merge program that: + +* compares or merges two or three text input files or directories, +* shows the differences line by line and character by character (!), +* provides an automatic merge-facility and +* an integrated editor for comfortable solving of merge-conflicts, +* supports Unicode, UTF-8 and other codecs, autodetection via byte-order-mark 'BOM' +* supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.), +* Printing of differences, +* Manual alignment of lines, +* Automatic merging of version control history ($Log$), +* and has an intuitive graphical user interface." +HOMEPAGE="https://apps.kde.org/kdiff3/" +COPYRIGHT="2016-2024 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="31a37cbcf9d42078a7b4845d42ac1a033a7d7232a5abaeaa028f6425bb9fa439" +SOURCE_DIR="kdiff3-$portVersion" +ADDITIONAL_FILES="kdiff3.rdef.in" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + kdiff3$secondaryArchSuffix = $portVersion + app:KDiff3 = $portVersion + cmd:kdiff3$commandSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libboost_system$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libicuuc$secondaryArchSuffix + # KF6 + lib:libKF6AuthCore$secondaryArchSuffix + lib:libKF6Bookmarks$secondaryArchSuffix + lib:libKF6Codecs$secondaryArchSuffix + lib:libKF6ColorScheme$secondaryArchSuffix + lib:libKF6Completion$secondaryArchSuffix + lib:libKF6ConfigCore$secondaryArchSuffix + lib:libKF6ConfigWidgets$secondaryArchSuffix + lib:libKF6CoreAddons$secondaryArchSuffix + lib:libKF6Crash$secondaryArchSuffix + lib:libKF6GuiAddons$secondaryArchSuffix + lib:libKF6I18n$secondaryArchSuffix + lib:libKF6IconThemes$secondaryArchSuffix + lib:libKF6ItemViews$secondaryArchSuffix + lib:libKF6JobWidgets$secondaryArchSuffix + lib:libKF6KIOCore$secondaryArchSuffix + lib:libKF6Parts$secondaryArchSuffix + lib:libKF6Service$secondaryArchSuffix + lib:libKF6Solid$secondaryArchSuffix + lib:libKF6SonnetCore$secondaryArchSuffix + lib:libKF6TextWidgets$secondaryArchSuffix + lib:libKF6WidgetsAddons$secondaryArchSuffix + lib:libKF6WindowSystem$secondaryArchSuffix + lib:libKF6XmlGui$secondaryArchSuffix + # Qt6 + lib:libQt6Core$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix + lib:libQt6PrintSupport$secondaryArchSuffix + lib:libQt6Widgets$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libboost_system$secondaryArchSuffix >= 1.83.0 + devel:libicuuc$secondaryArchSuffix >= 74 + # KF6 + extra_cmake_modules$secondaryArchSuffix + devel:libKF6AuthCore$secondaryArchSuffix + devel:libKF6Bookmarks$secondaryArchSuffix + devel:libKF6Codecs$secondaryArchSuffix + devel:libKF6Completion$secondaryArchSuffix + devel:libKF6ConfigCore$secondaryArchSuffix + devel:libKF6ConfigWidgets$secondaryArchSuffix + devel:libKF6CoreAddons$secondaryArchSuffix + devel:libKF6Crash$secondaryArchSuffix + devel:libKF6I18n$secondaryArchSuffix + devel:libKF6IconThemes$secondaryArchSuffix + devel:libKF6ItemViews$secondaryArchSuffix + devel:libKF6JobWidgets$secondaryArchSuffix + devel:libKF6KIOCore$secondaryArchSuffix + devel:libKF6Parts$secondaryArchSuffix + devel:libKF6Service$secondaryArchSuffix + devel:libKF6Solid$secondaryArchSuffix + devel:libKF6SonnetCore$secondaryArchSuffix + devel:libKF6TextWidgets$secondaryArchSuffix + devel:libKF6WidgetsAddons$secondaryArchSuffix + devel:libKF6WindowSystem$secondaryArchSuffix + devel:libKF6XmlGui$secondaryArchSuffix + # Qt6 + devel:libQt6Core$secondaryArchSuffix + devel:libQt6Core5Compat$secondaryArchSuffix + devel:libQt6Gui$secondaryArchSuffix + devel:libQt6PrintSupport$secondaryArchSuffix + devel:libQt6Widgets$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:g++$secondaryArchSuffix + cmd:make + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + " + +BUILD() +{ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArghs \ + -DCMAKE_INSTALL_BINDIR=$appsDir \ + -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ + -DKDE_INSTALL_DATAROOTDIR=$dataDir \ + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake + + make -C build $jobArgs +} + +INSTALL() +{ + make -C build install + + mv $appsDir/kdiff3 $appsDir/KDiff3 + + # cleanup + rm -rf $dataDir/{applications,icons,metainfo} + + local APP_SIGNATURE="application/x-vnd.Qt6-kdiff3" + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local LONG_INFO="$SUMMARY" + sed \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + -e "s|@LONG_INFO@|$LONG_INFO|" \ + $portDir/additional-files/kdiff3.rdef.in > kdiff3.rdef + + addResourcesToBinaries kdiff3.rdef $appsDir/KDiff3 + addAppDeskbarSymlink $appsDir/KDiff3 +}