[Lunar-commits] <moonbase> qt3: Fix a bug with the newest inputproto.

[Moritz Heiber]

commit 50469054eee47c1c06be3031e6a08cb70095e2a6
Author: Moritz Heiber <moe at lunar-linux.org>
Date:   Sun Apr 27 13:43:06 2008 +0200

    qt3: Fix a bug with the newest inputproto.
    
    Also removed the PRE_BUILD message (its no longer valid).
---
 kde3/base/qt3/BUILD     |   11 +++++++----
 kde3/base/qt3/PRE_BUILD |   14 --------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/kde3/base/qt3/BUILD b/kde3/base/qt3/BUILD
index 271d89f..e4d9464 100644
--- a/kde3/base/qt3/BUILD
+++ b/kde3/base/qt3/BUILD
@@ -4,12 +4,15 @@
   export  LD_LIBRARY_PATH=$QTDIR/lib
   bad_flags "-z combreloc"
 
+  # This fixes a bug with inputproto <= 1.4.3
+  CXXFLAGS+=" -DQT_CLEAN_NAMESPACE"
+
   sedit "s/-O2/$CXXFLAGS/g" mkspecs/linux-g++/qmake.conf  &&
 
   echo "yes" | ./configure          \
                -prefix ${MODULE_PREFIX} \
                -release             \
-               -fast                    \
+               -fast                \
                -shared              \
                -thread              \
                -qt-gif              \
@@ -22,9 +25,9 @@
                -system-zlib         \
                -no-exceptions       \
                -dlopen-opengl       \
-               -xft                    \
-               -xkb                    \
-               -sm                    \
+               -xft                 \
+               -xkb                 \
+               -sm                  \
                -tablet              \
                $OPTS                &&
 
diff --git a/kde3/base/qt3/PRE_BUILD b/kde3/base/qt3/PRE_BUILD
index 76e1936..3e2ee09 100644
--- a/kde3/base/qt3/PRE_BUILD
+++ b/kde3/base/qt3/PRE_BUILD
@@ -1,17 +1,3 @@
-cat << EOF
-Certain environment variables must be defined before compiling and using qt3 
-and applications that depend on qt3, QT_PREFIX and/or QTDIR. 
-The default values are:
-   QT_PREFIX="${MODULE_PREFIX}" 
-   QTDIR="${MODULE_PREFIX}"
-You can put the file actual.rc in the /etc/profile.d directory containing the 
-new value of QT_PREFIX, and it's value will be used as the location where the 
-qt3 module to be installed. QTDIR value is used as a default value unless a 
-new value is set for QT_PREFIX. Remember to logout and login again after you
-put/alter the actual.rc file, in order to be processed, and after that to 
-begin the qt3 install process.
-EOF
-
 if module_installed qt3 ; then
   lrm --upgrade qt3
 fi &&