From 032e38dfce74c7d68a992c59ae18003e40e91e1e Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 8 Feb 2017 21:15:32 +0100
Subject: [PATCH] jabber4haiku: patch is upstreamed.

---
 .../jabber4haiku/jabber4haiku-1.2.1.recipe    |  7 +-
 .../patches/jabber4haiku-1.2.1.patchset       | 77 -------------------
 2 files changed, 3 insertions(+), 81 deletions(-)
 delete mode 100644 haiku-apps/jabber4haiku/patches/jabber4haiku-1.2.1.patchset

diff --git a/haiku-apps/jabber4haiku/jabber4haiku-1.2.1.recipe b/haiku-apps/jabber4haiku/jabber4haiku-1.2.1.recipe
index 32ac8f65c..7b582e420 100644
--- a/haiku-apps/jabber4haiku/jabber4haiku-1.2.1.recipe
+++ b/haiku-apps/jabber4haiku/jabber4haiku-1.2.1.recipe
@@ -5,13 +5,12 @@ to use user interface."
 HOMEPAGE="https://github.com/HaikuArchives/Jabber4Haiku"
 COPYRIGHT="19??-2009 John Blanco, Frank Paul Silye, Andrea Anzani, Daniel Fischer, zuMi"
 LICENSE="MIT"
-REVISION="4"
-commit="5b101cfa4a9e9eb5746b3b1880480e93b0072316"
+REVISION="5"
+commit="160b682b6c00640547c278e050104f11732b2c5f"
 SOURCE_URI="$HOMEPAGE/archive/$commit.tar.gz"
 SOURCE_FILENAME="$portName-$commit.tar.gz"
 SOURCE_DIR="Jabber4Haiku-$commit"
-CHECKSUM_SHA256="225e117aa984cf9d09969137dc95c61200356032876ff2efd8d3637271c1bbfd"
-PATCHES="jabber4haiku-$portVersion.patchset"
+CHECKSUM_SHA256="8199235c33eb8ab14be31cf8777682a23808040883bc57421d0aad9fe0ccb5d9"
 
 ARCHITECTURES="x86_gcc2 ?x86 x86_64"
 
diff --git a/haiku-apps/jabber4haiku/patches/jabber4haiku-1.2.1.patchset b/haiku-apps/jabber4haiku/patches/jabber4haiku-1.2.1.patchset
deleted file mode 100644
index 7711e22d0..000000000
--- a/haiku-apps/jabber4haiku/patches/jabber4haiku-1.2.1.patchset
+++ /dev/null
@@ -1,77 +0,0 @@
-From 8b1d000b6147cb64b4cef55fc0139e71c3a4ddfb Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Sat, 28 Jan 2017 12:41:56 +0100
-Subject: x86_64 build fix.
-
-
-diff --git a/jabber/BuddyWindow.cpp b/jabber/BuddyWindow.cpp
-index c4ed091..7c93373 100644
---- a/jabber/BuddyWindow.cpp
-+++ b/jabber/BuddyWindow.cpp
-@@ -50,7 +50,7 @@
- 	#include "PictureView.h"
- #endif
- 
--#include <strings.h>
-+#include <string.h>
- 
- BuddyWindow *BuddyWindow::_instance = NULL;
- 
-diff --git a/jabber/FileXMLReader.cpp b/jabber/FileXMLReader.cpp
-index e5b6ff0..ea94470 100644
---- a/jabber/FileXMLReader.cpp
-+++ b/jabber/FileXMLReader.cpp
-@@ -10,7 +10,7 @@
- #include <storage/StorageDefs.h>
- 
- #include <stdlib.h>
--#include <strings.h>
-+#include <string.h>
- 
- #include "XMLEntity.h"
- 
-diff --git a/jabber/XMLReader.cpp b/jabber/XMLReader.cpp
-index a158dc7..98c0343 100644
---- a/jabber/XMLReader.cpp
-+++ b/jabber/XMLReader.cpp
-@@ -6,7 +6,7 @@
- 
- #include <cstdio>
- #include <string>
--#include <strings.h>
-+#include <string.h>
- #include <stdlib.h>
- 
- XMLReader::XMLReader() {
-diff --git a/makefile b/makefile
-index c8366b2..1d20fd7 100644
---- a/makefile
-+++ b/makefile
-@@ -112,23 +112,7 @@ endif
- #		naming scheme you need to specify the path to the library
- #		and it's name
- #		library: my_lib.a entry: my_lib.a or path/my_lib.a
--LIBS=be game root translation tracker ssl crypto expat 
--
--# guess gcc version 
--GCC_VERSION=$(subst -, , $(subst ., , $(shell gcc -dumpversion)))
--GCC_MAJOR_VERSION=$(word 1, $(GCC_VERSION))
--GCC_MINOR_VERSION=$(word 2, $(GCC_VERSION))
--GCC_MICRO_VERSION=$(word 3, $(GCC_VERSION))
--
--ifeq ($(GCC_MAJOR_VERSION), 4)
--	LIBS+=stdc++
--else
--	LIBS+=stdc++.r4
--endif
--
--ifeq "$(OP_SYSTEM)" "Haiku"
--	LIBS+=network
--endif
-+LIBS=be game root translation tracker ssl crypto expat network $(STDCPPLIBS)
- 
- #	specify additional paths to directories following the standard
- #	libXXX.so or libXXX.a naming scheme.  You can specify full paths
--- 
-2.10.2
-