diff --git a/haiku-apps/beezer/beezer-1.recipe b/haiku-apps/beezer/beezer-1.recipe index 7b9dbb02f..0574da00c 100644 --- a/haiku-apps/beezer/beezer-1.recipe +++ b/haiku-apps/beezer/beezer-1.recipe @@ -1,28 +1,63 @@ -DESCRIPTION="beezer, an archiving tool for the Haiku operating system, similar to winzip" +SUMMARY="Beezer is an archive manager for Haiku, similar to winzip" +DESCRIPTION=" + Beezer is an archive manager for Haiku. It can extract and browse, + create and add to archive files. In addition, Beezer can split and rejoin + files. + + It can extract 7zip, arj, bzip2, gzip, lha, rar, tar, xz and zip files. + It can create 7zip, bzip2, gzip, tar and zip files. + " HOMEPAGE="https://bitbucket.org/cpr/beezer" -SRC_URI="https://bitbucket.org/cpr/beezer/get/82199f683571.zip" +SRC_URI="https://bitbucket.org/cpr/beezer/get/e6e2c619aa4a.zip" +CHECKSUM_MD5="79aac5ae3eac5abcfe0d197730723284" + +LICENSE="BSD (3-clause)" +COPYRIGHT=" + 2009 Ramshankar (aka Teknomancer) + 2011-2012 Chris Roberts + " REVISION="1" -STATUS_HAIKU="stable" -CHECKSUM_MD5="b27479b8a8afc1bc105ad9a6d8911f74" -DEPEND="cmake >= 2.8" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + beezer = $portVersion + app:beezer = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmake >= 2.8 + cmd:gcc + cmd:make + " + +PATCHES=" + beezer-1.patch + " + +SOURCE_DIR="cpr-beezer-e6e2c619aa4a" + BUILD() { - cd cpr-beezer-82199f683571/Source + cd Source cmake . make } INSTALL() { - cd cpr-beezer-82199f683571/Source/build - BEEZER_DIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Beezer - mkdir -p $BEEZER_DIR/add-ons - cp -a Beezer $BEEZER_DIR - cp -a add-ons/* $BEEZER_DIR/add-ons - mkdir -p ${DESTDIR}/`finddir B_USER_ADDONS_DIRECTORY`/Tracker - cp -a TrackerAddOn/BeezerAddOn ${DESTDIR}/`finddir B_USER_ADDONS_DIRECTORY`/Tracker + cd Source/build + mkdir -p $appsDir/Beezer/add-ons + cp Beezer $appsDir/Beezer + cp -a add-ons/* $appsDir/Beezer/add-ons + addAppDeskbarSymlink $appsDir/Beezer/Beezer + + mkdir -p $appsDir/Tracker + cp -a TrackerAddOn/BeezerAddOn $appsDir/Tracker } - -LICENSE="BSD (3-clause)" -COPYRIGHT="2009 Ramshankar (aka Teknomancer) - 2011-2012 Chris Roberts" diff --git a/haiku-apps/beezer/patches/beezer-1.patch b/haiku-apps/beezer/patches/beezer-1.patch new file mode 100644 index 000000000..638f8e7e2 --- /dev/null +++ b/haiku-apps/beezer/patches/beezer-1.patch @@ -0,0 +1,57 @@ +From 3728835e4083c862c9b03dd5ffdb5941f34f9da5 Mon Sep 17 00:00:00 2001 +From: Luke +Date: Sun, 1 Dec 2013 12:22:29 +0000 +Subject: [PATCH] Remove references to B_COMMON_ + +--- + Source/Archiver/Archiver.cpp | 13 +------------ + Source/Beezer/FSUtils/FSUtils.cpp | 2 +- + 2 files changed, 2 insertions(+), 13 deletions(-) + +diff --git a/Source/Archiver/Archiver.cpp b/Source/Archiver/Archiver.cpp +index c272333..7b57313 100644 +--- a/Source/Archiver/Archiver.cpp ++++ b/Source/Archiver/Archiver.cpp +@@ -625,7 +625,7 @@ status_t Archiver::SetComment(char* commentStr, const char* tempDirPath) + bool Archiver::IsBinaryFound(char* filePath, const char* fileName) const + { + // Check if the given fileName exists in the given dir, if so copy the full path of fileName to filePath +- // Path priority /workers -> B_SYSTEM_BIN_DIRECTORY -> B_COMMON_BIN_DIRECTORY ++ // Path priority /workers -> B_SYSTEM_BIN_DIRECTORY + BPath binPath; + app_info appInfo; + be_app->GetAppInfo(&appInfo); +@@ -652,17 +652,6 @@ bool Archiver::IsBinaryFound(char* filePath, const char* fileName) const + } + } + +- if (find_directory(B_COMMON_BIN_DIRECTORY, &binPath) == B_OK) +- { +- binPath.Append(fileName); +- BEntry entry(binPath.Path(), true); +- if (entry.Exists()) +- { +- strcpy(filePath, binPath.Path()); +- return true; +- } +- } +- + // TODO full search of $PATH + + filePath = '\0'; +diff --git a/Source/Beezer/FSUtils/FSUtils.cpp b/Source/Beezer/FSUtils/FSUtils.cpp +index a651c58..8fbb01d 100644 +--- a/Source/Beezer/FSUtils/FSUtils.cpp ++++ b/Source/Beezer/FSUtils/FSUtils.cpp +@@ -177,7 +177,7 @@ BString CreateTempDirectory(const char* prefix, BDirectory** createdDir, bool cr + prefixStr << prefix << "_"; + + BPath tmpPath; +- find_directory(B_COMMON_TEMP_DIRECTORY, &tmpPath, true); ++ find_directory(B_SYSTEM_TEMP_DIRECTORY, &tmpPath, true); + BString tempDirName = tempnam(const_cast(tmpPath.Path()), const_cast(prefixStr.String())); + + // Further random the dir name (the below number is a prime) +-- +1.8.3.4 +