From 0f8bbbdf68c697b022680c4775fe7b5f927b4861 Mon Sep 17 00:00:00 2001
From: Mrowqa <artur.jamro@gmail.com>
Date: Sun, 15 Dec 2013 23:35:15 +0100
Subject: [PATCH 1/3] Added recipe file for tinyxml2 lib. It requires gcc4.

---
 dev-libs/tinyxml2/tinyxml2-2.recipe | 68 +++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 dev-libs/tinyxml2/tinyxml2-2.recipe

diff --git a/dev-libs/tinyxml2/tinyxml2-2.recipe b/dev-libs/tinyxml2/tinyxml2-2.recipe
new file mode 100644
index 000000000..7caa2b027
--- /dev/null
+++ b/dev-libs/tinyxml2/tinyxml2-2.recipe
@@ -0,0 +1,68 @@
+DESCRIPTION="
+	TinyXML-2 is a simple, small, efficient, C++ XML parser that can be
+	easily integrating into other programs.
+	"
+SUMMARY="TinyXML-2 is a simple C++ XML parser."
+HOMEPAGE="http://www.grinninglizard.com/tinyxml2/"
+LICENSE="Zlib"
+COPYRIGHT="2011-2013 Lee Thomason"
+SRC_URI="git+https://github.com/leethomason/tinyxml2.git#343a5ff3bdd7336644db4080f001759e062c359e"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+
+PROVIDES="
+	tinyxml2$secondaryArchSuffix = $portVersion
+	lib:libtinyxml2$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	g++ -fpic -c tinyxml2.cpp
+	g++ -shared -Wl,-soname,libtinyxml2.so -o libtinyxml2.so tinyxml2.o
+}
+
+INSTALL()
+{
+	mkdir -p $libDir
+	# also install shared lib
+	cp -a libtinyxml2.so $libDir
+
+	# move headers
+	mkdir -p $includeDir
+	mv tinyxml2.h $includeDir
+	
+	# prepare development lib links
+	prepareInstalledDevelLib libtinyxml2 .so
+	
+	# devel package
+	packageEntries devel $developDir
+}
+
+TEST()
+{
+	make test
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	tinyxml2${secondaryArchSuffix}_devel = $portVersion
+	devel:libtinyxml2$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	tinyxml2$secondaryArchSuffix == $portVersion base
+	"

From 6f7420b318636eedaf84213487b983655b5e35e1 Mon Sep 17 00:00:00 2001
From: Mrowqa <artur.jamro@gmail.com>
Date: Mon, 16 Dec 2013 06:20:05 +0100
Subject: [PATCH 2/3] Corrected recipe file according to the comments.

---
 dev-libs/tinyxml2/tinyxml2-2.recipe | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-libs/tinyxml2/tinyxml2-2.recipe b/dev-libs/tinyxml2/tinyxml2-2.recipe
index 7caa2b027..55a7d77a6 100644
--- a/dev-libs/tinyxml2/tinyxml2-2.recipe
+++ b/dev-libs/tinyxml2/tinyxml2-2.recipe
@@ -1,6 +1,6 @@
 DESCRIPTION="
 	TinyXML-2 is a simple, small, efficient, C++ XML parser that can be
-	easily integrating into other programs.
+	easily integrated into other programs.
 	"
 SUMMARY="TinyXML-2 is a simple C++ XML parser."
 HOMEPAGE="http://www.grinninglizard.com/tinyxml2/"
@@ -8,7 +8,7 @@ LICENSE="Zlib"
 COPYRIGHT="2011-2013 Lee Thomason"
 SRC_URI="git+https://github.com/leethomason/tinyxml2.git#343a5ff3bdd7336644db4080f001759e062c359e"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 
@@ -21,9 +21,9 @@ REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
@@ -46,7 +46,7 @@ INSTALL()
 	mv tinyxml2.h $includeDir
 	
 	# prepare development lib links
-	prepareInstalledDevelLib libtinyxml2 .so
+	prepareInstalledDevelLib libtinyxml2
 	
 	# devel package
 	packageEntries devel $developDir

From 8e44fea6e1813cb1c2af1245689f9d874502d258 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Tue, 17 Dec 2013 09:24:40 +0100
Subject: [PATCH 3/3] Fix ruby dependency

* We don't need the lib, only the executable.
* Helps with building on gcc2 since the ruby package isn't hybrid aware.
---
 haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe
index 33e4d9979..18d25876d 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe
@@ -37,8 +37,6 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	haiku_devel >= $haikuVersion
 	icu${secondaryArchSuffix}_devel
-	cmd:pkg_config
-	devel:libruby$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
 	devel:libsqlite3$secondaryArchSuffix
@@ -47,6 +45,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:pkg_config
 	cmd:flex
 	cmd:bison
 	cmd:gcc$secondaryArchSuffix