casa-mp-base

​

--- qt-x11-free-3.3.8/Makefile  2005-01-03 11:08:00.000000000 -0500

+++ qt-x11-free-3.3.8-new/Makefile  2007-10-04 16:09:34.000000000 -0400

@@ -11,7 +11,7 @@

 install: FORCE

    @$(MAKE) qt.install

-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples

+all: symlinks src-qmake src-moc sub-src sub-tools

    @echo

    @echo "The Qt library is now built in ./lib"

    @echo "The Qt examples are built in the directories in ./examples"

--- qt-x11-free-3.3.8/config.tests/x11/xfreetype.test   2004-08-09 16:16:57.000000000 -0400

+++ qt-x11-free-3.3.8-new/config.tests/x11/xfreetype.test   2007-10-04 16:09:34.000000000 -0400

@@ -41,7 +41,7 @@

 LIBS="Xft2 Xft"

 for LIB in $LIBS; do

     for LIBDIR in $LIBDIRS; do

-   EXTENSIONS="a so sl"

+   EXTENSIONS="a so sl dylib"

    for E in $EXTENSIONS; do

        if [ -f "$LIBDIR/lib$LIB.$E" ]; then

        F="$LIB"

--- qt-x11-free-3.3.8/configure 2007-01-15 07:41:50.000000000 -0500

+++ qt-x11-free-3.3.8-new/configure 2007-10-04 16:09:34.000000000 -0400

@@ -36,7 +36,7 @@

 # need that throughout the script

 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown

-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown

+UNAME_RELEASE=`(uname -r | cut -d. -f1) 2>/dev/null` || UNAME_RELEASE=unknown

 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown

 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown

@@ -554,9 +554,9 @@

        QMAKE_PROJECTS="$QMAKE_PROJECTS $relpath/$VAL"

    else

        if [ -d $relpath/$VAL ]; then

-       QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/$VAL -name '*.pro' -print`"

+       QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/$VAL -name '*.pro' -print | grep -v /examples/ | grep -v /tutorial/`"

        else

-       QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/. -name '*.pro' -print`"

+       QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/. -name '*.pro' -print | grep -v /examples/ | grep -v /tutorial/`"

        fi

    fi

    ;;

@@ -1051,8 +1051,8 @@

 [ -z "$QT_INSTALL_DATA" ]         && QT_INSTALL_DATA=$QT_INSTALL_PREFIX

 # default PREFIX/translations

 [ -z "$QT_INSTALL_TRANSLATIONS" ] && QT_INSTALL_TRANSLATIONS=$QT_INSTALL_PREFIX/translations

-# default PREFIX/etc/settings

-[ -z "$QT_INSTALL_SYSCONF" ]      && QT_INSTALL_SYSCONF=$QT_INSTALL_PREFIX/etc/settings

+# default PREFIX/etc/qt

+[ -z "$QT_INSTALL_SYSCONF" ]      && QT_INSTALL_SYSCONF=$QT_INSTALL_PREFIX/etc/qt

 # generate qconfig.cpp

 [ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools

@@ -3087,7 +3087,7 @@

    COMPILER_VERSION="3.*"

    ;;

     *4.*)

-   COMPILER_VERSION="4"

+   COMPILER_VERSION="4.*"