From abf6937f1a32f88fd7b14ad90238def12c44e3c7 Mon Sep 17 00:00:00 2001 From: Radu Toma Date: Sun, 7 Dec 2014 17:20:17 +0000 Subject: [PATCH] Updated recipe file for beezer, removing the patch. --- haiku-apps/beezer/beezer-0.99.hg.recipe | 8 +-- .../beezer/patches/beezer-0.99.hg.patch | 57 ------------------- 2 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 haiku-apps/beezer/patches/beezer-0.99.hg.patch diff --git a/haiku-apps/beezer/beezer-0.99.hg.recipe b/haiku-apps/beezer/beezer-0.99.hg.recipe index 599cc74c2..2ef33aedc 100644 --- a/haiku-apps/beezer/beezer-0.99.hg.recipe +++ b/haiku-apps/beezer/beezer-0.99.hg.recipe @@ -12,7 +12,7 @@ COPYRIGHT=" 2009 Ramshankar (aka Teknomancer) 2011-2012 Chris Roberts " -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" @@ -29,15 +29,11 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - cmd:cmake >= 2.8 + cmd:cmake cmd:gcc cmd:make " -PATCHES=" - beezer-0.99.hg.patch - " - BUILD() { cd Source diff --git a/haiku-apps/beezer/patches/beezer-0.99.hg.patch b/haiku-apps/beezer/patches/beezer-0.99.hg.patch deleted file mode 100644 index 638f8e7e2..000000000 --- a/haiku-apps/beezer/patches/beezer-0.99.hg.patch +++ /dev/null @@ -1,57 +0,0 @@ -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 -