rev 6634 - in trunk/packages/qt4-x11/debian: . patches
Fathi Boudra
fboudra-guest at alioth.debian.org
Sun Jul 1 17:09:56 UTC 2007
Author: fboudra-guest
Date: 2007-07-01 17:09:55 +0000 (Sun, 01 Jul 2007)
New Revision: 6634
Added:
trunk/packages/qt4-x11/debian/patches/00_0172-prefer-xrandr-over-xinerama.dpatch
trunk/packages/qt4-x11/debian/patches/00_0177-qurl-clear-fix.dpatch
trunk/packages/qt4-x11/debian/patches/00_0183-qprocess-corruption.dpatch
trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.dpatch
trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.dpatch
trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.dpatch
Removed:
trunk/packages/qt4-x11/debian/patches/00_0182-argb-visuals-default.dpatch
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/control
trunk/packages/qt4-x11/debian/patches/00list
trunk/packages/qt4-x11/debian/rules
Log:
* Update control:
* Replace deprecated ${Source-Version} by ${source:Version}.
* Remove useless ${misc:Depends}.
* Update rules:
* Add bindir and libdir configure options.
* Replace common-install-arch target. Replaced by build system patches and
a fix for pkgconfig files. (Closes: #401807)
* Add patches:
* 04_launch_uic-qt4: call uic-qt4 binary.
* 05_append_qt4_target: append -qt4 when needed. It fixes moc-location and
uic_location are properly in pkgconfig files. (See bug #401807)
* 06_qtdemo_destdir: remove QT_BUILD_TREE in qtdemo DESTDIR target.
(Closes: #408639)
* Revert Qt handling argb visuals on X11 patch. There are dependencies
not fixed in Qt. They cause a few regressions when this patch is applied.
(Closes: #430907)
* Apply qt-copy patches:
* 00_0172-prefer-xrandr-over-xinerama: only trust libxinerama if it is not
the emulated information coming from xrandr 1.2.
* 00_0177-qurl-clear-fix: fix QUrl::clear(). Applied upstream.
* 00_0183-qprocess-corruption: fix plain data loss bug. Applied Upstream.
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2007-07-01 15:05:27 UTC (rev 6633)
+++ trunk/packages/qt4-x11/debian/changelog 2007-07-01 17:09:55 UTC (rev 6634)
@@ -1,9 +1,27 @@
qt4-x11 (4.3.0-3) unstable; urgency=low
[Fathi Boudra]
+ * Update control:
+ * Replace deprecated ${Source-Version} by ${source:Version}.
+ * Remove useless ${misc:Depends}.
+ * Update rules:
+ * Add bindir and libdir configure options.
+ * Replace common-install-arch target. Replaced by build system patches and
+ a fix for pkgconfig files. (Closes: #401807)
+ * Add patches:
+ * 04_launch_uic-qt4: call uic-qt4 binary.
+ * 05_append_qt4_target: append -qt4 when needed. It fixes moc-location and
+ uic_location are properly in pkgconfig files. (See bug #401807)
+ * 06_qtdemo_destdir: remove QT_BUILD_TREE in qtdemo DESTDIR target.
+ (Closes: #408639)
* Revert Qt handling argb visuals on X11 patch. There are dependencies
not fixed in Qt. They cause a few regressions when this patch is applied.
(Closes: #430907)
+ * Apply qt-copy patches:
+ * 00_0172-prefer-xrandr-over-xinerama: only trust libxinerama if it is not
+ the emulated information coming from xrandr 1.2.
+ * 00_0177-qurl-clear-fix: fix QUrl::clear(). Applied upstream.
+ * 00_0183-qprocess-corruption: fix plain data loss bug. Applied Upstream.
-- Fathi Boudra <fboudra at free.fr> Fri, 29 Jun 2007 08:15:23 +0200
Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control 2007-07-01 15:05:27 UTC (rev 6633)
+++ trunk/packages/qt4-x11/debian/control 2007-07-01 17:09:55 UTC (rev 6634)
@@ -9,7 +9,7 @@
Package: libqt4-dev
Architecture: any
Section: libdevel
-Depends: ${misc:Depends}, libqt4-core (= ${Source-Version}), libqt4-gui (= ${Source-Version}), libqt4-sql (= ${Source-Version}), libqt4-qt3support (= ${Source-Version}), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x11proto-core-dev, libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev, libpq-dev, libglib2.0-dev, libsqlite0-dev
+Depends: libqt4-core (= ${source:Version}), libqt4-gui (= ${source:Version}), libqt4-sql (= ${source:Version}), libqt4-qt3support (= ${source:Version}), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x11proto-core-dev, libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev, libpq-dev, libglib2.0-dev, libsqlite0-dev
Conflicts: qt3-dev-tools (<= 3:3.3.4-7)
Recommends: qt4-dev-tools
Suggests: qt4-doc
@@ -25,7 +25,7 @@
Package: libqt4-core
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
Description: Qt 4 core non-GUI functionality runtime library
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -38,7 +38,7 @@
Package: libqt4-gui
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, fontconfig
+Depends: ${shlibs:Depends}, fontconfig
Recommends: qt4-qtconfig
Replaces: libqt4-core (<< 4.0.1-3), qt4-designer (<< 4.1.4), libqt4-designer
Conflicts: libqt4-designer
@@ -54,7 +54,7 @@
Package: libqt4-sql
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
Suggests: libqt4-dev
Description: Qt 4 SQL database module
Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -69,7 +69,7 @@
Package: libqt4-qt3support
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
Replaces: libqt4-gui (<< 4.2.1-1)
Description: Qt 3 compatibility library for Qt 4
Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -85,7 +85,7 @@
Package: qt4-designer
Architecture: any
Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-dev
+Depends: ${shlibs:Depends}, libqt4-dev
Conflicts: libqt4-designer
Replaces: libqt4-designer, qt4-dev-tools (<= 4.0.1-2)
Description: Qt 4 Designer
@@ -99,7 +99,7 @@
Package: libqt4-debug
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-gui (= ${Source-Version})
+Depends: ${shlibs:Depends}, libqt4-gui (= ${source:Version})
Description: Qt 4 library debugging symbols
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -111,7 +111,7 @@
Package: qt4-dev-tools
Architecture: any
Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-core (= ${Source-Version})
+Depends: ${shlibs:Depends}, libqt4-core (= ${source:Version})
Conflicts: qt3-assistant (<= 3:3.3.4-7), qt3-designer (<= 3:3.3.4-7), qt3-linguist (<= 3:3.3.4-7)
Recommends: libqt4-dev, qt4-doc, qt4-designer
Description: Qt 4 development tools
@@ -126,7 +126,7 @@
Package: qt4-qtconfig
Architecture: any
Section: x11
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
Replaces: libqt4-gui (<< 4.1.0)
Conflicts: qt3-qtconfig (<= 3:3.3.4-7)
Description: Qt 4 configuration tool
@@ -141,7 +141,6 @@
Package: qt4-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}
Suggests: w3m | www-browser, libqt4-dev, qt4-dev-tools
Description: Qt 4 API documentation
Qt is a cross-platform C++ application framework. Qt's primary feature
Added: trunk/packages/qt4-x11/debian/patches/00_0172-prefer-xrandr-over-xinerama.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00_0172-prefer-xrandr-over-xinerama.dpatch (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/00_0172-prefer-xrandr-over-xinerama.dpatch 2007-07-01 17:09:55 UTC (rev 6634)
@@ -0,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0172-prefer-xrandr-over-xinerama.dpatch by Dirk Mueller
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: only trust libxinerama if its not the emulated information
+## DP: coming from xrandr 1.2. xrandr 1.2 is merged fb and libxinerama
+## DP: presents then virtual screens in clone mode, which qt (and KDE)
+## DP: can't deal with.
+## DP: proper fix would be to detect crtcs as virtual screens, but
+## DP: given that qt can't deal with dynamically changing number of screens,
+## DP: this is for "when I have time".
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~/src/gui/kernel/qdesktopwidget_x11.cpp qt4-x11-4.3.0/src/gui/kernel/qdesktopwidget_x11.cpp
+--- qt4-x11-4.3.0~/src/gui/kernel/qdesktopwidget_x11.cpp 2007-05-25 15:24:19.000000000 +0200
++++ qt4-x11-4.3.0/src/gui/kernel/qdesktopwidget_x11.cpp 2007-06-30 19:52:05.000000000 +0200
+@@ -109,11 +109,38 @@
+ int unused;
+ use_xinerama = (XineramaQueryExtension(X11->display, &unused, &unused) && XineramaIsActive(X11->display));
+
++ // only use xinerama for old Xrandr versions
++#ifndef QT_NO_XRANDR
++ int ncrtc = 0;
++ if (X11->use_xrandr) {
++ int major, minor;
++
++#if RANDR_MAJOR > 1 || RANDR_MINOR > 1
++ XRRQueryVersion(QPaintDevice::x11AppDisplay(), &major, &minor);
++ if (major > 1 || (major == 1 && minor >= 2)) {
++ XRRScreenResources* res;
++ res = XRRGetScreenResources(QPaintDevice::x11AppDisplay(),
++ QPaintDevice::x11AppRootWindow( 0 ));
++ if (res) {
++ ncrtc = res->ncrtc;
++ XRRFreeScreenResources(res);
++ }
++ }
++#endif
++ }
++#endif
++
+ if (use_xinerama) {
+ xinerama_screeninfo =
+ XineramaQueryScreens(X11->display, &screenCount);
+ defaultScreen = 0;
+- } else
++ }
++#ifndef QT_NO_XRANDR
++ if (use_xinerama && screenCount <= ncrtc) {
++ use_xinerama = FALSE;
++ }
++#endif
++ else
+ #endif // QT_NO_XINERAMA
+ {
+ defaultScreen = DefaultScreen(X11->display);
Property changes on: trunk/packages/qt4-x11/debian/patches/00_0172-prefer-xrandr-over-xinerama.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/qt4-x11/debian/patches/00_0177-qurl-clear-fix.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00_0177-qurl-clear-fix.dpatch (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/00_0177-qurl-clear-fix.dpatch 2007-07-01 17:09:55 UTC (rev 6634)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0177-qurl-clear-fix.dpatch by Trolltech ASA
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix QUrl::clear().
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~/src/corelib/io/qurl.cpp qt4-x11-4.3.0/src/corelib/io/qurl.cpp
+--- qt4-x11-4.3.0~/src/corelib/io/qurl.cpp 2007-05-25 15:24:10.000000000 +0200
++++ qt4-x11-4.3.0/src/corelib/io/qurl.cpp 2007-06-30 19:52:57.000000000 +0200
+@@ -3421,6 +3421,7 @@
+ fragment.clear();
+
+ encodedOriginal.clear();
++ encodedNormalized.clear();
+
+ isValid = false;
+ hasQuery = false;
+@@ -3429,7 +3430,7 @@
+ valueDelimiter = '=';
+ pairDelimiter = '&';
+
+- QURL_UNSETFLAG(stateFlags, Parsed | Validated);
++ QURL_UNSETFLAG(stateFlags, Parsed | Validated | Normalized);
+ }
+
+ QByteArray QUrlPrivate::toEncoded(QUrl::FormattingOptions options) const
Property changes on: trunk/packages/qt4-x11/debian/patches/00_0177-qurl-clear-fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/packages/qt4-x11/debian/patches/00_0182-argb-visuals-default.dpatch
Added: trunk/packages/qt4-x11/debian/patches/00_0183-qprocess-corruption.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00_0183-qprocess-corruption.dpatch (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/00_0183-qprocess-corruption.dpatch 2007-07-01 17:09:55 UTC (rev 6634)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0183-qprocess-corruption.dpatch by Andreas Aardal Hanssen <ahanssen at trolltech.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix plain data loss bug.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~/src/corelib/io/qprocess.cpp qt4-x11-4.3.0/src/corelib/io/qprocess.cpp
+--- qt4-x11-4.3.0~/src/corelib/io/qprocess.cpp 2007-05-25 15:24:09.000000000 +0200
++++ qt4-x11-4.3.0/src/corelib/io/qprocess.cpp 2007-06-30 19:53:44.000000000 +0200
+@@ -826,15 +826,21 @@
+ read(), readAll(), readLine(), and getChar(). It also determines
+ which channel triggers QProcess to emit readyRead().
+
+- Changing the read channel will clear the unget buffer.
+-
+ \sa readChannel()
+ */
+ void QProcess::setReadChannel(ProcessChannel channel)
+ {
+ Q_D(QProcess);
+- if (d->processChannel != channel)
+- d->buffer.clear();
++ if (d->processChannel != channel) {
++ QByteArray buf = d->buffer.readAll();
++ if (d->processChannel == QProcess::StandardOutput) {
++ for (int i = buf.size() - 1; i >= 0; --i)
++ d->outputReadBuffer.ungetChar(buf.at(i));
++ } else {
++ for (int i = buf.size() - 1; i >= 0; --i)
++ d->errorReadBuffer.ungetChar(buf.at(i));
++ }
++ }
+ d->processChannel = channel;
+ }
+
Property changes on: trunk/packages/qt4-x11/debian/patches/00_0183-qprocess-corruption.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/qt4-x11/debian/patches/00list
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00list 2007-07-01 15:05:27 UTC (rev 6633)
+++ trunk/packages/qt4-x11/debian/patches/00list 2007-07-01 17:09:55 UTC (rev 6634)
@@ -1,14 +1,20 @@
00_0163-fix-gcc43-support
00_0167-fix-group-reading
+00_0172-prefer-xrandr-over-xinerama
00_0175-fix-s390-qatomic
00_0176-coverity-fixes
+00_0177-qurl-clear-fix
00_0178-transparency-window-types
00_0179-transient-hack
00_0180-window-role
00_0181-qdnd-x11-fix
+00_0183-qprocess-corruption
01_qmake_for_debian
02_launch_assistant-qt4
03_launch_moc-qt4
+04_launch_uic-qt4
+05_append_qt4_target
+06_qtdemo_destdir
20_mips_atomic_ops
30_arm_ftbfs_fixes
31_arm_eabi_fix
@@ -19,4 +25,3 @@
60_m68k_inotify_fix
70_hppa_ldcw_fix
80_hurd_max_path
-
Added: trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.dpatch (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.dpatch 2007-07-01 17:09:55 UTC (rev 6634)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ensure-uic.dpatch by Fathi Boudra <fboudra at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~/tools/designer/src/lib/shared/qdesigner_utils.cpp qt4-x11-4.3.0/tools/designer/src/lib/shared/qdesigner_utils.cpp
+--- qt4-x11-4.3.0~/tools/designer/src/lib/shared/qdesigner_utils.cpp 2007-05-25 15:25:01.000000000 +0200
++++ qt4-x11-4.3.0/tools/designer/src/lib/shared/qdesigner_utils.cpp 2007-07-01 11:14:29.000000000 +0200
+@@ -120,7 +120,7 @@
+ binary += QDir::separator();
+ switch (mode) {
+ case UIC_GenerateCode:
+- binary += QLatin1String("uic");
++ binary += QLatin1String("uic-qt4");
+ break;
+ case UIC_ConvertV3:
+ binary += QLatin1String("uic3");
Property changes on: trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.dpatch (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.dpatch 2007-07-01 17:09:55 UTC (rev 6634)
@@ -0,0 +1,244 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-target.dpatch by Fathi Boudra <fboudra at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~/configure qt4-x11-4.3.0/configure
+--- qt4-x11-4.3.0~/configure 2007-05-25 15:24:55.000000000 +0200
++++ qt4-x11-4.3.0/configure 2007-07-01 11:54:42.000000000 +0200
+@@ -3398,7 +3398,7 @@
+ }
+
+ # build qmake
+-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
++if true; then ###[ '!' -f "$outpath/bin/qmake-qt4" ];
+ echo "Creating qmake. Please wait..."
+
+ OLD_QCONFIG_H=
+@@ -5312,8 +5312,8 @@
+ QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
+
+ #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
+-QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc
+-QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic
++QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc-qt4
++QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic-qt4
+ QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3
+ QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
+ QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
+@@ -5577,11 +5577,11 @@
+ #-------------------------------------------------------------------------------
+
+ echo "Finding project files. Please wait..."
+-"$outpath/bin/qmake" -prl -r "${relpath}/projects.pro"
++"$outpath/bin/qmake-qt4" -prl -r "${relpath}/projects.pro"
+ if [ -f "${relpath}/projects.pro" ]; then
+ mkfile="${outpath}/Makefile"
+ [ -f "$mkfile" ] && chmod +w "$mkfile"
+- QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile"
++ QTDIR="$outpath" "$outpath/bin/qmake-qt4" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile"
+ fi
+
+ # .projects -> projects to process
+@@ -5754,7 +5754,7 @@
+ echo " for $a\c"
+ fi
+
+- QMAKE="$outpath/bin/qmake"
++ QMAKE="$outpath/bin/qmake-qt4"
+ QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS"
+ if [ "$file" = ".projects.3" ]; then
+ if echo '\c' | grep '\c' >/dev/null; then
+diff -urNad qt4-x11-4.3.0~/config.tests/unix/compile.test qt4-x11-4.3.0/config.tests/unix/compile.test
+--- qt4-x11-4.3.0~/config.tests/unix/compile.test 2007-05-25 15:24:34.000000000 +0200
++++ qt4-x11-4.3.0/config.tests/unix/compile.test 2007-07-01 12:16:50.000000000 +0200
+@@ -51,7 +51,7 @@
+ cd "$OUTDIR/$TEST"
+
+ make distclean >/dev/null 2>&1
+-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
++"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
+
+ if [ "$VERBOSE" = "yes" ]; then
+ make
+diff -urNad qt4-x11-4.3.0~/config.tests/unix/doubleformat.test qt4-x11-4.3.0/config.tests/unix/doubleformat.test
+--- qt4-x11-4.3.0~/config.tests/unix/doubleformat.test 2007-05-25 15:24:34.000000000 +0200
++++ qt4-x11-4.3.0/config.tests/unix/doubleformat.test 2007-07-01 12:15:52.000000000 +0200
+@@ -10,7 +10,7 @@
+
+ # build and run a test program
+ test -d "$OUTDIR/config.tests/unix/doubleformat" || mkdir -p "$OUTDIR/config.tests/unix/doubleformat"
+-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/doubleformat/doubleformattest.pro" -o "$OUTDIR/config.tests/unix/doubleformat/Makefile" >/dev/null 2>&1
++"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/doubleformat/doubleformattest.pro" -o "$OUTDIR/config.tests/unix/doubleformat/Makefile" >/dev/null 2>&1
+ cd "$OUTDIR/config.tests/unix/doubleformat"
+
+ DOUBLEFORMAT="UNKNOWN"
+diff -urNad qt4-x11-4.3.0~/config.tests/unix/endian.test qt4-x11-4.3.0/config.tests/unix/endian.test
+--- qt4-x11-4.3.0~/config.tests/unix/endian.test 2007-05-25 15:24:34.000000000 +0200
++++ qt4-x11-4.3.0/config.tests/unix/endian.test 2007-07-01 12:16:11.000000000 +0200
+@@ -10,7 +10,7 @@
+
+ # build and run a test program
+ test -d "$OUTDIR/config.tests/unix/endian" || mkdir -p "$OUTDIR/config.tests/unix/endian"
+-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1
++"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1
+ cd "$OUTDIR/config.tests/unix/endian"
+
+ ENDIAN="UNKNOWN"
+diff -urNad qt4-x11-4.3.0~/config.tests/unix/ptrsize.test qt4-x11-4.3.0/config.tests/unix/ptrsize.test
+--- qt4-x11-4.3.0~/config.tests/unix/ptrsize.test 2007-05-25 15:24:34.000000000 +0200
++++ qt4-x11-4.3.0/config.tests/unix/ptrsize.test 2007-07-01 12:16:28.000000000 +0200
+@@ -10,7 +10,7 @@
+
+ # build and run a test program
+ test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/unix/ptrsize"
+-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1
++"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1
+ cd "$OUTDIR/config.tests/unix/ptrsize"
+
+ if [ "$VERBOSE" = "yes" ]; then
+diff -urNad qt4-x11-4.3.0~/config.tests/x11/notype.test qt4-x11-4.3.0/config.tests/x11/notype.test
+--- qt4-x11-4.3.0~/config.tests/x11/notype.test 2007-05-25 15:24:34.000000000 +0200
++++ qt4-x11-4.3.0/config.tests/x11/notype.test 2007-07-01 12:17:08.000000000 +0200
+@@ -27,7 +27,7 @@
+ NOTYPE=yes
+
+ test -d "$OUTDIR/config.tests/x11/notype" || mkdir -p "$OUTDIR/config.tests/x11/notype"
+- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1
++ "$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1
+ cd "$OUTDIR/config.tests/x11/notype"
+
+ if [ "$VERBOSE" = "yes" ]; then
+diff -urNad qt4-x11-4.3.0~/qmake/Makefile.unix qt4-x11-4.3.0/qmake/Makefile.unix
+--- qt4-x11-4.3.0~/qmake/Makefile.unix 2007-05-25 15:24:08.000000000 +0200
++++ qt4-x11-4.3.0/qmake/Makefile.unix 2007-07-01 11:51:51.000000000 +0200
+@@ -89,17 +89,17 @@
+
+ CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
+
+-first all: $(BUILD_PATH)/bin/qmake
+-qmake: $(BUILD_PATH)/bin/qmake
++first all: $(BUILD_PATH)/bin/qmake-qt4
++qmake: $(BUILD_PATH)/bin/qmake-qt4
+
+-$(BUILD_PATH)/bin/qmake: $(OBJS) $(QOBJS)
++$(BUILD_PATH)/bin/qmake-qt4: $(OBJS) $(QOBJS)
+ $(CXX) -o "$@" $(OBJS) $(QOBJS) $(LFLAGS)
+
+ clean::
+ rm -f $(OBJS) $(QOBJS)
+
+ distclean:: clean
+- rm -rf $(BUILD_PATH)/bin/qmake .deps
++ rm -rf $(BUILD_PATH)/bin/qmake-qt4 .deps
+
+ depend:
+ makedepend -D__MAKEDEPEND__ $(CPPFLAGS) $(DEPEND_SRC)
+diff -urNad qt4-x11-4.3.0~/projects.pro qt4-x11-4.3.0/projects.pro
+--- qt4-x11-4.3.0~/projects.pro 2007-05-25 15:24:11.000000000 +0200
++++ qt4-x11-4.3.0/projects.pro 2007-07-01 15:25:25.000000000 +0200
+@@ -115,7 +115,7 @@
+ win32 {
+ qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
+ } else {
+- qmake.files=$$QT_BUILD_TREE/bin/qmake
++ qmake.files=$$QT_BUILD_TREE/bin/qmake-qt4
+ }
+ INSTALLS += qmake
+
+diff -urNad qt4-x11-4.3.0~/src/tools/moc/moc.pro qt4-x11-4.3.0/src/tools/moc/moc.pro
+--- qt4-x11-4.3.0~/src/tools/moc/moc.pro 2007-05-25 15:24:02.000000000 +0200
++++ qt4-x11-4.3.0/src/tools/moc/moc.pro 2007-07-01 11:27:06.000000000 +0200
+@@ -1,5 +1,5 @@
+ TEMPLATE = app
+-TARGET = moc
++TARGET = moc-qt4
+
+ CONFIG += console qtinc
+ CONFIG -= qt
+diff -urNad qt4-x11-4.3.0~/src/tools/uic/uic.pro qt4-x11-4.3.0/src/tools/uic/uic.pro
+--- qt4-x11-4.3.0~/src/tools/uic/uic.pro 2007-05-25 15:24:02.000000000 +0200
++++ qt4-x11-4.3.0/src/tools/uic/uic.pro 2007-07-01 11:26:41.000000000 +0200
+@@ -9,7 +9,7 @@
+
+ unix:!contains(QT_CONFIG, zlib):LIBS += -lz
+
+-TARGET = uic
++TARGET = uic-qt4
+ DESTDIR = ../../../bin
+
+ DEFINES += QT_BOOTSTRAPPED QT_UIC QT_LITE_UNICODE QT_NO_DATASTREAM \
+diff -urNad qt4-x11-4.3.0~/tools/assistant/assistant.pro qt4-x11-4.3.0/tools/assistant/assistant.pro
+--- qt4-x11-4.3.0~/tools/assistant/assistant.pro 2007-05-25 15:24:32.000000000 +0200
++++ qt4-x11-4.3.0/tools/assistant/assistant.pro 2007-07-01 11:28:01.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ TEMPLATE = app
+ LANGUAGE = C++
+-TARGET = assistant
++TARGET = assistant-qt4
+
+ CONFIG += qt warn_on
+
+diff -urNad qt4-x11-4.3.0~/tools/designer/src/designer/designer.pro qt4-x11-4.3.0/tools/designer/src/designer/designer.pro
+--- qt4-x11-4.3.0~/tools/designer/src/designer/designer.pro 2007-05-25 15:24:45.000000000 +0200
++++ qt4-x11-4.3.0/tools/designer/src/designer/designer.pro 2007-07-01 11:28:47.000000000 +0200
+@@ -25,7 +25,7 @@
+ DEFINES += QT_DESIGNER_STATIC
+ }
+
+-TARGET = designer
++TARGET = designer-qt4
+
+ include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri)
+
+diff -urNad qt4-x11-4.3.0~/tools/linguist/linguist/linguist.pro qt4-x11-4.3.0/tools/linguist/linguist/linguist.pro
+--- qt4-x11-4.3.0~/tools/linguist/linguist/linguist.pro 2007-05-25 15:24:23.000000000 +0200
++++ qt4-x11-4.3.0/tools/linguist/linguist/linguist.pro 2007-07-01 11:29:34.000000000 +0200
+@@ -50,7 +50,7 @@
+ DEFINES += QT_KEYWORDS
+
+ DESTDIR = ../../../bin
+-TARGET = linguist
++TARGET = linguist-qt4
+
+ win32:RC_FILE = linguist.rc
+
+diff -urNad qt4-x11-4.3.0~/tools/linguist/lrelease/lrelease.pro qt4-x11-4.3.0/tools/linguist/lrelease/lrelease.pro
+--- qt4-x11-4.3.0~/tools/linguist/lrelease/lrelease.pro 2007-05-25 15:24:24.000000000 +0200
++++ qt4-x11-4.3.0/tools/linguist/lrelease/lrelease.pro 2007-07-01 11:25:42.000000000 +0200
+@@ -29,7 +29,7 @@
+ SOURCES += $$PROPARSERPATH/proitems.cpp \
+ $$PROPARSERPATH/proreader.cpp
+
+-TARGET = lrelease
++TARGET = lrelease-qt4
+ INCLUDEPATH += ../shared
+ DESTDIR = ../../../bin
+
+diff -urNad qt4-x11-4.3.0~/tools/linguist/lupdate/lupdate.pro qt4-x11-4.3.0/tools/linguist/lupdate/lupdate.pro
+--- qt4-x11-4.3.0~/tools/linguist/lupdate/lupdate.pro 2007-05-25 15:24:24.000000000 +0200
++++ qt4-x11-4.3.0/tools/linguist/lupdate/lupdate.pro 2007-07-01 11:25:25.000000000 +0200
+@@ -39,7 +39,7 @@
+ $$PROPARSERPATH/proreader.cpp
+
+
+-TARGET = lupdate
++TARGET = lupdate-qt4
+ INCLUDEPATH += ../shared
+ DESTDIR = ../../../bin
+
+diff -urNad qt4-x11-4.3.0~/tools/qtconfig/qtconfig.pro qt4-x11-4.3.0/tools/qtconfig/qtconfig.pro
+--- qt4-x11-4.3.0~/tools/qtconfig/qtconfig.pro 2007-05-25 15:24:28.000000000 +0200
++++ qt4-x11-4.3.0/tools/qtconfig/qtconfig.pro 2007-07-01 11:30:02.000000000 +0200
+@@ -16,7 +16,7 @@
+ RESOURCES = qtconfig.qrc
+
+ PROJECTNAME = Qt Configuration
+-TARGET = qtconfig
++TARGET = qtconfig-qt4
+ DESTDIR = ../../bin
+
+ target.path=$$[QT_INSTALL_BINS]
\ No newline at end of file
Property changes on: trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.dpatch (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.dpatch 2007-07-01 17:09:55 UTC (rev 6634)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_qtdemo_destdir.dpatch by Fathi Boudra <fboudra at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix qtdemo destdir.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~/demos/qtdemo/qtdemo.pro qt4-x11-4.3.0/demos/qtdemo/qtdemo.pro
+--- qt4-x11-4.3.0~/demos/qtdemo/qtdemo.pro 2007-05-25 15:24:38.000000000 +0200
++++ qt4-x11-4.3.0/demos/qtdemo/qtdemo.pro 2007-06-30 21:12:45.000000000 +0200
+@@ -1,6 +1,6 @@
+ CONFIG += assistant x11inc
+ TARGET = qtdemo
+-DESTDIR = $$QT_BUILD_TREE/bin
++DESTDIR = bin
+ OBJECTS_DIR = .obj
+ MOC_DIR = .moc
+ INSTALLS += target sources
+diff -urNad qt4-x11-4.3.0~/demos/arthurplugin/arthurplugin.pro qt4-x11-4.3.0/demos/arthurplugin/arthurplugin.pro
+--- qt4-x11-4.3.0~/demos/arthurplugin/arthurplugin.pro 2007-05-25 15:24:45.000000000 +0200
++++ qt4-x11-4.3.0/demos/arthurplugin/arthurplugin.pro 2007-06-30 21:18:35.000000000 +0200
+@@ -3,7 +3,7 @@
+
+ CONFIG += designer plugin debug_and_release
+ TEMPLATE = lib
+-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer
++QTDIR_build:DESTDIR = plugins/designer
+
+ contains(QT_CONFIG, opengl) {
+ DEFINES += QT_OPENGL_SUPPORT
Property changes on: trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules 2007-07-01 15:05:27 UTC (rev 6633)
+++ trunk/packages/qt4-x11/debian/rules 2007-07-01 17:09:55 UTC (rev 6634)
@@ -38,6 +38,8 @@
common-configure-arch::
./configure -confirm-license \
-prefix "/usr" \
+ -bindir "/usr/bin" \
+ -libdir "/usr/lib" \
-docdir "/usr/share/qt4/doc" \
-headerdir "/usr/include/qt4" \
-datadir "/usr/share/qt4" \
@@ -71,7 +73,7 @@
clean::
# Extra stuff missed by confclean/distclean
rm -f Makefile \
- bin/qmake \
+ bin/qmake-qt4 \
mkspecs/default \
src/corelib/global/arch \
examples/tools/plugandpaint/plugins/*.so \
@@ -98,11 +100,11 @@
# Hack to fix dpatch-edit-patch
unpatch: deapply-dpatches
-BINDIR := $(DEB_DESTDIR)/usr/bin
+PKGCONFIGDIR := $(DEB_DESTDIR)/usr/lib/pkgconfig
common-install-arch::
-# Tack on -qt4 to the binaries that use the alternatives system
- for f in qmake lupdate lrelease uic moc assistant designer linguist qtconfig; do \
- mv "$(BINDIR)/$$f" "$(BINDIR)/$$f-qt4"; \
+# Fix wrong path in pkgconfig files
+ for f in QtAssistantClient.pc QtDBus.pc QtTest.pc QtUiTools.pc; do \
+ sed -i "s|-L/build/buildd/qt4-x11-4.3.0/lib||g" $(PKGCONFIGDIR)/$$f; \
done
install/qt4-designer::
More information about the pkg-kde-commits
mailing list