KDiff3: bump version

2026-04-22 19:50:05 +02:00 · 2018-04-23 17:24:09 +03:00
parent a8bfab593f
commit 27904bef53
3 changed files with 134 additions and 124 deletions
--- a/kde-misc/kdiff3/kdiff3-0.9.98.recipe
+++ b/kde-misc/kdiff3/kdiff3-0.9.98.recipe
@@ -1,84 +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="http://kdiff3.sourceforge.net/"
-COPYRIGHT="2002-2014 Joachim Eibl"
-LICENSE="GNU GPL v2"
-REVISION="3"
-SOURCE_URI="https://downloads.sourceforge.net/kdiff3/kdiff3-$portVersion.tar.gz"
-CHECKSUM_SHA256="802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668"
-PATCHES="kdiff3-$portVersion.patchset"
-ADDITIONAL_FILES="kdiff3.rdef.in"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-commandSuffix=$secondaryArchSuffix
-commandBinDir=$binDir
-if [ "$targetArchitecture" = x86_gcc2 ]; then
-	commandSuffix=
-	commandBinDir=$prefix/bin
-fi
-
-PROVIDES="
-	kdiff3$secondaryArchSuffix = $portVersion
-	cmd:kdiff3$commandSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libgl$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5PrintSupport$secondaryArchSuffix
-	lib:libQt5Widgets$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:g++$secondaryArchSuffix
-	cmd:make
-	cmd:qmake$secondaryArchSuffix >= 5.7
-	"
-
-BUILD()
-{
-	mkdir -p build
-	cd build
-	qmake CONFIG+=release ../src-QT4/kdiff3.pro
-	make $jobArgs
-}
-
-INSTALL()
-{
-	install -d $commandBinDir
-	install -t $commandBinDir build/kdiff3
-
-	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
-}
--- a/kde-misc/kdiff3/kdiff3-1.7.0~git.recipe
+++ b/kde-misc/kdiff3/kdiff3-1.7.0~git.recipe
@@ -0,0 +1,134 @@
+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-2018 Michael Reeves
+	2002-2014 Joachim Eibl
+	"
+LICENSE="GNU GPL v2"
+REVISION="1"
+COMMIT="5ad19b344403c365d1e588ea50ca8c03e5609f8c"
+SOURCE_URI="https://github.com/kde/kdiff3/archive/$COMMIT.tar.gz"
+SOURCE_DIR="kdiff3-$COMMIT"
+CHECKSUM_SHA256="44a5835bc26ccdb77a6c5f36695f7442dddad2c089c0bb1b32c5bf467c6f86dc"
+ADDITIONAL_FILES="kdiff3.rdef.in"
+
+ARCHITECTURES="x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	kdiff3$secondaryArchSuffix = $portVersion
+	app:KDiff3$secondaryArchSuffix = $portVersion
+	cmd:kdiff3$commandSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$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:libKF5XmlGui$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5PrintSupport$secondaryArchSuffix
+	lib:libQt5Widgets$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	extra_cmake_modules >= 5.45
+	haiku${secondaryArchSuffix}_devel
+	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:libKF5XmlGui$secondaryArchSuffix
+	devel:libQt5Gui$secondaryArchSuffix
+	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5PrintSupport$secondaryArchSuffix
+	devel:libQt5Widgets$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:g++$secondaryArchSuffix
+	cmd:make
+	cmd:cmake$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
+	mkdir -p build
+	cd build
+	cmake .. \
+		-DCMAKE_INSTALL_PREFIX=$prefix \
+		-DSHARE_INSTALL_PREFIX=$dataDir \
+		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
+
+	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 MINOR="0"
+	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 $binDir/kdiff3
+	addAppDeskbarSymlink $binDir/kdiff3 KDiff3
+}
--- a/kde-misc/kdiff3/patches/kdiff3-0.9.98.patchset
+++ b/kde-misc/kdiff3/patches/kdiff3-0.9.98.patchset
@@ -1,40 +0,0 @@
-From b1e5b43476070d319d12d9f5632b9b6d54810ad8 Mon Sep 17 00:00:00 2001
-From: Bach Nguyen <bach5000@gci.test>
-Date: Tue, 26 Dec 2017 21:45:17 +0000
-Subject: Fix settings dir
-
-
-diff --git a/src-QT4/kreplacements/kreplacements.cpp b/src-QT4/kreplacements/kreplacements.cpp
-index 6564ae8..1e648a2 100644
--- a/src-QT4/kreplacements/kreplacements.cpp
-+++ b/src-QT4/kreplacements/kreplacements.cpp
-@@ -48,6 +48,9 @@
- #include <vector>
- #include <algorithm>
- 
-+#if defined(__HAIKU__)
-+#include <FindDirectory.h>
-+#endif
- 
- static QString s_copyright;
- static QString s_email;
-@@ -422,9 +425,15 @@ QString KStandardDirs::findResource(const QString& resource, const QString& /*ap
-       QString configPath = exePath + "/.kdiff3rc"; // This is useful for portable installations (e.g. on USB-Stick)
-       if ( QFile::exists( configPath ) )
-          return configPath;
-#endif
-+#elif defined(__HAIKU__)
-+      char hdir[B_PATH_NAME_LENGTH + B_FILE_NAME_LENGTH];
-+      find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, hdir, sizeof(hdir));
-+      QString settings = hdir;
-+      return settings + "/kdiff3rc";
-+#else
-       QString home = QDir::homePath();
-       return home + "/.kdiff3rc";
-+#endif
-    }
-    return QString();
- }
-- 
-2.15.0
-