- exceptions are used in some parts, rel 44

[packages/qt4.git] / qt4-buildsystem.patch

diff --git a/qt4-buildsystem.patch b/qt4-buildsystem.patch
index 4d8ae3eec5943395cea707ae92a0659d406c4aae..7db68aac1d488a127d7ac4754cba5a94d2502e50 100644 (file)
--- a/qt4-buildsystem.patch
+++ b/qt4-buildsystem.patch
@@ -1,23 +1,14 @@
---- qt-x11-preview-4.0.0-tp1/tools/assistant/lib/lib.pro.orig  2004-07-08 11:14:37.000000000 +0200
-+++ qt-x11-preview-4.0.0-tp1/tools/assistant/lib/lib.pro       2004-07-13 21:53:19.671961608 +0200
-@@ -3,8 +3,6 @@
- VERSION                = 1.0
- 
- CONFIG                += qt warn_on release
--CONFIG                += staticlib
--CONFIG                -= dll
- 
- HEADERS         = qassistantclient.h
- SOURCES         = qassistantclient.cpp
---- qt-x11-free-3.1.1/configure.orig   Fri Nov 29 15:26:24 2002
-+++ qt-x11-free-3.1.1/configure        Fri Feb 14 09:59:20 2003
-@@ -2185,6 +2185,9 @@
-             grep "QMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile
-           EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)"
+--- qt-everywhere-opensource-src-4.8.0/configure~      2011-12-15 15:34:08.000000000 +0100
++++ qt-everywhere-opensource-src-4.8.0/configure       2011-12-15 15:35:49.522563474 +0100
+@@ -4916,6 +4916,11 @@
+                 EXTRA_LFLAGS="\$(QMAKE_LFLAGS_RPATH)\"$rpath\" $EXTRA_LFLAGS"
+             done
          fi
++
 +      if [ -n "$OPTFLAGS" ]; then
-+          EXTRA_CFLAGS="$EXTRA_CFLAGS $OPTFLAGS"
++              EXTRA_CFLAGS="$EXTRA_CFLAGS $OPTFLAGS"
 +      fi
-       if [ "$PLATFORM_MAC" = "yes" ]; then
-           echo "CARBON_LFLAGS +=-framework CoreServices" >>$mkfile
-           EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
++
+         if [ "$BUILD_ON_MAC" = "yes" ]; then
+             case "$PLATFORM" in
+             *macx-clang-libc++)