Browse Source

qt -> tqt conversion:

QTDIR -> TQTDIR
QTDOC -> TQTDOC
INCDIR_QT -> INCDIR_TQT
LIBDIR_QT -> LIBDIR_TQT
QT_INC -> TQT_INC
QT_LIB -> TQT_LIB

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
master
Michele Calgaro 10 months ago
parent
commit
6b7029b1e5
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF

+ 3
- 8
libreoffice/3.3.2/patches/libreoffice-trinity.diff View File

@@ -128,12 +128,12 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt3/include /usr/lib64/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include /usr/local/include/X11/qt3 $x_includes"
++ qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt3/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/local/lib/qt3 $x_libraries"
++ fi
++ if test -n "$QTDIR" ; then
++ qt_incdirs="$QTDIR/include $qt_incdirs"
++ if test "$build_cpu" != "x86_64" ; then
++ qt_libdirs="$QTDIR/lib $qt_libdirs"
++ else
++ qt_libdirs="$QTDIR/lib64 $QTDIR/lib $qt_libdirs"
++ fi
++ fi
++ if test "$build_cpu" != "x86_64" ; then
@@ -170,7 +170,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ AC_MSG_RESULT([$qt_incdir])
++ if test "x$qt_incdir" = "xno" ; then
++ AC_MSG_ERROR([Qt3 headers not found. Please specify the root of
++your Qt3 installation by exporting QTDIR before running "configure".])
++your Qt3 installation by exporting TQTDIR before running "configure".])
++ fi
++
++ dnl Check for Qt3 libraries
@@ -185,14 +185,14 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ AC_MSG_RESULT([$qt_libdir])
++ if test "x$qt_libdir" = "xno" ; then
++ AC_MSG_ERROR([Qt3 libraries not found. Please specify the root of
++your Qt3 installation by exporting QTDIR before running "configure".])
++your Qt3 installation by exporting TQTDIR before running "configure".])
++ fi
++
++ dnl Check for Meta Object Compiler
++ AC_PATH_PROG( MOC, moc, no, [`dirname $qt_libdir`/bin:$QTDIR/bin:$PATH] )
++ if test "$MOC" = "no" ; then
++ AC_MSG_ERROR([Qt3 Meta Object Compiler not found. Please specify
++the root of your Qt3 installation by exporting QTDIR before running "configure".])
++the root of your Qt3 installation by exporting TQTDIR before running "configure".])
++ fi
++
++ dnl Check for TDE headers

+ 3
- 8
libreoffice/3.3.3/patches/libreoffice-trinity.diff View File

@@ -128,12 +128,12 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt3/include /usr/lib64/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include /usr/local/include/X11/qt3 $x_includes"
++ qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt3/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/local/lib/qt3 $x_libraries"
++ fi
++ if test -n "$QTDIR" ; then
++ qt_incdirs="$QTDIR/include $qt_incdirs"
++ if test "$build_cpu" != "x86_64" ; then
++ qt_libdirs="$QTDIR/lib $qt_libdirs"
++ else
++ qt_libdirs="$QTDIR/lib64 $QTDIR/lib $qt_libdirs"
++ fi
++ fi
++ if test "$build_cpu" != "x86_64" ; then
@@ -170,7 +170,7 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ AC_MSG_RESULT([$qt_incdir])
++ if test "x$qt_incdir" = "xno" ; then
++ AC_MSG_ERROR([Qt3 headers not found. Please specify the root of
++your Qt3 installation by exporting QTDIR before running "configure".])
++your Qt3 installation by exporting TQTDIR before running "configure".])
++ fi
++
++ dnl Check for Qt3 libraries
@@ -185,14 +185,14 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++ AC_MSG_RESULT([$qt_libdir])
++ if test "x$qt_libdir" = "xno" ; then
++ AC_MSG_ERROR([Qt3 libraries not found. Please specify the root of
++your Qt3 installation by exporting QTDIR before running "configure".])
++your Qt3 installation by exporting TQTDIR before running "configure".])
++ fi
++
++ dnl Check for Meta Object Compiler
++ AC_PATH_PROG( MOC, moc, no, [`dirname $qt_libdir`/bin:$QTDIR/bin:$PATH] )
++ if test "$MOC" = "no" ; then
++ AC_MSG_ERROR([Qt3 Meta Object Compiler not found. Please specify
++the root of your Qt3 installation by exporting QTDIR before running "configure".])
++the root of your Qt3 installation by exporting TQTDIR before running "configure".])
++ fi
++
++ dnl Check for TDE headers

+ 8
- 8
libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff View File

@@ -140,12 +140,12 @@ index 3b48331..2888cbb 100644
+ qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt3/include /usr/lib64/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include /usr/local/include/X11/qt3 $x_includes"
+ qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt3/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/local/lib/qt3 $x_libraries"
+ fi
+ if test -n "$QTDIR" ; then
+ qt_incdirs="$QTDIR/include $qt_incdirs"
+ if test -n "$TQTDIR" ; then
+ qt_incdirs="$TQTDIR/include $qt_incdirs"
+ if test "$build_cpu" != "x86_64" ; then
+ qt_libdirs="$QTDIR/lib $qt_libdirs"
+ qt_libdirs="$TQTDIR/lib $qt_libdirs"
+ else
+ qt_libdirs="$QTDIR/lib64 $QTDIR/lib $qt_libdirs"
+ qt_libdirs="$TQTDIR/lib64 $TQTDIR/lib $qt_libdirs"
+ fi
+ fi
+ if test "$build_cpu" != "x86_64" ; then
@@ -182,7 +182,7 @@ index 3b48331..2888cbb 100644
+ AC_MSG_RESULT([$qt_incdir])
+ if test "x$qt_incdir" = "xno" ; then
+ AC_MSG_ERROR([Qt3 headers not found. Please specify the root of
+your Qt3 installation by exporting QTDIR before running "configure".])
+your Qt3 installation by exporting TQTDIR before running "configure".])
+ fi
+
+ dnl Check for Qt3 libraries
@@ -197,14 +197,14 @@ index 3b48331..2888cbb 100644
+ AC_MSG_RESULT([$qt_libdir])
+ if test "x$qt_libdir" = "xno" ; then
+ AC_MSG_ERROR([Qt3 libraries not found. Please specify the root of
+your Qt3 installation by exporting QTDIR before running "configure".])
+your Qt3 installation by exporting TQTDIR before running "configure".])
+ fi
+
+ dnl Check for Meta Object Compiler
+ AC_PATH_PROG( MOC, tmoc, no, [`dirname $qt_libdir`/bin:$QTDIR/bin:$PATH] )
+ AC_PATH_PROG( MOC, tmoc, no, [`dirname $qt_libdir`/bin:$TQTDIR/bin:$PATH] )
+ if test "$MOC" = "no" ; then
+ AC_MSG_ERROR([TQt3 Meta Object Compiler not found. Please specify
+the root of your Qt3 installation by exporting QTDIR before running "configure".])
+the root of your Qt3 installation by exporting TQTDIR before running "configure".])
+ fi
+
+ dnl Check for TDE headers

Loading…
Cancel
Save