From 5692b919260c779973a91a194d3d320e9948e61b Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 22 Nov 2017 21:51:44 +1000 Subject: [PATCH] KDiff3: bump version --- .../{kdiff3.rdef => kdiff3.rdef.in} | 18 ++++---- ...ff3-0.9.97.recipe => kdiff3-0.9.98.recipe} | 46 +++++++++++-------- .../kdiff3/patches/kdiff3-0.9.97.patchset | 22 --------- 3 files changed, 34 insertions(+), 52 deletions(-) rename kde-misc/kdiff3/additional-files/{kdiff3.rdef => kdiff3.rdef.in} (93%) rename kde-misc/kdiff3/{kdiff3-0.9.97.recipe => kdiff3-0.9.98.recipe} (57%) delete 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.in similarity index 93% rename from kde-misc/kdiff3/additional-files/kdiff3.rdef rename to kde-misc/kdiff3/additional-files/kdiff3.rdef.in index 344a32799..207cee5f9 100644 --- a/kde-misc/kdiff3/additional-files/kdiff3.rdef +++ b/kde-misc/kdiff3/additional-files/kdiff3.rdef.in @@ -2,17 +2,19 @@ resource app_flags B_MULTIPLE_LAUNCH | B_ARGV_ONLY; resource app_version { - major = 0, - middle = 9, - minor = 7, + major = @MAJOR@, + middle = @MIDDLE@, + minor = @MINOR@, - variety = B_APPV_DEVELOPMENT, + variety = B_APPV_FINAL, internal = 0, - short_info = "Diff and merge tool", - long_info = "" + short_info = "KDiff3", + long_info = "@LONG_INFO@" }; +resource app_signature "@APP_SIGNATURE@"; + resource large_icon array { $"1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B" $"1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B1B" @@ -66,7 +68,3 @@ resource mini_icon array { $"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.98.recipe similarity index 57% rename from kde-misc/kdiff3/kdiff3-0.9.97.recipe rename to kde-misc/kdiff3/kdiff3-0.9.98.recipe index 755f3f625..9563db4d0 100644 --- a/kde-misc/kdiff3/kdiff3-0.9.97.recipe +++ b/kde-misc/kdiff3/kdiff3-0.9.98.recipe @@ -13,15 +13,14 @@ DESCRIPTION="KDiff3 is a diff and merge program that: * Automatic merging of version control history ($Log$), * and has an intuitive graphical user interface." HOMEPAGE="http://kdiff3.sourceforge.net/" -COPYRIGHT="2002-2012 by Joachim Eibl" +COPYRIGHT="2002-2015 by Joachim Eibl" LICENSE="GNU GPL v2" REVISION="1" -SOURCE_URI="http://sourceforge.net/projects/kdiff3/files/kdiff3/0.9.97/kdiff3-0.9.97.tar.gz" -CHECKSUM_SHA256="e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a" -PATCHES="kdiff3-0.9.97.patchset" -ADDITIONAL_FILES="kdiff3.rdef" +SOURCE_URI="http://sourceforge.net/projects/kdiff3/files/kdiff3/0.9.98/kdiff3-0.9.98.tar.gz" +CHECKSUM_SHA256="802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668" +ADDITIONAL_FILES="kdiff3.rdef.in" -ARCHITECTURES="!x86_gcc2 x86" +ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" @@ -30,8 +29,11 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libQtGui$secondaryArchSuffix - lib:libQtCore$secondaryArchSuffix + lib:libgl$secondaryArchSuffix + lib:libQt5Gui$secondaryArchSuffix + lib:libQt5Core$secondaryArchSuffix + lib:libQt5PrintSupport$secondaryArchSuffix + lib:libQt5Widgets$secondaryArchSuffix " BUILD_REQUIRES=" @@ -39,22 +41,16 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:make - cmd:qmake$secondaryArchSuffix + cmd:qmake$secondaryArchSuffix >=5.7 cmd:g++$secondaryArchSuffix " BUILD() { - mkdir build + mkdir -p 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() @@ -62,9 +58,19 @@ INSTALL() mkdir -p $binDir cp -af build/kdiff3 $binDir - addAppDeskbarSymlink $binDir/kdiff3 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 - mkdir -p $docDir - cp -af doc/* $docDir - rm -f $docDir/CMakeLists.txt $docDir/*/CMakeLists.txt + addResourcesToBinaries kdiff3.rdef $binDir/kdiff3 + addAppDeskbarSymlink $binDir/kdiff3 KDiff3 } diff --git a/kde-misc/kdiff3/patches/kdiff3-0.9.97.patchset b/kde-misc/kdiff3/patches/kdiff3-0.9.97.patchset deleted file mode 100644 index ecad04e33..000000000 --- a/kde-misc/kdiff3/patches/kdiff3-0.9.97.patchset +++ /dev/null @@ -1,22 +0,0 @@ -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 -