From c433f08b940f8cd9f158c35ae5cd9ff7ffb7187a Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Thu, 23 Jan 2014 15:36:14 +0400
Subject: [PATCH] Add libsoup package.

---
 mingw-w64-libsoup/PKGBUILD                   | 47 +++++++++++++++++++
 mingw-w64-libsoup/libsoup-2.42.2-gcc48.patch | 11 +++++
 mingw-w64-ogre/PKGBUILD                      | 48 ++++++++++++--------
 3 files changed, 87 insertions(+), 19 deletions(-)
 create mode 100644 mingw-w64-libsoup/PKGBUILD
 create mode 100644 mingw-w64-libsoup/libsoup-2.42.2-gcc48.patch

diff --git a/mingw-w64-libsoup/PKGBUILD b/mingw-w64-libsoup/PKGBUILD
new file mode 100644
index 0000000000..053ca45584
--- /dev/null
+++ b/mingw-w64-libsoup/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Alexey Pavlov <alexpux@gmail.com>
+
+_realname=libsoup
+_mingw_suff=mingw-w64-${CARCH}
+pkgname="${_mingw_suff}-${_realname}"
+pkgver=2.42.2
+pkgrel=1
+pkgdesc="HTTP client/server library (mingw-w64)"
+arch=(any)
+url="http://ftp.gnome.org/pub/GNOME/sources/libsoup"
+license=("LGPL")
+makedepends=("${_mingw_suff}-gcc" "${_mingw_suff}-pkg-config" "intltool")
+depends=("${_mingw_suff}-gcc-libs"
+		"${_mingw_suff}-glib2"
+		"${_mingw_suff}-libxml2"
+		"${_mingw_suff}-sqlite3"
+		"${_mingw_suff}-glib-networking")
+options=('staticlibs' 'strip')
+source=("http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver%.*}/${_realname}-$pkgver.tar.xz"
+		libsoup-2.42.2-gcc48.patch)
+sha256sums=('1f4f9cc55ba483dc8defea0c3f97cc507dc48384c5529179e29c1e6d05630dbf'
+            '9aa35493a1209c574c36fe3d7bbb8bf611b336d36538aa060c7d42726abc0475')
+
+prepare() {
+	cd "$srcdir/${_realname}-$pkgver"
+	patch -Np1 -i "$srcdir/libsoup-2.42.2-gcc48.patch"
+}
+
+build() {
+    mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+    cd "${srcdir}/build-${MINGW_CHOST}"
+    "${srcdir}"/${_realname}-$pkgver/configure \
+      --prefix=${MINGW_PREFIX} \
+      --build=${MINGW_CHOST} \
+      --host=${MINGW_CHOST} \
+      --without-apache-httpd \
+	  --without-apache-module-dir \
+	  --with-gnome
+    make
+}
+
+package() {
+    cd "${srcdir}/build-${MINGW_CHOST}"
+    make DESTDIR="$pkgdir" install
+	mkdir -p "${pkgdir}${MINGW_PREFIX}/share"
+    mv "${pkgdir}${MINGW_PREFIX}/lib/locale" "${pkgdir}${MINGW_PREFIX}/share/"
+}
diff --git a/mingw-w64-libsoup/libsoup-2.42.2-gcc48.patch b/mingw-w64-libsoup/libsoup-2.42.2-gcc48.patch
new file mode 100644
index 0000000000..1e8219b17a
--- /dev/null
+++ b/mingw-w64-libsoup/libsoup-2.42.2-gcc48.patch
@@ -0,0 +1,11 @@
+--- libsoup-2.42.2/libsoup/soup-request-file.c	2013-03-10 17:57:01.000000000 +0100
++++ libsoup-2.42.2/libsoup/soup-request-file.c	2013-05-06 10:20:51.761034775 +0200
+@@ -25,6 +25,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <string.h>
++
+ #include "soup-request-file.h"
+ #include "soup.h"
+ #include "soup-directory-input-stream.h"
diff --git a/mingw-w64-ogre/PKGBUILD b/mingw-w64-ogre/PKGBUILD
index 7ad954aad9..c3c6eac628 100644
--- a/mingw-w64-ogre/PKGBUILD
+++ b/mingw-w64-ogre/PKGBUILD
@@ -4,37 +4,45 @@ _realname=ogre3d
 _mingw_suff=mingw-w64-${CARCH}
 pkgname="${_mingw_suff}-${_realname}"
 pkgver=1.9.0
-pkgrel=3
+pkgrel=5
 pkgdesc="A cross-platform 3D game engine (mingw-w64)"
 arch=('any')
 url="http://www.ogre3d.org/"
 license=("LGPL")
 makedepends=("${_mingw_suff}-gcc" "${_mingw_suff}-pkg-config" "${_mingw_suff}-cmake" "mercurial")
-depends=("${_mingw_suff}-crt"
-		"${_mingw_suff}-winpthreads"
-		"${_mingw_suff}-tinyxml"
-		"${_mingw_suff}-boost"
-		"${_mingw_suff}-nvidia-cg-toolkit"
+depends=("${_mingw_suff}-boost"
+		"${_mingw_suff}-cppunit"
+		"${_mingw_suff}-FreeImage"
 		"${_mingw_suff}-freetype"
-		"${_mingw_suff}-zlib"
+		"${_mingw_suff}-glsl-optimizer"
+		"${_mingw_suff}-hlsl2glsl"
+		"${_mingw_suff}-nvidia-cg-toolkit"
 		"${_mingw_suff}-ois"
+		"${_mingw_suff}-tinyxml"
+		"${_mingw_suff}-winpthreads"
+		"${_mingw_suff}-zlib"
 		"${_mingw_suff}-zziplib"
 		#"${_mingw_suff}-intel-tbb"
-		"${_mingw_suff}-FreeImage")
-options=('staticlibs' 'strip' '!buildflags')
-source=("${_realname}-${pkgver}.tar.xz"
+		)
+options=('staticlibs' '!strip') # '!buildflags'
+source=("${_realname}-${pkgver}.tar.xz"{,.sig}
 		ogre-1.9.0-fix-cflags.patch
 		ogre-endlessworld-fix.patch
 		ogre-freeimage-fix.patch
 		use-mingw-w64-directx.patch
 		mingw-w64-fix.patch
+		fix-using-locale.patch
 )
-md5sums=('6ed7132f2c56fae29b1b833a9f4588e3'
+md5sums=('7c128aa1bfb5f8793bc2f4c3a09edd0a'
+         'SKIP'
          'a2cbfc846906bbb80c7b05d2d60a2779'
          '3c00c5584a8edcb4dc07a57697a73d59'
          '166486655cd358be175f3b32b63e0ca5'
          '07a29692ee7b30b90c8388af865078da'
-         '56477180dc083746de83ea2aae3efd90')
+         '56477180dc083746de83ea2aae3efd90'
+         '591434cd5990dcad2ba21e5791c44029')
+
+_buildtype=RelWithDebInfo
 
 # source PKGBUILD && mksource
 mksource() {
@@ -74,6 +82,7 @@ prepare() {
   patch -p1 -i ${srcdir}/ogre-freeimage-fix.patch
   patch -p1 -i ${srcdir}/use-mingw-w64-directx.patch
   patch -p1 -i ${srcdir}/mingw-w64-fix.patch
+  patch -p1 -i ${srcdir}/fix-using-locale.patch
 }
 
 build() {
@@ -107,12 +116,13 @@ build() {
 	  -DOGRE_INSTALL_TOOLS=ON \
 	  -DOGRE_COPY_DEPENDENCIES=OFF \
 	  -DOGRE_INSTALL_DEPENDENCIES=OFF \
-	  -DOGRE_BUILD_RENDERSYSTEM_D3D9=OFF \
+	  -DOGRE_BUILD_RENDERSYSTEM_D3D9=ON \
 	  -DOGRE_BUILD_RENDERSYSTEM_D3D11=OFF \
-	  -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+	  -DCMAKE_BUILD_TYPE:STRING=${_buildtype} \
 	  -DFREETYPE_FT2BUILD_INCLUDE_DIR=${PREFIX_DEPS}/include/freetype2 \
+	  -DDirectX9_DXERR_LIBRARY=${PREFIX_DEPS}/${MINGW_CHOST}/lib/libdxerr9.a \
 	  ../${_realname}-${pkgver}
-	  # -DDirectX9_DXERR_LIBRARY=${PREFIX_DEPS}/${MINGW_CHOST}/lib/libdxerr9.a
+	  
     make
 }
 
@@ -121,10 +131,10 @@ package() {
 	make -j1 install #DESTDIR="$pkgdir"
 	pushd ${pkgdir}${MINGW_PREFIX} > /dev/null
 	
-	mv bin/RelWithDebInfo/* bin/
-	rm -r bin/RelWithDebInfo
-	mv lib/RelWithDebInfo/* lib/
-	rm -r lib/RelWithDebInfo
+	mv bin/${_buildtype}/* bin/
+	rm -r bin/${_buildtype}
+	mv lib/${_buildtype}/* lib/
+	rm -r lib/${_buildtype}
 	  
 	sed -i "s|../../|../|g" \
 		bin/plugins.cfg \