From 07eea2eac5d46737c1e6612dc41e7b0a17b8b451 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 26 Nov 2013 00:38:38 -0700 Subject: [PATCH] Add kdiff3 recipe --- kde-misc/kdiff3/additional-files/kdiff3.rdef | 72 +++++++++++++++++ kde-misc/kdiff3/kdiff3-0.9.97.recipe | 79 +++++++++++++++++++ .../kdiff3/patches/kdiff3-0.9.97.patchset | 22 ++++++ 3 files changed, 173 insertions(+) create mode 100644 kde-misc/kdiff3/additional-files/kdiff3.rdef create mode 100644 kde-misc/kdiff3/kdiff3-0.9.97.recipe create mode 100644 kde-misc/kdiff3/patches/kdiff3-0.9.97.patchset diff --git a/kde-misc/kdiff3/additional-files/kdiff3.rdef b/kde-misc/kdiff3/additional-files/kdiff3.rdef new file mode 100644 index 000000000..344a32799 --- /dev/null +++ b/kde-misc/kdiff3/additional-files/kdiff3.rdef @@ -0,0 +1,72 @@ + +resource app_flags B_MULTIPLE_LAUNCH | B_ARGV_ONLY; + +resource app_version { + major = 0, + middle = 9, + minor = 7, + + variety = B_APPV_DEVELOPMENT, + internal = 0, + + short_info = "Diff and merge tool", + long_info = "" +}; + +resource large_icon array { + $"1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B" + $"1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B" + $"1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B" + $"1B0000000000000000000000000000000000000000000000000000000000001B" + $"1B001F1F1F1F1F1F1F1F1F001F1F1F1F1F1F1F1F1F001F1F1F1F1F1F1F1F001B" + $"1B001F0000000000001F1F001F0000000000001F1F001F0000000000001F001B" + $"1B001F1F1F1F1F1F1F1F1F001F1F1F1F1F1F1F1F1F001F1F1F1F1F1F1F1F001B" + $"1B001F000000001F1F1F1F001F000000001F1F1F1F001F000000001F1F1F001B" + $"1B001F1F1F1F1F1F1F1F1F001F1F1F1F1F1F1F1F1F001F1F1F1F1F1F1F1F001B" + $"1B001F2A2A2A2A2A2A1F1F001F2A2A2A2A2A2A1F1F001F2A2A2A2A2A1F1F001B" + $"1B001F1F1F1F1F1F1F1F1F001F1F1F1F1F1F1F1F1F001F1F1F1F1F1F1F1F001B" + $"1B001F39393939391F1F1F001F2A2A2A1F1F1F1F1F001F39393939391F1F001B" + $"1B001F1F1F1F1F1F1F1F1F001F1F1F1F1F1F1F1F1F001F1F1F1F1F1F1F1F001B" + $"1B001FE1E1E1E1E1E1E11F001FE1E1E1E1E1E1E11F001F1F1F1F1F1F1F1F001B" + $"1B001F1F1F1F1F1F1F1F1F001F1F1F1F1F1F1F1F1F001F1F1F1F1F1F1F1F001B" + $"1B001FE1E1E1E1E11F1F1F001FE1E1E1E1E11F1F1F001F1F1F1F1F1F1F1F001B" + $"1B001F1F1F1F1F1F1F1F1F001F1F1F1F1F1F1F1F1F001F1F1F1F1F1F1F1F001B" + $"1B0000000000000000000000000000000000000000000000000000000000001B" + $"1B001F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F001B" + $"1B001F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F001B" + $"1B001F281F1F1F281F282828281F1F1F1F1F1F281F1F1F281F2828281F1F001B" + $"1B001F281F1F281F1F281F1F1F281F281F1F281F1F1F281F1F1F1F1F281F001B" + $"1B001F281F281F1F1F281F1F1F281F1F1F2828281F2828281F1F1F1F281F001B" + $"1B001F28281F1F1F1F281F1F1F281F281F1F281F1F1F281F1F1F28281F1F001B" + $"1B001F281F281F1F1F281F1F1F281F281F1F281F1F1F281F1F1F1F1F281F001B" + $"1B001F281F1F281F1F281F1F1F281F281F1F281F1F1F281F1F1F1F1F281F001B" + $"1B001F281F1F1F281F282828281F1F281F2828281F2828281F2828281F1F001B" + $"1B001F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F001B" + $"1B001F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F001B" + $"1B0000000000000000000000000000000000000000000000000000000000001B" + $"1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B" + $"1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B" +}; + +resource mini_icon array { + $"00000000000000000000000000000000" + $"001F1F1F1F1F86272728281F1F1F1F1F" + $"001F0C001FAE1F27281F271F0E001F0C" + $"001F1F1F1F1F1F861F26281F1F1F1F1F" + $"001F78B81FA01F1F2727281F1F1F1F1F" + $"001F1F1F1F1F1F861F26281F1F1F1F1F" + $"001F7B2A1FA21F27281F271F7B2A1FA3" + $"001F1F1F1F1F86272728281F1F1F1F1F" + $"00000000000000000000000000000000" + $"1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F" + $"28271F1F281F1F271F1FD51E28271F1F" + $"281F271F1F1F271F1FD51E1F1F1F271F" + $"281F271F281F27281F27051E1F261F1F" + $"281F271F281F271F1FD51D1F1F1F271F" + $"28271F1F281F271F1FD51D1F27281F1F" + $"1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F" +}; + +resource app_signature "application/x-vnd.kdiff3"; + +resource file_types message; diff --git a/kde-misc/kdiff3/kdiff3-0.9.97.recipe b/kde-misc/kdiff3/kdiff3-0.9.97.recipe new file mode 100644 index 000000000..5824352bc --- /dev/null +++ b/kde-misc/kdiff3/kdiff3-0.9.97.recipe @@ -0,0 +1,79 @@ +SUMMARY="KDiff3 is a diff and merge program" +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/" +SRC_URI="http://sourceforge.net/projects/kdiff3/files/kdiff3/0.9.97/kdiff3-0.9.97.tar.gz" +CHECKSUM_MD5="30a71b474956c369ed7b38c6db080fc4" +COPYRIGHT="2002-2012 by Joachim Eibl" +LICENSE="GNU GPL v2" +REVISION="1" +ARCHITECTURES="x86" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES ?x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + kdiff3$secondaryArchSuffix = $portVersion + cmd:kdiff3$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libQtGui$secondaryArchSuffix + lib:libQtCore$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:qmake$secondaryArchSuffix + cmd:g++$secondaryArchSuffix + " + +PATCHES="kdiff3-0.9.97.patchset" + +BUILD() +{ + mkdir build + cd build + qmake$secondaryArchSuffix CONFIG+=release ../src-QT4/kdiff3.pro + make $jobArgs + + rc $portDir/additional-files/kdiff3.rdef \ + -o $sourceDir/build/kdiff3.rsrc + + xres -o kdiff3 kdiff3.rsrc + mimeset -f kdiff3 +} + +INSTALL() +{ + mkdir -p $binDir + cp -af build/kdiff3 $binDir + + addAppDeskbarSymlink $binDir/kdiff3 KDiff3 + + mkdir -p $docDir + cp -af doc/* $docDir + rm -f $docDir/CMakeLists.txt $docDir/*/CMakeLists.txt +} diff --git a/kde-misc/kdiff3/patches/kdiff3-0.9.97.patchset b/kde-misc/kdiff3/patches/kdiff3-0.9.97.patchset new file mode 100644 index 000000000..ecad04e33 --- /dev/null +++ b/kde-misc/kdiff3/patches/kdiff3-0.9.97.patchset @@ -0,0 +1,22 @@ +From 5029aa9583f572d2635e56a02f480d1eafb44076 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 25 Nov 2013 23:56:56 -0700 +Subject: Don't use precompiled headers on Haiku + + +diff --git a/src-QT4/kdiff3.pro b/src-QT4/kdiff3.pro +index 84ddf47..41f9f60 100644 +--- a/src-QT4/kdiff3.pro ++++ b/src-QT4/kdiff3.pro +@@ -1,7 +1,7 @@ + TEMPLATE = app + # When unresolved items remain during linking: Try adding "shared" in the CONFIG. + CONFIG += qt warn_on thread precompile_header +-!os2:PRECOMPILED_HEADER = stable.h ++!os2:!haiku:PRECOMPILED_HEADER = stable.h + HEADERS = version.h \ + diff.h \ + difftextwindow.h \ +-- +1.8.3.4 +