Merged in TheNavigator/haikuports (pull request #247)

Recipe updates
This commit is contained in:
Adrien Destugues
2014-12-03 16:22:30 +01:00
3 changed files with 58 additions and 107 deletions

View File

@@ -1,63 +0,0 @@
From 6b3517facc71d33974bfd81a78a7567704a94554 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Mon, 2 Dec 2013 19:41:16 -0700
Subject: applying patch runprogram-1.0rc1.patch
diff --git a/src/ExeBox.cpp b/src/ExeBox.cpp
index b4ee544..b3c3bb2 100644
--- a/src/ExeBox.cpp
+++ b/src/ExeBox.cpp
@@ -212,7 +212,7 @@ ExeBox::InitializeAutocompletion(void)
sPathData->AddItem(new entry_ref(ref));
}
- find_directory(B_COMMON_BIN_DIRECTORY,&path);
+ find_directory(B_SYSTEM_BIN_DIRECTORY,&path);
dir.SetTo(path.Path());
dir.Rewind();
while (dir.GetNextRef(&ref) == B_OK)
@@ -271,7 +271,7 @@ ExeBox::QueryThread(void *data)
{
if ( ref.directory == B_USER_ADDONS_DIRECTORY
|| ref.directory == B_BEOS_ADDONS_DIRECTORY
- || ref.directory == B_COMMON_ADDONS_DIRECTORY)
+ || ref.directory == B_SYSTEM_ADDONS_DIRECTORY)
continue;
if (ref.directory == -1)
@@ -341,7 +341,7 @@ ExeBox::UpdateThread(void *data)
queryList.AddItem(new entry_ref(ref));
}
- find_directory(B_COMMON_BIN_DIRECTORY,&path);
+ find_directory(B_SYSTEM_BIN_DIRECTORY,&path);
dir.SetTo(path.Path());
dir.Rewind();
--
1.8.3.4
From 522d633b7593a3009fbccf0da8efd3943cceb31b Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Mon, 2 Dec 2013 19:46:25 -0700
Subject: Fix includes for building with gcc4
diff --git a/src/ExeBox.cpp b/src/ExeBox.cpp
index b3c3bb2..4d154bb 100644
--- a/src/ExeBox.cpp
+++ b/src/ExeBox.cpp
@@ -13,6 +13,8 @@
#include <VolumeRoster.h>
#include <Query.h>
+#include <stdio.h>
+
static BObjectList<entry_ref> *sPathData = NULL;
BLocker sPathDataLock;
thread_id sThreadID = -1;
--
1.8.3.4

View File

@@ -30,8 +30,6 @@ BUILD_PREREQUIRES="
cmd:xres cmd:xres
" "
PATCHES="runprogram-1.0rc1.patchset"
BUILD() BUILD()
{ {
cd src cd src

View File

@@ -1,46 +1,12 @@
DESCRIPTION=" SUMMARY="LibWalter"
LibWalter is a supplementary collection of class and controls not present in \ DESCRIPTION="LibWalter is a supplementary collection of class and controls not present in \
the standard Haiku API. the standard Haiku API."
" HOMEPAGE="https://github.com/HaikuArchives/LibWalter/"
HOMEPAGE="http://dev.osdrawer.net/projects/libwalter" SRC_URI="https://github.com/HaikuArchives/LibWalter/archive/59fdad559ee3dbcc58675cb27502ececce795bbc.tar.gz"
SRC_URI="svn+http://svn.osdrawer.net/libwalter#97" CHECKSUM_SHA256="f418e14a1f8e1aa803385dc17cd178d9e85e7efd3bc4386ec12416eeeb7a1fec"
REVISION="1" REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
#CHECKSUM_MD5=""
BUILD()
{
cd libwalter-97
configure
jam
}
INSTALL()
{
cd libwalter-97
mkdir -p ${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY`
mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/libwalter
cp libwalter.a ${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY`/libwalter.a
cp -a include/. ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/libwalter
}
TEST()
{
cd tests
ColorWellTest
ComboBoxTest
CursorTest
DialogPaneBarberTest
InputRequestTest
PaneSwitchTest
PictureButtonTest
ShrinkViewTest
SplitPanelTest
ToolbarTest
}
LICENSE="MIT" LICENSE="MIT"
COPYRIGHT=" 1991-2000, Be Incorporated. All rights reserved. COPYRIGHT="1991-2000, Be Incorporated. All rights reserved.
1998 dirk116 1998 dirk116
2001 Atsushi Takamatsu 2001 Atsushi Takamatsu
2003 Michael Pfeiffer 2003 Michael Pfeiffer
@@ -48,4 +14,54 @@ COPYRIGHT=" 1991-2000, Be Incorporated. All rights reserved.
2007 Matthias Lindner 2007 Matthias Lindner
2007 Oliver Ruiz Dorantes 2007 Oliver Ruiz Dorantes
2007-2008 DarkWyrm" 2007-2008 DarkWyrm"
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
libwalter$secondaryArchSuffix = $portVersion
lib:libwalter$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_REQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:mkdepend
cmd:jam
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
"
SOURCE_DIR="LibWalter-59fdad559ee3dbcc58675cb27502ececce795bbc"
BUILD()
{
configure
jam
}
TEST()
{
cd tests
ColorWellTest
ComboBoxTest
CursorTest
DialogPaneBarberTest
InputRequestTest
PaneSwitchTest
PictureButtonTest
ShrinkViewTest
SplitPanelTest
ToolbarTest
}
INSTALL()
{
mkdir -p $libDir
mkdir -p $includeDir/libwalter
cp libwalter.a $libDir/libwalter.a
cp -a include/. $includeDir/libwalter
}