From 8eef628f6f69061fade803e94de5a21dfca271f0 Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Sat, 29 Dec 2012 15:37:34 +0100
Subject: [PATCH] Because of the new OpenSSL exception in the license, patching
 out OpenSSL dependencies is no longer required.

---
 docs/build_mingw_windows.txt | 16 +++++---------
 docs/win32_rm_openssl.diff   | 43 ------------------------------------
 2 files changed, 5 insertions(+), 54 deletions(-)
 delete mode 100644 docs/win32_rm_openssl.diff

diff --git a/docs/build_mingw_windows.txt b/docs/build_mingw_windows.txt
index 954659ac..e6fd79b1 100644
--- a/docs/build_mingw_windows.txt
+++ b/docs/build_mingw_windows.txt
@@ -10,13 +10,7 @@ on your Linux system.
 2. Download the latest release of MXE and extract it to /opt/mingw
 (if this does not work, as some packages might be broken, try the latest development release)
 
-3. Patch OpenSSL dependencies out of Qt build file (OpenSSL license is not compatible with the GPL)
-For your convenience, a patch file is included to remove at least one OpenSSL dependency. This patch
-is without warranty, you need to make sure for yourself that you do not link to OpenSSL.
-Within /opt/mingw, run
-patch -p1 < /path/to/pokerth/docs/win32_rm_openssl.diff
-
-4. Within /opt/mingw, run
+3. Within /opt/mingw, run
 make gcc
 make qt
 make boost
@@ -28,17 +22,17 @@ make libircclient
 make protobuf
 (this takes quite some time)
 
-5. As the user you would like to use to compile PokerTH for Windows,
+4. As the user you would like to use to compile PokerTH for Windows,
 add the cross compiler to your path; e.g.:
 PATH="/opt/mingw/usr/bin:$PATH"
 (in .profile)
 Alternatively, run
 export PATH="/opt/mingw/usr/bin:$PATH"
 
-6. Download and extract whichever source version of PokerTH you wish to compile.
+5. Download and extract whichever source version of PokerTH you wish to compile.
 http://pokerth.net/download.html
 
-7. Within the pokerth directory, run
+6. Within the pokerth directory, run
 i686-pc-mingw32-qmake DEFINES+=BOOST_THREAD_USE_LIB pokerth.pro
 make release
 
@@ -46,4 +40,4 @@ PokerTH can also be built using MinGW or Visual Studio on Windows,
 but neither method is supported, because it takes too much time to keep
 several methods updated.
 
-2011 by Lothar May
+2012 by Lothar May
diff --git a/docs/win32_rm_openssl.diff b/docs/win32_rm_openssl.diff
deleted file mode 100644
index 3c84e1c3..00000000
--- a/docs/win32_rm_openssl.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/src/qt.mk Thu Dec 29 19:46:44 2011 +0100
-+++ b/src/qt.mk Fri Dec 30 23:44:38 2011 +0100
-@@ -10,7 +10,7 @@
- $(PKG)_FILE     := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz
- $(PKG)_WEBSITE  := http://qt.nokia.com/
- $(PKG)_URL      := http://get.qt.nokia.com/qt/source/$($(PKG)_FILE)
--$(PKG)_DEPS     := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus
-+$(PKG)_DEPS     := gcc libodbc++ freetds zlib libpng jpeg libmng tiff sqlite dbus
-
- define $(PKG)_UPDATE
-     wget -q -O- 'http://qt.gitorious.org/qt/qt/commits' | \
-@@ -23,8 +23,6 @@
-     cd '$(1)' && QTDIR='$(1)' ./bin/syncqt
-
-     cd '$(1)' && \
--        OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \
--        PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl` -lws2_32" \
-         SYBASE_LIBS="-lsybdb `'$(TARGET)-pkg-config' --libs-only-l gnutls` -liconv -lws2_32" \
-         ./configure \
-         -opensource \
-@@ -45,6 +43,7 @@
-         -no-gstreamer \
-         -no-phonon \
-         -no-phonon-backend \
-+        -no-openssl \
-         -accessibility \
-         -no-reduce-exports \
-         -no-rpath \
-@@ -54,7 +53,6 @@
-         -nomake examples \
-         -qt-sql-sqlite \
-         -qt-sql-odbc \
--        -qt-sql-psql \
-         -qt-sql-tds -D Q_USE_SYBASE \
-         -system-zlib \
-         -system-libpng \
-@@ -62,7 +60,6 @@
-         -system-libtiff \
-         -system-libmng \
-         -system-sqlite \
--        -openssl-linked \
-         -dbus-linked \
-         -v