From a55a63508319510d976a447b24664e2d3d522471 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 18 Feb 2015 21:11:16 +0000
Subject: [PATCH] Fortuna: upstream patch.

---
 haiku-apps/fortuna/Fortuna                    |  1 -
 haiku-apps/fortuna/fortuna-1.0.0.recipe       |  8 +-
 .../fortuna/patches/fortuna-1.0.0.patch       | 97 -------------------
 3 files changed, 3 insertions(+), 103 deletions(-)
 delete mode 160000 haiku-apps/fortuna/Fortuna
 delete mode 100644 haiku-apps/fortuna/patches/fortuna-1.0.0.patch

diff --git a/haiku-apps/fortuna/Fortuna b/haiku-apps/fortuna/Fortuna
deleted file mode 160000
index 51052ccef..000000000
--- a/haiku-apps/fortuna/Fortuna
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 51052ccef4643aef97f8a76b311c1aca0dc935bf
diff --git a/haiku-apps/fortuna/fortuna-1.0.0.recipe b/haiku-apps/fortuna/fortuna-1.0.0.recipe
index c1be91b9a..2835cf40f 100644
--- a/haiku-apps/fortuna/fortuna-1.0.0.recipe
+++ b/haiku-apps/fortuna/fortuna-1.0.0.recipe
@@ -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
diff --git a/haiku-apps/fortuna/patches/fortuna-1.0.0.patch b/haiku-apps/fortuna/patches/fortuna-1.0.0.patch
deleted file mode 100644
index d3603b43b..000000000
--- a/haiku-apps/fortuna/patches/fortuna-1.0.0.patch
+++ /dev/null
@@ -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