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

Fortuna: upstream patch.

Browse Source
This commit is contained in:
Augustin Cavalier
2015-02-18 21:11:16 +00:00
parent bce288a937
commit a55a635083
3 changed files with 3 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
haiku-apps/fortuna/Fortuna

Submodule haiku-apps/fortuna/Fortuna deleted from 51052ccef4

8
haiku-apps/fortuna/fortuna-1.0.0.recipe
View File

@@ -5,18 +5,16 @@ open it. Yeah, sure, there is already a fortune program, but it only shows \
from the command line, you'll get a lot of repeats, it's quite a bit of work \
to install more, and you have to muck around with your UserBootScript. Lots of \
messing around. Then again, you can use Fortuna, which has none of this.
" # Taken from homepage
"
HOMEPAGE="http://darkwyrm.beemulated.net/apps/fortuna.htm"
SRC_URI="git://github.com/HaikuArchives/Fortuna.git#9e0cd6c1e6"
REVISION="1"
SRC_URI="git://github.com/HaikuArchives/Fortuna.git#51052ccef4643aef97f8a76b311c1aca0dc935bf"
REVISION="2"
LICENSE="MIT"
COPYRIGHT="2006 DarkWyrm"
ARCHITECTURES="x86 x86_gcc2"
PATCHES="fortuna-1.0.0.patch"
PROVIDES="
fortuna = $portVersion
app:Fortuna = $portVersion

97
haiku-apps/fortuna/patches/fortuna-1.0.0.patch
View File

@@ -1,97 +0,0 @@
diff --git a/src/FortuneFunctions.cpp b/src/FortuneFunctions.cpp
index 5fc031a..c083cee 100644
--- a/src/FortuneFunctions.cpp
+++ b/src/FortuneFunctions.cpp
@@ -13,6 +13,11 @@ FortuneAccess::FortuneAccess(const char *folder)
SetFolder(folder);
}
+FortuneAccess::FortuneAccess()
+{
+
+}
+
FortuneAccess::~FortuneAccess(void)
{
MakeEmpty();
diff --git a/src/FortuneFunctions.h b/src/FortuneFunctions.h
index 07cb8f5..85eb1e0 100644
--- a/src/FortuneFunctions.h
+++ b/src/FortuneFunctions.h
@@ -8,6 +8,7 @@ class FortuneAccess
{
public:
FortuneAccess(const char *folder);
+ FortuneAccess();
~FortuneAccess(void);
status_t SetFolder(const char *folder);
diff --git a/src/FortuneWindow.cpp b/src/FortuneWindow.cpp
index d79c7f5..0f3bcf8 100644
--- a/src/FortuneWindow.cpp
+++ b/src/FortuneWindow.cpp
@@ -1,22 +1,30 @@
#include "FortuneWindow.h"
#include <Alert.h>
-#include <View.h>
-#include <Button.h>
-#include <ScrollView.h>
#include <Application.h>
+#include <Button.h>
+#include <FindDirectory.h>
+#include <Path.h>
#include <Screen.h>
+#include <ScrollView.h>
+#include <View.h>
#define M_GET_ANOTHER_FORTUNE 'gafn'
#define M_ABOUT_REQUESTED 'abrq'
FortuneWindow::FortuneWindow(void)
- : BWindow(BRect(0,0,300,300),"Fortune",B_DOCUMENT_WINDOW,B_ASYNCHRONOUS_CONTROLS),
- fFortune("/boot/beos/etc/fortunes")
+ : BWindow(BRect(0,0,300,300),"Fortune",B_DOCUMENT_WINDOW,B_ASYNCHRONOUS_CONTROLS),
+ fFortune()
{
+ BPath path;
+ find_directory(B_SYSTEM_DATA_DIRECTORY, &path);
+ path.Append("fortunes");
+
+ fFortune.SetFolder(path.Path());
+
BView *back = new BView(Bounds(),"background",B_FOLLOW_ALL, B_WILL_DRAW);
back->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
AddChild(back);
-
+
BButton *close = new BButton(BRect(0,0,1,1),"closebutton","Close",
new BMessage(B_QUIT_REQUESTED), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
close->ResizeToPreferred();
@@ -63,7 +71,9 @@ FortuneWindow::FortuneWindow(void)
{
fTextView->SetText("Fortuna had a problem getting a fortune.\n\n"
"Please make sure that you have installed fortune files to "
- "the folder /boot/beos/etc/fortunes.");
+ "the folder ");
+ fTextView->Insert(path.Path());
+ fTextView->Insert(".");
}
next->MakeFocus(true);
@@ -100,9 +110,15 @@ void FortuneWindow::MessageReceived(BMessage *msg)
}
else
{
+ BPath path;
+ find_directory(B_SYSTEM_DATA_DIRECTORY, &path);
+ path.Append("fortunes");
+
fTextView->SetText("Fortuna had a problem getting a fortune.\n\n"
"Please make sure that you have installed fortune files to "
- "the folder /boot/beos/etc/fortunes.");
+ "the folder ");
+ fTextView->Insert(path.Path());
+ fTextView->Insert(".");
}
}
else