From 48616e9e80818791d6493bb084659434600b0536 Mon Sep 17 00:00:00 2001 From: "Alexander G. M. Smith" Date: Tue, 29 Jun 2021 15:34:50 -0400 Subject: [PATCH] BeShare: bump version (#6015) --- .../additional-files/beshare-post-install.sh | 10 +++ haiku-apps/beshare/beshare-2.35.recipe | 69 ---------------- haiku-apps/beshare/beshare-3.04.recipe | 79 +++++++++++++++++++ .../beshare/patches/muscle-6.11.patchset | 58 -------------- 4 files changed, 89 insertions(+), 127 deletions(-) create mode 100755 haiku-apps/beshare/additional-files/beshare-post-install.sh delete mode 100644 haiku-apps/beshare/beshare-2.35.recipe create mode 100644 haiku-apps/beshare/beshare-3.04.recipe delete mode 100644 haiku-apps/beshare/patches/muscle-6.11.patchset diff --git a/haiku-apps/beshare/additional-files/beshare-post-install.sh b/haiku-apps/beshare/additional-files/beshare-post-install.sh new file mode 100755 index 000000000..4be9443d6 --- /dev/null +++ b/haiku-apps/beshare/additional-files/beshare-post-install.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# Make the writeable BeShare files directory, which is now needed +# since the application folder is read only due to the packaging +# system. AGMS20150113 + +mkdir --parents "`finddir B_USER_DIRECTORY`/BeShare/downloads" +mkdir --parents "`finddir B_USER_DIRECTORY`/BeShare/logs" +mkdir --parents "`finddir B_USER_DIRECTORY`/BeShare/shared" +notify --type information --group "BeShare Installer" --title "BeShare Folders" --timeout 45 "Folders for your shared files, downloads and logs have been created in `finddir B_USER_DIRECTORY`/BeShare/ Change them to symbolic links if you want to move them elsewhere." +notify --type information --group "BeShare Installer" --title "BeShare Documentation" --timeout 30 "Extra documentation has been installed in a documentation/packages/BeShare folder somewhere. Just do a desktop search for BeShare." diff --git a/haiku-apps/beshare/beshare-2.35.recipe b/haiku-apps/beshare/beshare-2.35.recipe deleted file mode 100644 index 4f57f98d8..000000000 --- a/haiku-apps/beshare/beshare-2.35.recipe +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY="A native file sharing and chat application" -DESCRIPTION="BeShare is a BeOS/Haiku-native file sharing program. \ -It operates similarly to other such programs (Napster, Hotline, etc) \ -but with a few advantages: - -- BeShare allows you to upload or download any type of file, not just mp3. -- When browsing files, you can see their attributes (similar Tracker's \ -view) -- Your query is always \"live\", so if new files that match your query become \ -available, you will see them added to the results list right away (you won't \ -have to click \"refresh\" or anything first) -- BeShare includes a rudimentary chat mechanism for you social types. -- BeShare supports any number of simultaneous uploads and downloads \ -in parallel, but will serialize simultaneous file requests to any \ -given host for efficiency." -HOMEPAGE="https://github.com/HaikuArchives/BeShare" -COPYRIGHT="1999-2012 Jeremy Friesner" -LICENSE="Public Domain - libsanta" -REVISION="3" -srcGitRev="58031882f15a724e8c946ed80bc0d10541b8f645" -SOURCE_URI="https://github.com/HaikuArchives/BeShare/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="7cc736acbdc6d6f9a0298323fc58d043ff0cf44a272912d332839060f905b040" -SOURCE_FILENAME="beshare-$srcGitRev.tar.gz" -SOURCE_DIR="BeShare-$srcGitRev" -SOURCE_URI_2="https://public.msli.com/lcs/muscle/muscle6.11.zip" -CHECKSUM_SHA256_2="7cf3c92095f46e5a0858852e7d387d11fdf8e1e95a4de26b5e68e8319a373340" -PATCHES_2="muscle-6.11.patchset" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - beshare$secondaryArchSuffix = $portVersion - app:BeShare = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libsanta$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libsanta$secondaryArchSuffix - devel:libz$secondaryArchSuffix -# devel:muscle$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - makefile_engine - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - " - -BUILD() -{ - ln -sf ../../sources-2/muscle muscle - cd source - make $jobArgs - #LOCAL_INCLUDE_PATHS=$includeDir/muscle -} - -INSTALL() -{ - mkdir -p $appsDir/BeShare - cp -r app/* $appsDir/BeShare - addAppDeskbarSymlink $appsDir/BeShare/BeShare -} diff --git a/haiku-apps/beshare/beshare-3.04.recipe b/haiku-apps/beshare/beshare-3.04.recipe new file mode 100644 index 000000000..52f5b5115 --- /dev/null +++ b/haiku-apps/beshare/beshare-3.04.recipe @@ -0,0 +1,79 @@ +SUMMARY="A native file sharing and chat application" +DESCRIPTION="BeShare is a BeOS/Haiku-native file sharing program. \ +It operates similarly to other such programs (IRC, Napster, Hotline, etc) \ +but with a few advantages: + +- BeShare allows you to upload or download any type of file, not just mp3. +- When browsing files, you can see their attributes (similar to Tracker's\ + view). +- Your query is always \"live\", so if new files that match your query become\ + available, you will see them added to the results list right away (you won't\ + have to click \"refresh\" or anything first). +- BeShare includes a rudimentary chat mechanism for you social types. +- BeShare supports any number of simultaneous uploads and downloads\ + in parallel, but will serialize simultaneous file requests to any\ + given host for efficiency. +- BeShare connects to any MUSCLE server\ + (see https://public.msli.com/lcs/muscle/ for details). +- BeShare source code is available, and serves as an example of how to write\ + a MUSCLE client." +HOMEPAGE=" + https://github.com/HaikuArchives/BeShare + http://web.ncf.ca/au829/BeOS/ + " +COPYRIGHT="1999-2012 Jeremy Friesner" +LICENSE="Public Domain + libsanta" +# Use revision 3+ to take priority over existing 3.04 versions. AGMS20210622 +REVISION="3" +SOURCE_URI="http://web.ncf.ca/au829/BeOS/BeShare_3.04.zip" +CHECKSUM_SHA256="37b9e590d2f3f5ce1395fdb6a31e8849ce0d286a79a53908476ea70f942987a2" +SOURCE_FILENAME="BeShare_3.04.zip" +SOURCE_DIR="BeShare" + +ADDITIONAL_FILES="beshare-post-install.sh" +POST_INSTALL_SCRIPTS="$relativePostInstallDir/beshare-post-install.sh" + +# Note this source code is portable and should compile on all platforms (PPC, +# all x86 varieties), and for both BeOS and Haiku. Please keep it that way. +ARCHITECTURES="x86_gcc2 ?x86 x86_64 ?arm ?ppc" + +PROVIDES=" + beshare$secondaryArchSuffix = $portVersion + app:BeShare = $portVersion + " + +REQUIRES="haiku$secondaryArchSuffix" + +BUILD_REQUIRES="haiku${secondaryArchSuffix}_devel" + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + " + +BUILD() +{ + if [ $effectiveTargetArchitecture == x86_64 ]; then + CXXFLAGS="-DMUSCLE_64_BIT_PLATFORM" + fi + export CXXFLAGS="-D_BSD_SOURCE $CXXFLAGS" + cd source/beshare + make $jobArgs +} + +INSTALL() +{ + mkdir -p -v $appsDir + cp -av $sourceDir/source/beshare/BeShare $appsDir/BeShare + chmod -v a+rx $appsDir/BeShare + addAppDeskbarSymlink $appsDir/BeShare + + mkdir -p -v $postInstallDir + cp -av $portDir/additional-files/beshare-post-install.sh $postInstallDir + chmod -v a+rx $postInstallDir/beshare-post-install.sh + + mkdir -p -v $docDir + cp -av documentation/* $docDir +} diff --git a/haiku-apps/beshare/patches/muscle-6.11.patchset b/haiku-apps/beshare/patches/muscle-6.11.patchset deleted file mode 100644 index 7ca3cb200..000000000 --- a/haiku-apps/beshare/patches/muscle-6.11.patchset +++ /dev/null @@ -1,58 +0,0 @@ -From a8b6f2f1b8505643fc4c66e2a0ba4f22a3948857 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 29 Sep 2018 23:28:47 +0200 -Subject: support for x86_64. - - -diff --git a/muscle/besupport/ConvertMessages.cpp b/muscle/besupport/ConvertMessages.cpp -index 83b4642..67c3669 100644 ---- a/muscle/besupport/ConvertMessages.cpp -+++ b/muscle/besupport/ConvertMessages.cpp -@@ -81,7 +81,7 @@ status_t ConvertFromBMessage(const BMessage & from, Message & to) - for (int32 j=0; j