From be079286d1268c48d7c9c7339385e5affba6450f Mon Sep 17 00:00:00 2001
From: Niels Horn <niels.horn@gmail.com>
Date: Thu, 13 Sep 2012 11:04:37 -0300
Subject: libraries/qt3: Fixed to build against gcc-4.7

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
---
 libraries/qt3/qt3.SlackBuild  |  9 ++++++---
 libraries/qt3/qt3_gcc47.patch | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 libraries/qt3/qt3_gcc47.patch

(limited to 'libraries/qt3')

diff --git a/libraries/qt3/qt3.SlackBuild b/libraries/qt3/qt3.SlackBuild
index 7bb40f4c8b..379ad3ffc1 100644
--- a/libraries/qt3/qt3.SlackBuild
+++ b/libraries/qt3/qt3.SlackBuild
@@ -2,7 +2,7 @@
 
 # Copyright 2006, 2007, 2008  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
-# Copyrught 2010, 2011 Niels Horn, Rio de Janeiro, RJ, Brazil
+# Copyright 2010-2012  Niels Horn, Rio de Janeiro, RJ, Brazil
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -27,11 +27,11 @@
 # Adapted for SlackBuilds.org by Niels Horn <niels.horn@gmail.com>
 # - moved building from /opt to $TMP
 # - included patch for new libpng (based on work by Stuart Winter)
-# Revision date 2011/12/11
+# Revision date 2012/08/09
 
 PRGNAM=qt3
 VERSION=${VERSION:-3.3.8b}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 SRCNAM=qt-x11-free
@@ -88,6 +88,9 @@ sed -i "s|mysql\.h|mysql/mysql\.h|" src/sql/drivers/mysql/qsql_mysql.h
 # Build with libpng 1.4:
 patch -lp0 < $CWD/qt3-libpng14.diff
 
+# Patch for gcc-4.7 (based on info from LFS)
+patch -p1 < $CWD/qt3_gcc47.patch
+
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
diff --git a/libraries/qt3/qt3_gcc47.patch b/libraries/qt3/qt3_gcc47.patch
new file mode 100644
index 0000000000..7a7da6a3a6
--- /dev/null
+++ b/libraries/qt3/qt3_gcc47.patch
@@ -0,0 +1,20 @@
+--- qt-x11-free-3.3.8b/include/qvaluelist.h	2008-01-15 17:09:13.000000000 -0200
++++ qt-x11-free-3.3.8b_patched/include/qvaluelist.h	2012-08-09 12:23:57.000000000 -0300
+@@ -50,6 +50,7 @@
+ #ifndef QT_NO_STL
+ #include <iterator>
+ #include <list>
++#include <cstddef>
+ #endif
+ 
+ //#define QT_CHECK_VALUELIST_RANGE
+--- qt-x11-free-3.3.8b/src/tools/qvaluelist.h	2008-01-15 17:09:13.000000000 -0200
++++ qt-x11-free-3.3.8b_patched/src/tools/qvaluelist.h	2012-08-09 13:03:09.000000000 -0300
+@@ -50,6 +50,7 @@
+ #ifndef QT_NO_STL
+ #include <iterator>
+ #include <list>
++#include <cstddef>
+ #endif
+ 
+ //#define QT_CHECK_VALUELIST_RANGE
-- 
cgit v1.2.3