rev 15034 - in trunk/packages/qt4-x11/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Mon Jun 29 14:26:51 UTC 2009
Author: fabo
Date: 2009-06-29 14:26:50 +0000 (Mon, 29 Jun 2009)
New Revision: 15034
Removed:
trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff
trunk/packages/qt4-x11/debian/patches/21_fix_quiloader_wrong_header_translated.diff
trunk/packages/qt4-x11/debian/patches/90_ia64_boilerplate.diff
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
trunk/packages/qt4-x11/debian/patches/19_install_qdoc3.diff
trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff
trunk/packages/qt4-x11/debian/patches/series
Log:
* Refresh patches:
- 05_append_qt4_target
- 19_install_qdoc3.diff
* Remove patches:
- 20_mips_atomic_ops - Merged upstream.
- 21_fix_quiloader_wrong_header_translated - Merged upstream.
- 90_ia64_boilerplate - Fixed upstream.
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2009-06-29 13:52:59 UTC (rev 15033)
+++ trunk/packages/qt4-x11/debian/changelog 2009-06-29 14:26:50 UTC (rev 15034)
@@ -6,18 +6,27 @@
* Add patch to build s390 debugging symbols with -gstabs instead of with -g,
to make them a bit smaller. Noone can use a 1G file with debugging
- symbols. (Closes: 528485)
+ symbols. (Closes: #528485)
+++ Changes by Fathi Boudra:
- * Sync qt-copy patches from kde-qt git repository:
- - Remove: 0234, 0273 and 0279.
- - Add:
- - 0280-deserialization-custom-dbus-properties.diff
- Fix deserialization of values with custom types when setting properties
- on dbus adaptors.
- - 0286-fix-error-string.diff
- Fix #error line not to have a ' as it's not correct.
+ * Sync qt-copy patches from kde-qt git repository.
+ * Refresh patches:
+ - 05_append_qt4_target
+ - 19_install_qdoc3.diff
+ * Remove patches:
+ - 20_mips_atomic_ops - Merged upstream.
+ - 21_fix_quiloader_wrong_header_translated - Merged upstream.
+ - 90_ia64_boilerplate - Fixed upstream.
+ - 0234-fix-mysql-threaded - Fixed upstream.
+ - 0273-odbc-64bit-compile - Fixed upstream.
+ - 0279-svg-rendering-regression - Fixed upstream.
+ * Add patches:
+ - 0280-deserialization-custom-dbus-properties.diff
+ Fix deserialization of values with custom types when setting properties
+ on dbus adaptors.
+ - 0286-fix-error-string.diff
+ Fix #error line not to have a ' as it's not correct.
* Bump Standards-Version to 3.8.2 (no changes needed).
+++ Changes by Didier Raboud:
Modified: trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff 2009-06-29 13:52:59 UTC (rev 15033)
+++ trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff 2009-06-29 14:26:50 UTC (rev 15034)
@@ -2,12 +2,12 @@
--- a/config.tests/unix/compile.test
+++ b/config.tests/unix/compile.test
-@@ -53,7 +53,7 @@ test -d "$OUTDIR/$TEST" || mkdir -p "$OU
+@@ -60,7 +60,7 @@ test -d "$OUTDIR/$TEST" || mkdir -p "$OU
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"
+-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
++"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
if [ "$VERBOSE" = "yes" ]; then
make
@@ -57,7 +57,7 @@
if [ "$VERBOSE" = "yes" ]; then
--- a/configure
+++ b/configure
-@@ -4014,7 +4014,7 @@ END {
+@@ -4028,7 +4028,7 @@ END {
}
# build qmake
@@ -66,7 +66,7 @@
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
-@@ -6643,8 +6643,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -6661,8 +6661,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -77,7 +77,7 @@
QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3
QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -6993,11 +6993,11 @@ EXEC=""
+@@ -7011,11 +7011,11 @@ EXEC=""
#-------------------------------------------------------------------------------
echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@
fi
# .projects -> projects to process
-@@ -7170,7 +7170,7 @@ for file in .projects .projects.3; do
+@@ -7188,7 +7188,7 @@ for file in .projects .projects.3; do
echo " for $a\c"
fi
Modified: trunk/packages/qt4-x11/debian/patches/19_install_qdoc3.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/19_install_qdoc3.diff 2009-06-29 13:52:59 UTC (rev 15033)
+++ trunk/packages/qt4-x11/debian/patches/19_install_qdoc3.diff 2009-06-29 14:26:50 UTC (rev 15034)
@@ -1,10 +1,9 @@
--- a/tools/qdoc3/qdoc3.pro
+++ b/tools/qdoc3/qdoc3.pro
-@@ -106,3 +106,8 @@ win32 {
- QT_WINCONFIG = debug
- }
- }
-+
+@@ -99,3 +99,7 @@ SOURCES += apigenerator.cpp \
+ webxmlgenerator.cpp \
+ yyindent.cpp
+
+TARGET = qdoc3
+target.path = $$[QT_INSTALL_BINS]
+INSTALLS += target
@@ -18,4 +17,4 @@
+ SUBDIRS += qdoc3
wince*: SUBDIRS = qtestlib designer
unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
- win32:!wince*:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt
+ win32:!wince*:SUBDIRS += activeqt
Modified: trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff 2009-06-29 13:52:59 UTC (rev 15033)
+++ trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff 2009-06-29 14:26:50 UTC (rev 15034)
@@ -34,7 +34,7 @@
settings = QLibraryInfoPrivate::findConfiguration();
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
-@@ -497,7 +497,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de
+@@ -494,7 +494,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de
}
template <class Key, class T>
Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series 2009-06-29 13:52:59 UTC (rev 15033)
+++ trunk/packages/qt4-x11/debian/patches/series 2009-06-29 14:26:50 UTC (rev 15034)
@@ -24,8 +24,6 @@
17_add_postgresql_8.3_support.diff
18_enable_qt3support_qtwebkit_debug_info.diff
19_install_qdoc3.diff
-20_mips_atomic_ops.diff
-21_fix_quiloader_wrong_header_translated.diff
30_webkit_unaligned_access.diff
40_alpha_ice.diff
41_disable_opengl_visibility.diff
@@ -35,5 +33,4 @@
80_hurd_max_path.diff
81_hurd_more_max_path.diff
89_powerpc_opts.diff
-90_ia64_boilerplate.diff
91_s390_-gstabs.diff
More information about the pkg-kde-commits
mailing list