mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-20 19:41:34 +01:00
libraries/qt3: Fixed to build against gcc-4.7
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
This commit is contained in:
parent
d1768face2
commit
be079286d1
2 changed files with 26 additions and 3 deletions
|
@ -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 . \
|
||||
|
|
20
libraries/qt3/qt3_gcc47.patch
Normal file
20
libraries/qt3/qt3_gcc47.patch
Normal file
|
@ -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
|
Loading…
Reference in a new issue