summaryrefslogtreecommitdiff
path: root/x11/qt4-libs/patches/patch-ab
diff options
context:
space:
mode:
Diffstat (limited to 'x11/qt4-libs/patches/patch-ab')
-rw-r--r--x11/qt4-libs/patches/patch-ab38
1 files changed, 19 insertions, 19 deletions
diff --git a/x11/qt4-libs/patches/patch-ab b/x11/qt4-libs/patches/patch-ab
index e32265bd9a5..71ac94e7bbf 100644
--- a/x11/qt4-libs/patches/patch-ab
+++ b/x11/qt4-libs/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2007/09/03 09:35:16 drochner Exp $
+$NetBSD: patch-ab,v 1.6 2008/07/24 12:55:20 markd Exp $
---- src/gui/painting/painting.pri.orig 2007-08-07 15:08:41.000000000 +0200
+--- src/gui/painting/painting.pri.orig 2008-04-28 15:11:18.000000000 +0200
+++ src/gui/painting/painting.pri
-@@ -182,11 +182,11 @@ mac {
+@@ -197,11 +197,11 @@ mac {
win32-g++|!win32:!*-icc* {
mmx {
-- mmx_compiler.commands = $$QMAKE_CXX -c
-+ mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+- mmx_compiler.commands = $$QMAKE_CXX -c -Winline
++ mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
mmx_compiler.commands += -mmmx
mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
mmx_compiler.dependency_type = TYPE_C
@@ -16,12 +16,12 @@ $NetBSD: patch-ab,v 1.5 2007/09/03 09:35:16 drochner Exp $
mmx_compiler.input = MMX_SOURCES
mmx_compiler.variable_out = OBJECTS
mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN}
-@@ -194,22 +194,22 @@ mac {
+@@ -209,22 +209,22 @@ mac {
QMAKE_EXTRA_COMPILERS += mmx_compiler
}
3dnow {
-- mmx3dnow_compiler.commands = $$QMAKE_CXX -c
-+ mmx3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+- mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
++ mmx3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
mmx3dnow_compiler.commands += -m3dnow -mmmx
mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
mmx3dnow_compiler.dependency_type = TYPE_C
@@ -33,8 +33,8 @@ $NetBSD: patch-ab,v 1.5 2007/09/03 09:35:16 drochner Exp $
silent:mmx3dnow_compiler.commands = @echo compiling[mmx3dnow] ${QMAKE_FILE_IN} && $$mmx3dnow_compiler.commands
QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler
sse {
-- sse3dnow_compiler.commands = $$QMAKE_CXX -c
-+ sse3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+- sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
++ sse3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
sse3dnow_compiler.commands += -m3dnow -msse
sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
sse3dnow_compiler.dependency_type = TYPE_C
@@ -43,12 +43,12 @@ $NetBSD: patch-ab,v 1.5 2007/09/03 09:35:16 drochner Exp $
sse3dnow_compiler.input = SSE3DNOW_SOURCES
sse3dnow_compiler.variable_out = OBJECTS
sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN}
-@@ -218,11 +218,11 @@ mac {
+@@ -233,11 +233,11 @@ mac {
}
}
sse {
-- sse_compiler.commands = $$QMAKE_CXX -c
-+ sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+- sse_compiler.commands = $$QMAKE_CXX -c -Winline
++ sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
sse_compiler.commands += -msse
sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
sse_compiler.dependency_type = TYPE_C
@@ -57,12 +57,12 @@ $NetBSD: patch-ab,v 1.5 2007/09/03 09:35:16 drochner Exp $
sse_compiler.input = SSE_SOURCES
sse_compiler.variable_out = OBJECTS
sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN}
-@@ -230,11 +230,11 @@ mac {
+@@ -245,11 +245,11 @@ mac {
QMAKE_EXTRA_COMPILERS += sse_compiler
}
sse2 {
-- sse2_compiler.commands = $$QMAKE_CXX -c
-+ sse2_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+- sse2_compiler.commands = $$QMAKE_CXX -c -Winline
++ sse2_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
sse2_compiler.commands += -msse2
sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
sse2_compiler.dependency_type = TYPE_C
@@ -71,12 +71,12 @@ $NetBSD: patch-ab,v 1.5 2007/09/03 09:35:16 drochner Exp $
sse2_compiler.input = SSE2_SOURCES
sse2_compiler.variable_out = OBJECTS
sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN}
-@@ -242,11 +242,11 @@ mac {
+@@ -257,11 +257,11 @@ mac {
QMAKE_EXTRA_COMPILERS += sse2_compiler
}
iwmmxt {
-- iwmmxt_compiler.commands = $$QMAKE_CXX -c
-+ iwmmxt_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+- iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline
++ iwmmxt_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
iwmmxt_compiler.commands += -mcpu=iwmmxt
iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
iwmmxt_compiler.dependency_type = TYPE_C