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

Update libpcre to 8.33, patched Pe so that it builds again.

Browse Source
This commit is contained in:
Scott McCreary
2013-11-20 09:29:58 +00:00
parent 093f5eecd6
commit d47411f884
4 changed files with 172 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
haiku-apps/pe/patches/pe-2.4.3_hg611.patch Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/build/BuildSettings b/build/BuildSettings
index 3c10281..e9c0c62 100644
--- a/build/BuildSettings
+++ b/build/BuildSettings
@@ -43,7 +43,7 @@ if $(OS) = HAIKU {
}
# check for pcre...
-local haveHeadersPcre = [ GLOB /boot/common/develop/headers : pcre.h ] ;
+local haveHeadersPcre = [ GLOB /boot/system/develop/headers : pcre.h ] ;
if ! $(haveHeadersPcre) {
Exit "You need to have pcre installed on your system." ;
}

52
haiku-apps/pe/patches/pe-2.4.3_hg611.patch2 Normal file
View File

@@ -0,0 +1,52 @@
diff --git a/Extensions/HeaderHeader.cpp b/Extensions/HeaderHeader.cpp
index 249fc04..1a9c446 100644
--- a/Extensions/HeaderHeader.cpp
+++ b/Extensions/HeaderHeader.cpp
@@ -300,7 +300,7 @@ GetSettingsDir(BDirectory &dir, BPath &path)
//BPath path;
status_t err;
// TODO: build list from text files
- err = find_directory(B_COMMON_SETTINGS_DIRECTORY, &path, true);
+ err = find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &path, true);
if (err < B_OK)
return err;
dir.SetTo(path.Path());
diff --git a/Languages/Sources/Lout_Popup.l b/Languages/Sources/Lout_Popup.l
index 7d3c2db..ede28f4 100644
--- a/Languages/Sources/Lout_Popup.l
+++ b/Languages/Sources/Lout_Popup.l
@@ -221,7 +221,7 @@ static status_t GetLoutDirectory(const char* subDir, BPath& path)
if (!PathExists(path))
{
- if (find_directory(B_COMMON_ETC_DIRECTORY, &path) == B_OK)
+ if (find_directory(B_SYSTEM_ETC_DIRECTORY, &path) == B_OK)
{
path.Append("lout");
path.Append(subDir);
diff --git a/Sources/CDoc.cpp b/Sources/CDoc.cpp
index 002e6c1..75d652a 100644
--- a/Sources/CDoc.cpp
+++ b/Sources/CDoc.cpp
@@ -472,7 +472,7 @@ void CDoc::AddRecent(const char *path)
BPath tp;
try
{
- FailOSErr(find_directory(B_COMMON_TEMP_DIRECTORY, &tp));
+ FailOSErr(find_directory(B_SYSTEM_TEMP_DIRECTORY, &tp));
if (strncmp(tp.Path(), path, strlen(tp.Path())) == 0)
return;
}
diff --git a/Sources/CMimeBox.cpp b/Sources/CMimeBox.cpp
index e9ac4f9..a29a79b 100644
--- a/Sources/CMimeBox.cpp
+++ b/Sources/CMimeBox.cpp
@@ -71,7 +71,7 @@ CMimeItem::CMimeItem(const char *mime)
try
{
char p[PATH_MAX];
- if (find_directory(B_COMMON_TEMP_DIRECTORY, 0, true, p, PATH_MAX) == B_OK)
+ if (find_directory(B_SYSTEM_TEMP_DIRECTORY, 0, true, p, PATH_MAX) == B_OK)
{
BDirectory tmpdir;
FailOSErr(tmpdir.SetTo(p));

8
haiku-apps/pe/pe-2.4.3_hg611.recipe
View File

@@ -25,8 +25,8 @@ REQUIRES="
lib:libpcreposix
"
BUILD_REQUIRES="
devel:libpcre >= 0.0.1
devel:libpcreposix >= 0.0.1
devel:libpcre >= 1
devel:libpcreposix >= 1
"
BUILD_PREREQUIRES="
haiku_devel
@@ -43,6 +43,10 @@ USER_SETTINGS_FILES="
SOURCE_DIR="$portVersionedName"
PATCHES="pe-2.4.3_hg611.patch
pe-2.4.3_hg611.patch2"
BUILD()
{
jam -q