From b37a4059ce5211255a2c3fbed7fab2f70fa2200c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Teuli=C3=A8re?= <ipkiss@gmail.com>
Date: Sun, 20 Jan 2013 11:22:40 +0100
Subject: [PATCH] Contribs: update Qt to version 4.8.2, and provide QtNetwork

---
 extras/contrib/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index 311500c..b7fa50d 100644
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -1,7 +1,7 @@
 ICONV_VERSION = 1.14
 LIBCONFIG_VERSION = 1.4.8
 BOOST_VERSION = 1_49_0
-QT_VERSION = 4.7.2
+QT_VERSION = 4.8.2
 EXPAT_VERSION = 2.0.1
 ARABICA_VERSION = 2010-November
 LIBXML2_VERSION = 2.7.8
@@ -225,7 +225,11 @@ $(QT_DIR_FLAG): $(QT_ARCHIVE)
 	touch $@
 
 .qt: $(QT_DIR_FLAG)
-	# The final mv is needed, because of the way the QT4LOCALEDIR variable is computed
-	(cd $(QT_DIR); cp -r bin include lib share $(PREFIX); sed 's,@@PREFIX@@,$(PREFIX),' $(PREFIX)/lib/pkgconfig/QtCore.pc.in > $(PREFIX)/lib/pkgconfig/QtCore.pc; sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc; rm $(PREFIX)/lib/pkgconfig/*.in; mkdir -p $(PREFIX)/share/qt4; mv $(PREFIX)/share/translations $(PREFIX)/share/qt4)
+	(cd $(QT_DIR); \
+		cp -r bin include lib share $(PREFIX); \
+		for i in QtCore QtGui QtNetwork; do \
+			sed 's,@@PREFIX@@,$(PREFIX),' $(PREFIX)/lib/pkgconfig/$$i.pc.in > $(PREFIX)/lib/pkgconfig/$$i.pc; \
+		done; \
+		rm $(PREFIX)/lib/pkgconfig/*.in)
 	touch $@