From 9a2d959e44bc196a257d5919c6110b84d689901a Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 8 Aug 2018 21:50:07 +0200
Subject: [PATCH] Sawteeth: patch is upstreamed

... and upstream has more buildfixes.
---
 .../sawteeth/patches/sawteeth-1.3.patchset    | 52 -------------------
 haiku-apps/sawteeth/sawteeth-1.3.recipe       |  9 ++--
 2 files changed, 4 insertions(+), 57 deletions(-)
 delete mode 100644 haiku-apps/sawteeth/patches/sawteeth-1.3.patchset

diff --git a/haiku-apps/sawteeth/patches/sawteeth-1.3.patchset b/haiku-apps/sawteeth/patches/sawteeth-1.3.patchset
deleted file mode 100644
index cf511d091..000000000
--- a/haiku-apps/sawteeth/patches/sawteeth-1.3.patchset
+++ /dev/null
@@ -1,52 +0,0 @@
-From 6f52bc369f939bfb161e44dd9b18f8b90e73442c Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Sat, 28 Jan 2017 15:12:06 +0100
-Subject: x86_64 build fix
-
-
-diff --git a/Source/stApp.cpp b/Source/stApp.cpp
-index 7c18c64..dc92513 100644
---- a/Source/stApp.cpp
-+++ b/Source/stApp.cpp
-@@ -7,7 +7,7 @@ Distributed under the terms of the MIT Licence. */
- 
- #include <FilePanel.h>
- 
--char defsong [] = {
-+uchar defsong [] = {
- #include "Source/data/defaultsong.h"
- };
- 
-@@ -39,7 +39,7 @@ void stApp::AboutRequested()
- void stApp::ReadyToRun()
- {
- 	if ( dropped ) return;
--	txt t(defsong,(int)sizeof(defsong));
-+	txt t((char*)defsong,(int)sizeof(defsong));
- 	stMainWindow *win=new stMainWindow(BRect(10,29,450,150),t);
- 	win->Show();
- 	win->Activate();
-@@ -53,7 +53,7 @@ void stApp::MessageReceived(BMessage *message)
- 		break;
- 	case ST_NEW_SONG:
- 	{
--		txt t(defsong,(int)sizeof(defsong));
-+		txt t((char*)defsong,(int)sizeof(defsong));
- 		stMainWindow *win = new stMainWindow(BRect(10,29,450,150),t);
- 		win->Show();
- 		win->Activate();
-diff --git a/lib/source/song.cpp b/lib/source/song.cpp
-index bc8247f..5d1e853 100644
---- a/lib/source/song.cpp
-+++ b/lib/source/song.cpp
-@@ -4,6 +4,7 @@ Distributed under the terms of the MIT Licence. */
- #include <string.h>
- #include <stdlib.h>
- #include <math.h>
-+#define __STDC_FORMAT_MACROS
- #include <inttypes.h> // for PRIu32
- 
- #include "stSong.h"
--- 
-2.10.2
-
diff --git a/haiku-apps/sawteeth/sawteeth-1.3.recipe b/haiku-apps/sawteeth/sawteeth-1.3.recipe
index 9b5fed3b2..c63f2247c 100644
--- a/haiku-apps/sawteeth/sawteeth-1.3.recipe
+++ b/haiku-apps/sawteeth/sawteeth-1.3.recipe
@@ -5,11 +5,10 @@ chip-tunes. It uses no samples but only generated waveforms."
 HOMEPAGE="https://github.com/pulkomandy/Sawteeth/"
 COPYRIGHT="2001 Jonas Norberg"
 LICENSE="MIT"
-REVISION="6"
-SOURCE_URI="https://github.com/pulkomandy/Sawteeth/archive/f6fa08f34d.tar.gz"
-CHECKSUM_SHA256="a28373671c2d7214ad88dbc77d9bb58b9ae27d1b26e5f1049857eadcd0bd03e2"
-SOURCE_DIR="Sawteeth-f6fa08f34d7e6b8f04df7280bf6f4d4fc761fa04"
-PATCHES="sawteeth-$portVersion.patchset"
+REVISION="7"
+SOURCE_URI="https://github.com/pulkomandy/Sawteeth/archive/ebfdb9d45731.tar.gz"
+CHECKSUM_SHA256="420aca118e54eb9ec43c44ab8a67cf9bfa3fa4f41ada092d3752376f579a58ea"
+SOURCE_DIR="Sawteeth-ebfdb9d45731a49589b689afd9ac2ee43c420312"
 
 ARCHITECTURES="x86_gcc2 ?x86 x86_64"