From 5b69fe4fdeed98f6cd83769521d7b2184436ea72 Mon Sep 17 00:00:00 2001 From: augiedoggie Date: Sat, 23 Mar 2024 19:59:51 -0600 Subject: [PATCH] gittyup: add recipe, untested/disabled on 32 bit (#10249) --- .../gittyup/additional-files/gittyup.rdef.in | 76 +++++++++ dev-vcs/gittyup/gittyup-1.3.0~git.recipe | 146 ++++++++++++++++++ .../patches/gittyup-1.3.0~git.patchset | 62 ++++++++ 3 files changed, 284 insertions(+) create mode 100644 dev-vcs/gittyup/additional-files/gittyup.rdef.in create mode 100644 dev-vcs/gittyup/gittyup-1.3.0~git.recipe create mode 100644 dev-vcs/gittyup/patches/gittyup-1.3.0~git.patchset diff --git a/dev-vcs/gittyup/additional-files/gittyup.rdef.in b/dev-vcs/gittyup/additional-files/gittyup.rdef.in new file mode 100644 index 000000000..dd746449d --- /dev/null +++ b/dev-vcs/gittyup/additional-files/gittyup.rdef.in @@ -0,0 +1,76 @@ +resource app_signature "application/x-vnd.gittyup"; + +resource app_flags B_SINGLE_LAUNCH; + +resource app_version { + major = @MAJOR@, + middle = @MIDDLE@, + minor = @MINOR@, + + variety = B_APPV_FINAL, + internal = 0, + + short_info = "Gittyup - git client", + long_info = "Graphical git repository management application" +}; + +resource vector_icon array { + $"6E636966050322557B0319354903F2970A03F3970A03FBC300200606FF07CB26" + $"BFBFCB26BFBFCB26C60CBFBFCB27C60BCB27B973CB27B458BFBFB458C60CB458" + $"B973BFBFB458B973B458C60BB458CB26BFBFCB26B973CB26BFBFBFBF0606FF07" + $"CB26BFBFCB26BFBFCB26C60CBFBFCB27C60BCB27B973CB27B458BFBFB458C60C" + $"B458B973BFBFB458B973B458C60BB458CB26BFBFCB26B973CB26BFBFBFBF0002" + $"B7A1C88FB7A1C88FB939C70BBC68C404BAD0C587BC68C4040002B7A1C88FB7A1" + $"C88FB939C70BBC68C404BAD0C587BC68C4040002B9ECBFCCB9ECBFCCBB83BE48" + $"BEB3BB41BD1BBCC5BEB3BB410002B9ECBFCCB9ECBFCCBB83BE48BEB3BB41BD1B" + $"BCC5BEB3BB410002C2A9C342C2A9C342C440C1BFC76FBEB8C5D8C03BC76FBEB8" + $"0002C2A9C342C2A9C342C440C1BFC76FBEB8C5D8C03BC76FBEB80002B9ECBFCC" + $"B9ECBFCCBAC0C134BC67C404BB93C29CBC67C4040002B9ECBFCCB9ECBFCCBAC0" + $"C134BC67C404BB93C29CBC67C4040002C2A9C342C2A9C342C093C383BC68C403" + $"BE7DC3C3BC68C4030002C2A9C342C2A9C342C093C383BC68C403BE7DC3C3BC68" + $"C4030606FF07BDF1C404BDF1C404BDF1C4DDBC67C58DBD41C58DBB8EC58DBADD" + $"C404BADDC4DDBADDC32BBC67C27BBB8EC27BBD41C27BBDF1C404BDF1C32BBDF1" + $"C404C4040606FF07BB76BFCCBB76BFCCBB76C0A5B9ECC155BAC5C155B912C155" + $"B862BFCCB862C0A5B862BEF3B9ECBE43B912BE43BAC5BE43BB76BFCCBB76BEF3" + $"BB76BFCCBFCC0606FF07C432C342C432C342C432C41CC2A9C4CCC382C4CCC1CF" + $"C4CCC11FC342C11FC41CC11FC269C2A9C1B9C1CFC1B9C382C1B9C432C342C432" + $"C269C432C342C342020BB7A4CA1EB7A4CA1EB6FECA76B5B1CB25B657CACEB5D0" + $"CA6CB610C8F9B5F0C9B3B589C876B47BC76FB502C7F3B535C754B6AAC71EB5EF" + $"C739B6FDC675B7A3C523B750C5CCB7F7C5CCB89DC71DB84AC675B958C738BACC" + $"C76EBA12C753BA46C7F1B938C8F8B9BFC875B958C9B2B998CB24B978CA6BB8F1" + $"CACDB7A4CA1EB84BCA76B7A4CA1E020BB7A4CA1EB7A4CA1EB6FECA76B5B1CB25" + $"B657CACEB5D0CA6CB610C8F9B5F0C9B3B589C876B47BC76FB502C7F3B535C754" + $"B6AAC71EB5EFC739B6FDC675B7A3C523B750C5CCB7F7C5CCB89DC71DB84AC675" + $"B958C738BACCC76EBA12C753BA46C7F1B938C8F8B9BFC875B958C9B2B998CB24" + $"B978CA6BB8F1CACDB7A4CA1EB84BCA76B7A4CA1E0002B78AC7C8B78AC7C8B921" + $"C644BC50C33DBAB9C4C0BC50C33D0002B78AC7C8B78AC7C8B921C644BC50C33D" + $"BAB9C4C0BC50C33D0002B9D5BF05B9D5BF05BB6DBD81BE9CBA7ABD04BBFEBE9C" + $"BA7A0002B9D5BF05B9D5BF05BB6DBD81BE9CBA7ABD04BBFEBE9CBA7A0002C291" + $"C27CC291C27CC429C0F8C758BDF1C5C1BF75C758BDF10002C291C27CC291C27C" + $"C429C0F8C758BDF1C5C1BF75C758BDF10002B9D5BF05B9D5BF05BAA9C06DBC50" + $"C33DBB7DC1D5BC50C33D0002B9D5BF05B9D5BF05BAA9C06DBC50C33DBB7DC1D5" + $"BC50C33D0002C291C27CC291C27CC07CC2BCBC50C33DBE66C2FDBC50C33D0002" + $"C291C27CC291C27CC07CC2BCBC50C33DBE66C2FDBC50C33D0606FF07BDDAC33D" + $"BDDAC33DBDDAC416BC50C4C6BD2AC4C6BB77C4C6BAC7C33DBAC7C416BAC7C264" + $"BC50C1B4BB77C1B4BD2AC1B4BDDAC33DBDDAC264BDDAC33DC33D0606FF07BB5F" + $"BF05BB5FBF05BB5FBFDEB9D5C08EBAAFC08EB8FCC08EB84BBF05B84BBFDEB84B" + $"BE2CB9D5BD7CB8FCBD7CBAAFBD7CBB5FBF05BB5FBE2CBB5FBF05BF050606FF07" + $"C41BC27CC41BC27CC41BC355C291C405C36BC405C1B8C405C108C27CC108C355" + $"C108C1A3C291C0F3C1B8C0F3C36BC0F3C41BC27CC41BC1A3C41BC27CC27C020B" + $"B78AC95AB78AC95AB6E3C9B2B596CA62B63DCA0AB5B6C9A8B5F5C835B5D6C8EF" + $"B56FC7B2B461C6ACB4E8C72FB51BC690B690C65AB5D5C675B6E3C5B1B789C45F" + $"B736C508B7DCC508B883C659B830C5B1B93EC674BAB2C6AAB9F8C68FBA2BC72D" + $"B91EC834B9A5C7B1B93EC8EEB97ECA61B95EC9A7B8D7CA09B78AC95AB831C9B2" + $"B78AC95A020BB78AC95AB78AC95AB6E3C9B2B596CA62B63DCA0AB5B6C9A8B5F5" + $"C835B5D6C8EFB56FC7B2B461C6ACB4E8C72FB51BC690B690C65AB5D5C675B6E3" + $"C5B1B789C45FB736C508B7DCC508B883C659B830C5B1B93EC674BAB2C6AAB9F8" + $"C68FBA2BC72DB91EC834B9A5C7B1B93EC8EEB97ECA61B95EC9A7B8D7CA09B78A" + $"C95AB831C9B2B78AC95A200A000100000A0101011001178222040A010102000A" + $"0101031001178422040A010104000A0101051001178422040A010106000A0101" + $"071001178422040A010108000A0101091001178422040A01010A000A01010B10" + $"01178422040A01010C000A01010D000A01010E000A01010F000A010110100117" + $"8222040A020111000A0301121001178422040A020113000A0301141001178422" + $"040A020115000A0301161001178422040A020117000A0301181001178422040A" + $"020119000A03011A1001178422040A02011B000A02011C000A02011D000A0401" + $"1E000A04011F100117822204" +}; diff --git a/dev-vcs/gittyup/gittyup-1.3.0~git.recipe b/dev-vcs/gittyup/gittyup-1.3.0~git.recipe new file mode 100644 index 000000000..c606830a4 --- /dev/null +++ b/dev-vcs/gittyup/gittyup-1.3.0~git.recipe @@ -0,0 +1,146 @@ +SUMMARY="Graphical git client application" +DESCRIPTION="Gittyup is a graphical git client designed to help you understand and manage your \ +source code history. + +Features include: +* Optional single branch view to focus on your work +* Fullscreen mode +* Tabs for each open repository +* Integrated diff viewer +* Tree view +* Blame view +* Single line staging +* Amending commits +* Solving rebase conflicts +* Starred commits +* Tag selection +* Commit message templates +and more..." +HOMEPAGE="https://github.com/Murmele/Gittyup/" +COPYRIGHT="2021-2024 Gittyup contributors +2016-2020 Scientific Toolworks, Inc. and contributors" +LICENSE="MIT" +REVISION="1" +srcGitRev="dac06473c069864c013ea5a410a1a705df21be4f" +SOURCE_URI="https://github.com/Murmele/Gittyup/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="982fc8dcefb203a2ebc9a29091acada2b38f612b64646c0987de93d36a255fce" +SOURCE_DIR="Gittyup-$srcGitRev" +PATCHES="gittyup-$portVersion.patchset" +ADDITIONAL_FILES="gittyup.rdef.in" + +srcGitRev2="7861f401ea25e1ceaf7323c1585de4d633e0ec39" +SOURCE_URI_2="https://github.com/stinb/libgit2/archive/$srcGitRev2.tar.gz" +CHECKSUM_SHA256_2="8d53e1debb07f37ae5b326b3cc282d7119393be359be197c53fdeafb3fbd3845" +SOURCE_DIR_2="libgit2-$srcGitRev2" + +srcGitRev3="82b21cd1348366a7dc25d57c6de532968da40541" +SOURCE_URI_3="https://github.com/ScintillaOrg/lexilla/archive/$srcGitRev3.tar.gz" +CHECKSUM_SHA256_3="4bb82032b05f9a7864c515e0f28acdff4606f47d1c26863f62c3471b69bbe522" +SOURCE_DIR_3="lexilla-$srcGitRev3" + +srcGitRev4="33d0e3433a2046c1077f6b33fc801caf6bfac7a9" +SOURCE_URI_4="https://github.com/orbitalquark/scintillua/archive/$srcGitRev4.tar.gz" +CHECKSUM_SHA256_4="12217f2f1a7437ca577e33c458f5290e0dd2ee73185c94cba0a5c4e49636a2e3" +SOURCE_DIR_4="scintillua-$srcGitRev4" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="?x86" + +PROVIDES=" + gittyup$secondaryArchSuffix = $portVersion + cmd:gittyup + cmd:indexer + cmd:relauncher + " +REQUIRES=" + haiku$secondaryArchSuffix + cmd:git + lib:libcmark$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libhunspell_1.7$secondaryArchSuffix + lib:liblua$secondaryArchSuffix >= 5.4 + lib:libpcre$secondaryArchSuffix + lib:libQt5Concurrent$secondaryArchSuffix + lib:libQt5Core$secondaryArchSuffix + lib:libQt5Gui$secondaryArchSuffix + lib:libQt5Network$secondaryArchSuffix + lib:libQt5PrintSupport$secondaryArchSuffix + lib:libQt5Test$secondaryArchSuffix + lib:libQt5Widgets$secondaryArchSuffix + lib:libssh2$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libcmark$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix + devel:libhunspell_1.7$secondaryArchSuffix + devel:liblua$secondaryArchSuffix >= 5.4 + devel:libpcre$secondaryArchSuffix + devel:libQt5Concurrent$secondaryArchSuffix + devel:libQt5Core$secondaryArchSuffix + devel:libQt5Gui$secondaryArchSuffix + devel:libQt5PrintSupport$secondaryArchSuffix + devel:libQt5Network$secondaryArchSuffix + devel:libQt5Test$secondaryArchSuffix + devel:libQt5Widgets$secondaryArchSuffix + devel:libssh2$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + cmd:qdbuscpp2xml$secondaryArchSuffix >= 5 + " + +BUILD() +{ + rm -rf dep/libgit2/libgit2 + ln -sf $sourceDir2 dep/libgit2/libgit2 + + rm -rf dep/scintilla/lexilla + ln -sf $sourceDir3 dep/scintilla/lexilla + + rm -rf dep/scintilla/scintillua + ln -sf $sourceDir4 dep/scintilla/scintillua + + cmake -B build -S . $cmakeDirArgs \ + -DCMAKE_BUILD_TYPE=Release \ + -DUSE_SYSTEM_CMARK=ON \ + -DUSE_SYSTEM_GIT=ON \ + -DUSE_SYSTEM_HUNSPELL=ON \ + -DUSE_SYSTEM_LIBSSH2=ON \ + -DUSE_SYSTEM_LUA=ON \ + -DUSE_SYSTEM_OPENSSL=ON \ + -DUSE_SYSTEM_QT=ON \ + -DENABLE_TESTS=OFF + + make -C build $jobArgs +} + +INSTALL() +{ + make -C build $jobArgs install + + # remove the extra files from libgit2 + rm -rf $libDir $developDir + + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3 | cut -d~ -f1`" + if [ -z "$MINOR" ]; then MINOR=0; fi + + sed \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + $portDir/additional-files/gittyup.rdef.in > $sourceDir/build/gittyup.rdef + + addResourcesToBinaries build/gittyup.rdef $binDir/gittyup + addAppDeskbarSymlink $binDir/gittyup "Gittyup" +} diff --git a/dev-vcs/gittyup/patches/gittyup-1.3.0~git.patchset b/dev-vcs/gittyup/patches/gittyup-1.3.0~git.patchset new file mode 100644 index 000000000..e53a2c7a2 --- /dev/null +++ b/dev-vcs/gittyup/patches/gittyup-1.3.0~git.patchset @@ -0,0 +1,62 @@ +From 27f66ae3f60764d8cda698887cc331f687013686 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Sat, 23 Mar 2024 19:05:25 -0600 +Subject: disable dbus & fix install rules for Haiku + + +diff --git a/pack/CMakeLists.txt b/pack/CMakeLists.txt +index c9b5f4d..adbbbb2 100644 +--- a/pack/CMakeLists.txt ++++ b/pack/CMakeLists.txt +@@ -130,7 +130,7 @@ elseif(NOT USE_SYSTEM_QT) + endif() + + # Install XcbQpa library. +-if(UNIX AND NOT APPLE) ++if(UNIX AND NOT APPLE AND NOT HAIKU) + set(LIB_NAME libQt5XcbQpa) + get_target_property(QT_CORE_LIBRARY Qt5::Core LOCATION) + get_filename_component(LIB_PATH ${QT_CORE_LIBRARY} PATH) +@@ -152,7 +152,7 @@ if(UNIX AND NOT APPLE) + endif() + + # Install SSL libraries. +-if(NOT APPLE) ++if(NOT APPLE AND NOT HAIKU) + if(NOT USE_SYSTEM_OPENSSL) + if(WIN32) + if(CMAKE_SIZEOF_VOID_P EQUAL 8) +@@ -199,7 +199,7 @@ if(NOT APPLE) + endif() + endif() + +-if(UNIX AND NOT APPLE) ++if(UNIX AND NOT APPLE AND NOT HAIKU) + foreach(icon 16 32 64 128 256 512) + install( + FILES ${RSRC_DIR}/Gittyup.iconset/icon_${icon}x${icon}.png +diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt +index 82bdc33..f6364ef 100755 +--- a/src/app/CMakeLists.txt ++++ b/src/app/CMakeLists.txt +@@ -78,7 +78,7 @@ target_link_libraries( + + set_target_properties(app PROPERTIES AUTOMOC ON) + +-if(UNIX AND NOT APPLE) ++if(UNIX AND NOT APPLE AND NOT HAIKU) + target_link_libraries(app Qt5::DBus) + endif() + +@@ -210,7 +210,7 @@ execute_process(COMMAND + COMPONENT ${GITTYUP_NAME}) + else() + # Windows and UNIX must be ./ otherwise it is interpreted as absolute path +- if(UNIX) ++ if(UNIX AND NOT HAIKU) + install( + FILES ${CMAKE_SOURCE_DIR}/rsrc/linux/com.github.Murmele.Gittyup.desktop + DESTINATION ${CMAKE_INSTALL_DATADIR}/applications +-- +2.43.2 +