packages: qt4/qt4.spec - enable STL support - updated BRs enabling OpenVG s...

[baggins]

Author: baggins                      Date: Mon Jun 18 12:14:58 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- enable STL support
- updated BRs enabling OpenVG support
- echo to configure is not needed anywhere
- add a fix for std namespace usage that came out in testing versioned libstdc++

---- Files affected:
packages/qt4:
   qt4.spec (1.315 -> 1.316) 

---- Diffs:

================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.315 packages/qt4/qt4.spec:1.316
--- packages/qt4/qt4.spec:1.315	Sat Jun 16 12:15:18 2012
+++ packages/qt4/qt4.spec	Mon Jun 18 14:14:52 2012
@@ -82,8 +82,11 @@
 Patch9:		%{name}-ibase.patch
 Patch10:	%{name}-git.patch
 Patch11:	qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
+Patch12:	gcc-4.7.patch
 URL:		http://qt.nokia.com/
 %{?with_ibase:BuildRequires:	Firebird-devel}
+BuildRequires:	Mesa-libOpenVG-devel
+BuildRequires:	OpenGL-devel
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	alsa-lib-devel
 %{?with_cups:BuildRequires:	cups-devel}
@@ -1411,6 +1414,7 @@
 %patch9 -p1
 #%patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
 	mkspecs/common/linux.conf
@@ -1454,7 +1458,8 @@
 ##################################
 
 COMMONOPT=" \
-	-confirm-license -opensource \
+	-confirm-license \
+	-opensource \
 	-buildkey pld \
 	-verbose \
 	-prefix %{_qtdir} \
@@ -1469,7 +1474,6 @@
 	-sysconfdir %{_sysconfdir}/qt4 \
 	-examplesdir %{_examplesdir}/qt4 \
 	-demosdir %{_examplesdir}/qt4-demos \
-	-opensource \
 	-optimized-qmake \
 	-fast \
 	-glib \
@@ -1511,6 +1515,7 @@
 	-xfixes \
 	-nis \
 	-sm \
+	-stl \
 	-xcursor \
 	-xinput \
 	-xinerama \
@@ -1560,8 +1565,7 @@
 	-%{!?with_ibase:no}%{?with_ibase:plugin}-sql-ibase \
 	-shared"
 
-echo "o
-yes" | ./configure $COMMONOPT $OPT
+./configure $COMMONOPT $OPT
 
 %{__make}
 %{__make} \
@@ -2418,6 +2422,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.316  2012/06/18 12:14:52  baggins
+- enable STL support
+- updated BRs enabling OpenVG support
+- echo to configure is not needed anywhere
+- add a fix for std namespace usage that came out in testing versioned libstdc++
+
 Revision 1.315  2012/06/16 10:15:18  blekot
 - added -confirm-license -opensource to COMMONOPT and removed pipe to configure
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/qt4/qt4.spec?r1=1.315&r2=1.316