From 5889e7e25154c63b61d13532909e7c253149a914 Mon Sep 17 00:00:00 2001
From: Christian Wiese <christian.wiese@securepoint.de>
Date: Tue, 18 Jun 2013 13:36:13 +0200
Subject: [PATCH] qt4: Updated (4.7.4 -> 4.8.4)

---
 qt/qt4/qt4-translations-build-fix.patch | 44 +++++++++++++++++++++++++
 qt/qt4/qt4.conf                         |  5 +++
 qt/qt4/qt4.desc                         |  4 +--
 3 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 qt/qt4/qt4-translations-build-fix.patch

diff --git a/qt/qt4/qt4-translations-build-fix.patch b/qt/qt4/qt4-translations-build-fix.patch
new file mode 100644
index 000000000..d5b35ab6b
--- /dev/null
+++ b/qt/qt4/qt4-translations-build-fix.patch
@@ -0,0 +1,44 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../qt4/qt4-translations-build-fix.patch
+# Copyright (C) 2013 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+without this patch we get following error when linking
+-----------------------------------------------------------------------------
+g++ -Wl,-rpath-link,/TOOLCHAIN/src.qt4.uma.20130618.102156.21560.builder64/qt-everywhere-opensource-src-4.8.4/lib -Wl,-O1 -o qm_phony_target
+/usr/lib/gcc/i686-unknown-linux-gnu/4.7.3/../../../crt1.o: In function `_start':
+(.text+0x18): undefined reference to `main'
+collect2: error: ld returned 1 exit status
+-----------------------------------------------------------------------------
+
+--- qt-everywhere-opensource-src-4.8.4/translations/translations.pro.orig	2013-06-18 12:51:39.085600311 +0200
++++ qt-everywhere-opensource-src-4.8.4/translations/translations.pro	2013-06-18 12:53:40.134783556 +0200
+@@ -101,7 +101,7 @@
+ updateqm.CONFIG += no_link
+ QMAKE_EXTRA_COMPILERS += updateqm
+ 
+-isEmpty(vcproj) {
++!isEmpty(vcproj) {
+     QMAKE_LINK = @: IGNORE THIS LINE
+     OBJECTS_DIR =
+     win32:CONFIG -= embed_manifest_exe
+@@ -111,7 +111,7 @@
+     phony_src.input = PHONY_DEPS
+     phony_src.output = phony.c
+     phony_src.variable_out = GENERATED_SOURCES
+-    phony_src.commands = echo int main() { return 0; } > phony.c
++    phony_src.commands = echo \"int main() { return 0; }\" > phony.c
+     phony_src.name = CREATE phony.c
+     phony_src.CONFIG += combine
+     QMAKE_EXTRA_COMPILERS += phony_src
diff --git a/qt/qt4/qt4.conf b/qt/qt4/qt4.conf
index 1c2a2545f..48f2f42e4 100644
--- a/qt/qt4/qt4.conf
+++ b/qt/qt4/qt4.conf
@@ -130,6 +130,11 @@ for tuple in $tuples; do
 	fi
 done
 
+# explicitely use C++ compiler for linking because '-Wl' is not working
+# when directly using 'ld'
+var_append makeopt ' ' "LINK=$CXX"
+var_append makeinstopt ' ' "LINK=$CXX"
+
 hook_add preconf 5 "pkg_qt4_preconf"
 hook_add postmake 5 "pkg_qt4_profiled"
 
diff --git a/qt/qt4/qt4.desc b/qt/qt4/qt4.desc
index 17bed4a73..3d7c84d78 100644
--- a/qt/qt4/qt4.desc
+++ b/qt/qt4/qt4.desc
@@ -33,7 +33,7 @@
 
 [L] GPL
 [S] Stable
-[V] 4.7.4
+[V] 4.8.4
 [P] X -----5---9 127.000
 
-[D] 964586518 qt-everywhere-opensource-src-4.7.4.tar.gz http://download.qt-project.org/archive/qt/4.7/
+[D] 1446907036 qt-everywhere-opensource-src-4.8.4.tar.gz http://download.qt-project.org/official_releases/qt/4.8/4.8.4/