From f1a1ae9f33e848bf54aadc48a6e4bf426ba35031 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 8 Feb 2017 21:34:07 +0100
Subject: [PATCH] takenotes: patch is upstreamed.

---
 .../patches/takenotes-1.0.0.patchset          | 48 -------------------
 haiku-apps/takenotes/takenotes-1.0.0.recipe   |  9 ++--
 2 files changed, 4 insertions(+), 53 deletions(-)
 delete mode 100644 haiku-apps/takenotes/patches/takenotes-1.0.0.patchset

diff --git a/haiku-apps/takenotes/patches/takenotes-1.0.0.patchset b/haiku-apps/takenotes/patches/takenotes-1.0.0.patchset
deleted file mode 100644
index 42aa20553..000000000
--- a/haiku-apps/takenotes/patches/takenotes-1.0.0.patchset
+++ /dev/null
@@ -1,48 +0,0 @@
-From 280c61cc455673a8ffe4f61e2f85b115d1b99af8 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Sat, 28 Jan 2017 13:20:18 +0100
-Subject: x86_64 build fix.
-
-
-diff --git a/ChoiceView.cpp b/ChoiceView.cpp
-index 4293e22..35eb393 100644
---- a/ChoiceView.cpp
-+++ b/ChoiceView.cpp
-@@ -68,7 +68,7 @@ ChoiceView :: ChoiceView(BRect rect, char *vname,BHandler *handler)
- 	// We look for the current application instances that are running
- 	for (count=0;count< aList->CountItems();count++){
- 
--   	    who = (team_id)aList->ItemAt(count);
-+   	    who = (team_id)(addr_t)aList->ItemAt(count);
-    	  	be_roster->GetRunningAppInfo(who,appInfo);
-    	  	
-    	  	// Show the name of the running program istead of its signature
-diff --git a/NoteView.cpp b/NoteView.cpp
-index b2ffa9b..5410401 100644
---- a/NoteView.cpp
-+++ b/NoteView.cpp
-@@ -258,7 +258,7 @@ void NoteView :: MouseDown(BPoint point){
- 
- 		// We look for the current instances that are running
- 		for (count=0;count< aList->CountItems();count++){
--   	    	team_id who = (team_id)aList->ItemAt(count);
-+   	    	team_id who = (team_id)(addr_t)aList->ItemAt(count);
-    	  		be_roster->GetRunningAppInfo(who,appInfo);
-   		 	            	
-          	
-diff --git a/NoteWindow.cpp b/NoteWindow.cpp
-index 7dccee5..a848445 100644
---- a/NoteWindow.cpp
-+++ b/NoteWindow.cpp
-@@ -977,7 +977,7 @@ void NoteWindow :: MessageReceived(BMessage* message) {
- 
- 				// We look for the current instances of BeZilla that are running
-        			for (count=0;count< aList->CountItems();count++){
--	                who = (team_id)aList->ItemAt(count);
-+	                who = (team_id)(addr_t)aList->ItemAt(count);
- 	 	         	  	be_roster->GetRunningAppInfo(who,appInfo);
-    		 	            
- 	 	         	// Is there an instance that is running?
--- 
-2.10.2
-
diff --git a/haiku-apps/takenotes/takenotes-1.0.0.recipe b/haiku-apps/takenotes/takenotes-1.0.0.recipe
index df8448599..c9e60a58d 100644
--- a/haiku-apps/takenotes/takenotes-1.0.0.recipe
+++ b/haiku-apps/takenotes/takenotes-1.0.0.recipe
@@ -10,11 +10,10 @@ DESCRIPTION="With TakeNotes you can:
 HOMEPAGE="https://github.com/HaikuArchives/TakeNotes"
 COPYRIGHT="2009 Ilio Catallo, Stefano Celentano, Eleonora Ciceri"
 LICENSE="GNU GPL v2"
-REVISION="6"
-SOURCE_URI="https://github.com/HaikuArchives/TakeNotes/archive/7f84d8f50e.tar.gz"
-CHECKSUM_SHA256="6236158c21f3aed723a552693bdb1d576024ddaca5a5669f713e9ea4dbb4ae98"
-SOURCE_DIR="TakeNotes-7f84d8f50eca3f507692dc6e59874818ec21195b/source"
-PATCHES="takenotes-$portVersion.patchset"
+REVISION="7"
+SOURCE_URI="https://github.com/HaikuArchives/TakeNotes/archive/ec07467318a40df4475825f41d816242891efbc4.tar.gz"
+CHECKSUM_SHA256="06cdce56f752beb77ed0e4b7e90273c147afd530e3d92cde38cd3f6d9a3a0f67"
+SOURCE_DIR="TakeNotes-ec07467318a40df4475825f41d816242891efbc4/source"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"