diff --git a/dev-vcs/gittyup/gittyup-1.3.0~git.recipe b/dev-vcs/gittyup/gittyup-1.3.0~git.recipe index c606830a4..758e1e803 100644 --- a/dev-vcs/gittyup/gittyup-1.3.0~git.recipe +++ b/dev-vcs/gittyup/gittyup-1.3.0~git.recipe @@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/Murmele/Gittyup/" COPYRIGHT="2021-2024 Gittyup contributors 2016-2020 Scientific Toolworks, Inc. and contributors" LICENSE="MIT" -REVISION="1" +REVISION="2" srcGitRev="dac06473c069864c013ea5a410a1a705df21be4f" SOURCE_URI="https://github.com/Murmele/Gittyup/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="982fc8dcefb203a2ebc9a29091acada2b38f612b64646c0987de93d36a255fce" @@ -44,7 +44,7 @@ CHECKSUM_SHA256_4="12217f2f1a7437ca577e33c458f5290e0dd2ee73185c94cba0a5c4e49636a SOURCE_DIR_4="scintillua-$srcGitRev4" ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="?x86" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" gittyup$secondaryArchSuffix = $portVersion @@ -109,7 +109,12 @@ BUILD() rm -rf dep/scintilla/scintillua ln -sf $sourceDir4 dep/scintilla/scintillua + if [ "$targetArchitecture" = x86_gcc2 ];then + extraArgs=-DCMAKE_CXX_FLAGS=-fpermissive + fi + cmake -B build -S . $cmakeDirArgs \ + -DCMAKE_INSTALL_BINDIR=bin \ -DCMAKE_BUILD_TYPE=Release \ -DUSE_SYSTEM_CMARK=ON \ -DUSE_SYSTEM_GIT=ON \ @@ -118,7 +123,9 @@ BUILD() -DUSE_SYSTEM_LUA=ON \ -DUSE_SYSTEM_OPENSSL=ON \ -DUSE_SYSTEM_QT=ON \ - -DENABLE_TESTS=OFF + -DENABLE_UPDATE_OVER_GUI=OFF \ + -DENABLE_TESTS=OFF \ + "$extraArgs" make -C build $jobArgs } @@ -141,6 +148,6 @@ INSTALL() -e "s|@MINOR@|$MINOR|" \ $portDir/additional-files/gittyup.rdef.in > $sourceDir/build/gittyup.rdef - addResourcesToBinaries build/gittyup.rdef $binDir/gittyup - addAppDeskbarSymlink $binDir/gittyup "Gittyup" + addResourcesToBinaries build/gittyup.rdef $prefix/bin/gittyup + addAppDeskbarSymlink $prefix/bin/gittyup "Gittyup" }