haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 06:28:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged in radustoma/haikuports/newb (pull request #297)

Browse Source 
Updated recipe file for beezer, removing the patch.
This commit is contained in:
Kacper Kasper
2014-12-07 18:55:39 +01:00
parent 85f51d5fe1 abf6937f1a
commit 1d8763fba4
2 changed files with 2 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
haiku-apps/beezer/beezer-0.99.hg.recipe
View File

@@ -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

57
haiku-apps/beezer/patches/beezer-0.99.hg.patch
View File

@@ -1,57 +0,0 @@
From 3728835e4083c862c9b03dd5ffdb5941f34f9da5 Mon Sep 17 00:00:00 2001
From: Luke <noryb009@gmail.com>
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 <appdir>/workers -> B_SYSTEM_BIN_DIRECTORY -> B_COMMON_BIN_DIRECTORY
+ // Path priority <appdir>/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<char*>(tmpPath.Path()), const_cast<char*>(prefixStr.String()));
// Further random the dir name (the below number is a prime)
--
1.8.3.4