[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.5.3-4-20-g801379c
Fathi Boudra
fabo at alioth.debian.org
Thu Oct 15 21:33:27 UTC 2009
The following commit has been merged in the experimental-snapshots branch:
commit 801379c41c76542fe87faba90f7d04fd175e65a0
Author: Fathi BOUDRA <fabo at debian.org>
Date: Thu Oct 15 23:32:19 2009 +0200
Refresh patches and rewrite 11_build_translations.diff
---
debian/changelog | 2 +-
debian/patches/0180-window-role.diff | 2 +-
debian/patches/0216-allow-isystem-for-headers.diff | 4 +-
debian/patches/0288-more-x-keycodes.diff | 8 +-
debian/patches/05_append_qt4_target.diff | 8 +-
debian/patches/08_configure_quilt_compat.diff | 2 +-
debian/patches/11_build_translations.diff | 456 +++++++++++++-------
.../18_enable_qt3support_qtwebkit_debug_info.diff | 2 +-
8 files changed, 309 insertions(+), 175 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a326c15..60ee4ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,7 +22,7 @@ qt4-x11 (4:4.6.0~beta1-1) experimental; urgency=low
* Rewrite debian/rules, converted to dh usage.
* Build with -no-separate-debug-info. Adjust debian/rules accordingly.
- -- Fathi Boudra <fabo at debian.org> Thu, 15 Oct 2009 12:16:44 +0200
+ -- Fathi Boudra <fabo at debian.org> Thu, 15 Oct 2009 23:14:56 +0200
qt4-x11 (4:4.5.3-4) unstable; urgency=low
diff --git a/debian/patches/0180-window-role.diff b/debian/patches/0180-window-role.diff
index b293715..df6352b 100644
--- a/debian/patches/0180-window-role.diff
+++ b/debian/patches/0180-window-role.diff
@@ -52,7 +52,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse
Sender *sender);
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
-@@ -598,6 +598,7 @@ public:
+@@ -601,6 +601,7 @@ public:
static QWidget *keyboardGrabber;
void setWindowRole();
diff --git a/debian/patches/0216-allow-isystem-for-headers.diff b/debian/patches/0216-allow-isystem-for-headers.diff
index 9aa0c98..7b97ad2 100644
--- a/debian/patches/0216-allow-isystem-for-headers.diff
+++ b/debian/patches/0216-allow-isystem-for-headers.diff
@@ -27,7 +27,7 @@ bugs.kde.org number :
--- a/configure
+++ b/configure
-@@ -1019,6 +1019,11 @@ while [ "$#" -gt 0 ]; do
+@@ -1020,6 +1020,11 @@ while [ "$#" -gt 0 ]; do
VAL=`echo $1 | sed 's,-D,,'`
fi
;;
@@ -39,7 +39,7 @@ bugs.kde.org number :
-I?*|-I)
VAR="add_ipath"
if [ "$1" = "-I" ]; then
-@@ -2009,6 +2014,9 @@ while [ "$#" -gt 0 ]; do
+@@ -2017,6 +2022,9 @@ while [ "$#" -gt 0 ]; do
add_ipath)
I_FLAGS="$I_FLAGS -I\"${VAL}\""
;;
diff --git a/debian/patches/0288-more-x-keycodes.diff b/debian/patches/0288-more-x-keycodes.diff
index 5902504..e313a45 100644
--- a/debian/patches/0288-more-x-keycodes.diff
+++ b/debian/patches/0288-more-x-keycodes.diff
@@ -12,7 +12,7 @@ Subject: [PATCH 16/18] Fill gap of X.org/XFree multimedia/special/launcher keys
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
-@@ -915,12 +915,10 @@ public:
+@@ -913,12 +913,10 @@ public:
Key_Dead_Horn = 0x01001262,
// multimedia/internet keys - ignored by default - see QKeyEvent c'tor
@@ -25,7 +25,7 @@ Subject: [PATCH 16/18] Fill gap of X.org/XFree multimedia/special/launcher keys
Key_VolumeDown = 0x01000070,
Key_VolumeMute = 0x01000071,
Key_VolumeUp = 0x01000072,
-@@ -929,7 +927,6 @@ public:
+@@ -927,7 +925,6 @@ public:
Key_BassDown = 0x01000075,
Key_TrebleUp = 0x01000076,
Key_TrebleDown = 0x01000077,
@@ -33,7 +33,7 @@ Subject: [PATCH 16/18] Fill gap of X.org/XFree multimedia/special/launcher keys
Key_MediaPlay = 0x01000080,
Key_MediaStop = 0x01000081,
Key_MediaPrevious = 0x01000082,
-@@ -938,13 +935,11 @@ public:
+@@ -936,13 +933,11 @@ public:
#endif
Key_MediaNext = 0x01000083,
Key_MediaRecord = 0x01000084,
@@ -47,7 +47,7 @@ Subject: [PATCH 16/18] Fill gap of X.org/XFree multimedia/special/launcher keys
Key_LaunchMail = 0x010000a0,
Key_LaunchMedia = 0x010000a1,
Key_Launch0 = 0x010000a2,
-@@ -963,6 +958,98 @@ public:
+@@ -961,6 +956,98 @@ public:
Key_LaunchD = 0x010000af,
Key_LaunchE = 0x010000b0,
Key_LaunchF = 0x010000b1,
diff --git a/debian/patches/05_append_qt4_target.diff b/debian/patches/05_append_qt4_target.diff
index 71d4189..35c3549 100644
--- a/debian/patches/05_append_qt4_target.diff
+++ b/debian/patches/05_append_qt4_target.diff
@@ -57,7 +57,7 @@ author: Fathi Boudra <fabo at debian.org>
if [ "$VERBOSE" = "yes" ]; then
--- a/configure
+++ b/configure
-@@ -4209,7 +4209,7 @@ END {
+@@ -4204,7 +4204,7 @@ END {
}
# build qmake
@@ -66,7 +66,7 @@ author: Fathi Boudra <fabo at debian.org>
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
-@@ -7070,8 +7070,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -7080,8 +7080,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 @@ author: Fathi Boudra <fabo at debian.org>
QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3
QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -7447,11 +7447,11 @@ EXEC=""
+@@ -7464,11 +7464,11 @@ EXEC=""
#-------------------------------------------------------------------------------
echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@ author: Fathi Boudra <fabo at debian.org>
fi
# .projects -> projects to process
-@@ -7625,7 +7625,7 @@ for file in .projects .projects.3; do
+@@ -7642,7 +7642,7 @@ for file in .projects .projects.3; do
echo " for $a\c"
fi
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index 1c008d2..d148b97 100644
--- a/debian/patches/08_configure_quilt_compat.diff
+++ b/debian/patches/08_configure_quilt_compat.diff
@@ -3,7 +3,7 @@ It breaks qmake projects search.
--- a/configure
+++ b/configure
-@@ -7146,7 +7146,7 @@ fi
+@@ -7520,7 +7520,7 @@ fi
# .projects.3 -> the rest
rm -f .projects .projects.1 .projects.2 .projects.3
diff --git a/debian/patches/11_build_translations.diff b/debian/patches/11_build_translations.diff
index bd7bb59..c2a5ff7 100644
--- a/debian/patches/11_build_translations.diff
+++ b/debian/patches/11_build_translations.diff
@@ -3,168 +3,302 @@ author: Fathi Boudra <fabo at debian.org>
translations fails to build under autobuilders.
Use case: Qt sources comes from git and we need to build them.
---- a/tools/assistant/translations/qt_help.pro
+--- /dev/null
+++ b/tools/assistant/translations/qt_help.pro
-@@ -39,12 +39,12 @@ HEADERS += ../lib/qhelpcollectionhandler
- ../lib/qhelp_global.h
-
-
--TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qt_help_de.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/qt_help_ja.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/qt_help_pl.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/qt_help_ru.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/qt_help_untranslated.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_CN.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_TW.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/qt_help_da.ts
-+TRANSLATIONS=../../../translations/qt_help_de.ts \
-+ ../../../translations/qt_help_ja.ts \
-+ ../../../translations/qt_help_pl.ts \
-+ ../../../translations/qt_help_ru.ts \
-+ ../../../translations/qt_help_untranslated.ts \
-+ ../../../translations/qt_help_zh_CN.ts \
-+ ../../../translations/qt_help_zh_TW.ts \
-+ ../../../translations/qt_help_da.ts
- error("This is a dummy profile to be used for translations ONLY.")
---- a/tools/assistant/translations/translations.pro
+@@ -0,0 +1,52 @@
++# Include those manually as they do not contain any directory specification
++
++SOURCES += ../lib/qhelpcollectionhandler.cpp \
++ ../lib/qhelpcontentwidget.cpp \
++ ../lib/qhelpdatainterface.cpp \
++ ../lib/qhelpdbreader.cpp \
++ ../lib/qhelpengine.cpp \
++ ../lib/qhelpenginecore.cpp \
++ ../lib/qhelpgenerator.cpp \
++ ../lib/qhelpindexwidget.cpp \
++ ../lib/qhelpprojectdata.cpp \
++ ../lib/qhelpsearchengine.cpp \
++ ../lib/qhelpsearchindexreader_clucene.cpp \
++ ../lib/qhelpsearchindexreader_default.cpp \
++ ../lib/qhelpsearchindexwriter_clucene.cpp \
++ ../lib/qhelpsearchindexwriter_default.cpp \
++ ../lib/qhelpsearchindex_default.cpp \
++ ../lib/qhelpsearchquerywidget.cpp \
++ ../lib/qhelpsearchresultwidget.cpp
++
++HEADERS += ../lib/qhelpcollectionhandler_p.h \
++ ../lib/qhelpcontentwidget.h \
++ ../lib/qhelpdatainterface_p.h \
++ ../lib/qhelpdbreader_p.h \
++ ../lib/qhelpengine.h \
++ ../lib/qhelpenginecore.h \
++ ../lib/qhelpengine_p.h \
++ ../lib/qhelpgenerator_p.h \
++ ../lib/qhelpindexwidget.h \
++ ../lib/qhelpprojectdata_p.h \
++ ../lib/qhelpsearchengine.h \
++ ../lib/qhelpsearchindexreader_clucene_p.h \
++ ../lib/qhelpsearchindexreader_default_p.h \
++ ../lib/qhelpsearchindexwriter_clucene_p.h \
++ ../lib/qhelpsearchindexwriter_default_p.h \
++ ../lib/qhelpsearchindex_default_p.h \
++ ../lib/qhelpsearchquerywidget.h \
++ ../lib/qhelpsearchresultwidget.h \
++ ../lib/qhelp_global.h
++
++
++TR_DIR = $$PWD/../../../translations
++TRANSLATIONS = \
++ $$TR_DIR/qt_help_da.ts \
++ $$TR_DIR/qt_help_de.ts
++ $$TR_DIR/qt_help_ja.ts \
++ $$TR_DIR/qt_help_pl.ts \
++ $$TR_DIR/qt_help_ru.ts \
++ $$TR_DIR/qt_help_zh_CN.ts \
++ $$TR_DIR/qt_help_zh_TW.ts
++
++error("This is a dummy profile to be used for translations ONLY.")
+--- /dev/null
+++ b/tools/assistant/translations/translations.pro
-@@ -40,11 +40,11 @@ HEADERS += ../tools/assistant/aboutdialo
- ../tools/assistant/searchwidget.h \
- ../tools/assistant/topicchooser.h \
-
--TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_de.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/assistant_ja.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/assistant_pl.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/assistant_ru.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/assistant_untranslated.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_CN.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_TW.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/assistant_da.ts
-+TRANSLATIONS=../../../translations/assistant_de.ts \
-+ ../../../translations/assistant_ja.ts \
-+ ../../../translations/assistant_pl.ts \
-+ ../../../translations/assistant_ru.ts \
-+ ../../../translations/assistant_untranslated.ts \
-+ ../../../translations/assistant_zh_CN.ts \
-+ ../../../translations/assistant_zh_TW.ts \
-+ ../../../translations/assistant_da.ts
---- a/tools/assistant/translations/translations_adp.pro
+@@ -0,0 +1,51 @@
++# Include those manually as they do not contain any directory specification
++
++FORMS += ../tools/assistant/filternamedialog.ui \
++ ../tools/assistant/installdialog.ui \
++ ../tools/assistant/preferencesdialog.ui \
++ ../tools/assistant/topicchooser.ui \
++ ../tools/assistant/bookmarkdialog.ui
++
++SOURCES += ../tools/assistant/aboutdialog.cpp \
++ ../tools/assistant/bookmarkmanager.cpp \
++ ../tools/assistant/centralwidget.cpp \
++ ../tools/assistant/cmdlineparser.cpp \
++ ../tools/assistant/contentwindow.cpp \
++ ../tools/assistant/filternamedialog.cpp \
++ ../tools/assistant/helpviewer.cpp \
++ ../tools/assistant/indexwindow.cpp \
++ ../tools/assistant/installdialog.cpp \
++ ../tools/assistant/main.cpp \
++ ../tools/assistant/mainwindow.cpp \
++ ../tools/assistant/preferencesdialog.cpp \
++ ../tools/assistant/remotecontrol.cpp \
++ ../tools/assistant/searchwidget.cpp \
++ ../tools/assistant/topicchooser.cpp \
++
++SOURCES += ../../shared/fontpanel/fontpanel.cpp
++
++HEADERS += ../tools/assistant/aboutdialog.h \
++ ../tools/assistant/bookmarkmanager.h \
++ ../tools/assistant/centralwidget.h \
++ ../tools/assistant/cmdlineparser.h \
++ ../tools/assistant/contentwindow.h \
++ ../tools/assistant/filternamedialog.h \
++ ../tools/assistant/helpviewer.h \
++ ../tools/assistant/indexwindow.h \
++ ../tools/assistant/installdialog.h \
++ ../tools/assistant/mainwindow.h \
++ ../tools/assistant/preferencesdialog.h \
++ ../tools/assistant/remotecontrol.h \
++ ../tools/assistant/remotecontrol_win.h \
++ ../tools/assistant/searchwidget.h \
++ ../tools/assistant/topicchooser.h \
++
++TR_DIR = $$PWD/../../../translations
++TRANSLATIONS = \
++ $$TR_DIR/assistant_da.ts \
++ $$TR_DIR/assistant_de.ts \
++ $$TR_DIR/assistant_ja.ts \
++ $$TR_DIR/assistant_pl.ts \
++ $$TR_DIR/assistant_ru.ts \
++ $$TR_DIR/assistant_zh_CN.ts \
++ $$TR_DIR/assistant_zh_TW.ts
+--- /dev/null
+++ b/tools/assistant/translations/translations_adp.pro
-@@ -31,11 +31,11 @@ HEADERS += ../compat/helpwindow.h \
- ../compat/fontsettingsdialog.h
-
-
--TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_adp_de.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_ja.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_pl.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_ru.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_untranslated.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_zh_CN.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_zh_TW.ts
-+TRANSLATIONS=../../../translations/assistant_adp_de.ts \
-+ ../../../translations/assistant_adp_ja.ts \
-+ ../../../translations/assistant_adp_pl.ts \
-+ ../../../translations/assistant_adp_ru.ts \
-+ ../../../translations/assistant_adp_untranslated.ts \
-+ ../../../translations/assistant_adp_zh_CN.ts \
-+ ../../../translations/assistant_adp_zh_TW.ts
- error("This is a dummy profile to be used for translations ONLY.")
---- a/tools/designer/translations/translations.pro
+@@ -0,0 +1,43 @@
++# Include those manually as they do not contain any directory specification
++
++FORMS += ../compat/helpdialog.ui \
++ ../compat/mainwindow.ui \
++ ../compat/tabbedbrowser.ui \
++ ../compat/topicchooser.ui
++
++SOURCES += ../compat/main.cpp \
++ ../compat/helpwindow.cpp \
++ ../compat/topicchooser.cpp \
++ ../compat/docuparser.cpp \
++ ../compat/index.cpp \
++ ../compat/profile.cpp \
++ ../compat/config.cpp \
++ ../compat/helpdialog.cpp \
++ ../compat/mainwindow.cpp \
++ ../compat/tabbedbrowser.cpp \
++ ../compat/fontsettingsdialog.cpp
++
++SOURCES += ../../shared/fontpanel/fontpanel.cpp
++
++HEADERS += ../compat/helpwindow.h \
++ ../compat/topicchooser.h \
++ ../compat/docuparser.h \
++ ../compat/index.h \
++ ../compat/profile.h \
++ ../compat/helpdialog.h \
++ ../compat/mainwindow.h \
++ ../compat/tabbedbrowser.h \
++ ../compat/config.h \
++ ../compat/fontsettingsdialog.h
++
++
++TR_DIR = $$PWD/../../../translations
++TRANSLATIONS = \
++ $$TR_DIR/assistant_adp_de.ts \
++ $$TR_DIR/assistant_adp_ja.ts \
++ $$TR_DIR/assistant_adp_pl.ts \
++ $$TR_DIR/assistant_adp_ru.ts \
++ $$TR_DIR/assistant_adp_zh_CN.ts \
++ $$TR_DIR/assistant_adp_zh_TW.ts
++
++error("This is a dummy profile to be used for translations ONLY.")
+--- /dev/null
+++ b/tools/designer/translations/translations.pro
-@@ -130,11 +130,11 @@ HEADERS += ../../shared/findwidget/abstr
- ../../shared/findwidget/itemviewfindwidget.h \
- ../../shared/findwidget/texteditfindwidget.h
-
--TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/designer_de.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/designer_ja.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/designer_pl.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/designer_ru.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/designer_sl.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/designer_zh_CN.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/designer_zh_TW.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/designer_untranslated.ts
-+TRANSLATIONS=../../../translations/designer_de.ts \
-+ ../../../translations/designer_ja.ts \
-+ ../../../translations/designer_pl.ts \
-+ ../../../translations/designer_ru.ts \
-+ ../../../translations/designer_sl.ts \
-+ ../../../translations/designer_zh_CN.ts \
-+ ../../../translations/designer_zh_TW.ts \
-+ ../../../translations/designer_untranslated.ts
---- a/tools/linguist/linguist/linguist.pro
-+++ b/tools/linguist/linguist/linguist.pro
-@@ -95,11 +95,11 @@ FORMS += statistics.ui \
- finddialog.ui
- RESOURCES += linguist.qrc
-
--TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/linguist_ja.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/linguist_pl.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/linguist_ru.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/linguist_untranslated.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/linguist_zh_CN.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/linguist_zh_TW.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/linguist_de.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/linguist_fr.ts
-+TRANSLATIONS=../../../translations/linguist_ja.ts \
-+ ../../../translations/linguist_pl.ts \
-+ ../../../translations/linguist_ru.ts \
-+ ../../../translations/linguist_untranslated.ts \
-+ ../../../translations/linguist_zh_CN.ts \
-+ ../../../translations/linguist_zh_TW.ts \
-+ ../../../translations/linguist_de.ts \
-+ ../../../translations/linguist_fr.ts
---- a/tools/qtconfig/translations/translations.pro
-+++ b/tools/qtconfig/translations/translations.pro
-@@ -7,8 +7,8 @@ HEADERS += ../colorbutton.h ../pr
-
- FORMS = ../mainwindowbase.ui ../paletteeditoradvancedbase.ui ../previewwidgetbase.ui
-
--TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qtconfig_pl.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/qtconfig_ru.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/qtconfig_untranslated.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/qtconfig_zh_CN.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/qtconfig_zh_TW.ts
-+TRANSLATIONS=../../../translations/qtconfig_pl.ts \
-+ ../../../translations/qtconfig_ru.ts \
-+ ../../../translations/qtconfig_untranslated.ts \
-+ ../../../translations/qtconfig_zh_CN.ts \
-+ ../../../translations/qtconfig_zh_TW.ts
---- a/tools/qvfb/translations/translations.pro
-+++ b/tools/qvfb/translations/translations.pro
-@@ -26,8 +26,8 @@ SOURCES = ../qvfb.cpp \
- ../qwssignalhandler.cpp \
- ../../shared/deviceskin/deviceskin.cpp
-
--TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qvfb_pl.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/qvfb_ru.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/qvfb_untranslated.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/qvfb_zh_CN.ts \
-- $$[QT_INSTALL_TRANSLATIONS]/qvfb_zh_TW.ts
-+TRANSLATIONS=../../../translations/qvfb_pl.ts \
-+ ../../../translations/qvfb_ru.ts \
-+ ../../../translations/qvfb_untranslated.ts \
-+ ../../../translations/qvfb_zh_CN.ts \
-+ ../../../translations/qvfb_zh_TW.ts
---- a/translations/translations.pri
-+++ b/translations/translations.pri
-@@ -41,10 +41,10 @@ ts-qt.commands = (cd $$QT_SOURCE_TREE/sr
- svg \
- xml \
- xmlpatterns \
-- -ts $$prependAll($$[QT_INSTALL_TRANSLATIONS]/qt_,$$QT_TS,.ts))
-+ -ts $$prependAll($$QT_SOURCE_TREE/translations/qt_,$$QT_TS,.ts))
- ts-qt.depends = sub-tools
-
--qm-qt.commands = $$LRELEASE $$prependAll($$[QT_INSTALL_TRANSLATIONS]/qt_,$$QT_TS,.ts)
-+qm-qt.commands = $$LRELEASE $$prependAll($$QT_SOURCE_TREE/translations/qt_,$$QT_TS,.ts)
- qm-qt.depends = sub-tools
-
- ###### Designer
---- a/tools/assistant/compat/translations/translations.pro
-+++ b/tools/assistant/compat/translations/translations.pro
-@@ -31,4 +31,4 @@ HEADERS += ../helpwindow.h \
- ../fontsettingsdialog.h
-
-
--TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_de.ts $$[QT_INSTALL_TRANSLATIONS]/assistant_untranslated.ts
-+TRANSLATIONS=$$QT_SOURCE_TREE/translations/assistant_de.ts $$QT_SOURCE_TREE/translations/assistant_untranslated.ts
+@@ -0,0 +1,141 @@
++include(../src/components/buddyeditor/buddyeditor.pri)
++include(../src/components/component.pri)
++include(../src/components/formeditor/formeditor.pri)
++include(../src/components/objectinspector/objectinspector.pri)
++include(../src/components/propertyeditor/propertyeditor.pri)
++include(../src/components/signalsloteditor/signalsloteditor.pri)
++include(../src/components/tabordereditor/tabordereditor.pri)
++include(../src/components/taskmenu/taskmenu.pri)
++include(../src/components/widgetbox/widgetbox.pri)
++include(../src/lib/extension/extension.pri)
++include(../src/lib/sdk/sdk.pri)
++include(../src/lib/shared/shared.pri)
++include(../src/lib/uilib/uilib.pri)
++include(../../shared/qttoolbardialog/qttoolbardialog.pri)
++include(../../shared/qtpropertybrowser/qtpropertybrowser.pri)
++include(../../shared/qtgradienteditor/qtgradienteditor.pri)
++
++# Include ActiveQt plugin
++SOURCES += ../src/plugins/activeqt/qaxwidgetextrainfo.cpp \
++ ../src/plugins/activeqt/qaxwidgetplugin.cpp \
++ ../src/plugins/activeqt/qaxwidgetpropertysheet.cpp \
++ ../src/plugins/activeqt/qaxwidgettaskmenu.cpp \
++ ../src/plugins/activeqt/qdesigneraxwidget.cpp
++
++HEADERS += ../src/plugins/activeqt/qaxwidgetextrainfo.h \
++ ../src/plugins/activeqt/qaxwidgetplugin.h \
++ ../src/plugins/activeqt/qaxwidgetpropertysheet.h \
++ ../src/plugins/activeqt/qaxwidgettaskmenu.h \
++ ../src/plugins/activeqt/qdesigneraxwidget.h \
++ ../../../src/activeqt/shared/qaxtypes.h
++
++
++# Include Qt3Support plugin
++
++SOURCES += ../src/plugins/widgets/qt3supportwidgets.cpp
++HEADERS += ../src/plugins/widgets/q3iconview/q3iconview_extrainfo.h \
++ ../src/plugins/widgets/q3iconview/q3iconview_plugin.h \
++ ../src/plugins/widgets/q3listview/q3listview_extrainfo.h \
++ ../src/plugins/widgets/q3listview/q3listview_plugin.h \
++ ../src/plugins/widgets/q3mainwindow/q3mainwindow_container.h \
++ ../src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.h \
++ ../src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.h \
++ ../src/plugins/widgets/q3toolbar/q3toolbar_plugin.h \
++ ../src/plugins/widgets/q3widgetstack/q3widgetstack_container.h \
++ ../src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.h \
++ ../src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack_p.h \
++ ../src/plugins/widgets/q3wizard/q3wizard_container.h \
++ ../src/plugins/widgets/q3wizard/q3wizard_plugin.h \
++ ../src/plugins/widgets/q3listbox/q3listbox_extrainfo.h \
++ ../src/plugins/widgets/q3listbox/q3listbox_plugin.h \
++ ../src/plugins/widgets/q3table/q3table_extrainfo.h \
++ ../src/plugins/widgets/q3table/q3table_plugin.h \
++ ../src/plugins/widgets/q3textedit/q3textedit_extrainfo.h \
++ ../src/plugins/widgets/q3textedit/q3textedit_plugin.h \
++ ../src/plugins/widgets/q3widgets/q3widget_plugins.h
++
++SOURCES += ../src/plugins/widgets/q3iconview/q3iconview_extrainfo.cpp \
++ ../src/plugins/widgets/q3iconview/q3iconview_plugin.cpp \
++ ../src/plugins/widgets/q3listview/q3listview_extrainfo.cpp \
++ ../src/plugins/widgets/q3listview/q3listview_plugin.cpp \
++ ../src/plugins/widgets/q3mainwindow/q3mainwindow_container.cpp \
++ ../src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.cpp \
++ ../src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.cpp \
++ ../src/plugins/widgets/q3toolbar/q3toolbar_plugin.cpp \
++ ../src/plugins/widgets/q3widgetstack/q3widgetstack_container.cpp \
++ ../src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.cpp \
++ ../src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack.cpp \
++ ../src/plugins/widgets/q3wizard/q3wizard_container.cpp \
++ ../src/plugins/widgets/q3wizard/q3wizard_plugin.cpp \
++ ../src/plugins/widgets/q3listbox/q3listbox_extrainfo.cpp \
++ ../src/plugins/widgets/q3listbox/q3listbox_plugin.cpp \
++ ../src/plugins/widgets/q3table/q3table_extrainfo.cpp \
++ ../src/plugins/widgets/q3table/q3table_plugin.cpp \
++ ../src/plugins/widgets/q3textedit/q3textedit_extrainfo.cpp \
++ ../src/plugins/widgets/q3textedit/q3textedit_plugin.cpp \
++ ../src/plugins/widgets/q3widgets/q3widget_plugins.cpp
++
++# Include those manually as they do not contain any directory specification
++APP_DIR=../src/designer
++SOURCES += $$APP_DIR/appfontdialog.cpp \
++ $$APP_DIR/assistantclient.cpp \
++ $$APP_DIR/main.cpp \
++ $$APP_DIR/mainwindow.cpp \
++ $$APP_DIR/newform.cpp \
++ $$APP_DIR/plugindialog.cpp \
++ $$APP_DIR/preferencesdialog.cpp \
++ $$APP_DIR/qdesigner_actions.cpp \
++ $$APP_DIR/qdesigner_appearanceoptions.cpp \
++ $$APP_DIR/qdesigner.cpp \
++ $$APP_DIR/qdesigner_formwindow.cpp \
++ $$APP_DIR/qdesigner_server.cpp \
++ $$APP_DIR/qdesigner_settings.cpp \
++ $$APP_DIR/qdesigner_toolwindow.cpp \
++ $$APP_DIR/qdesigner_workbench.cpp \
++ $$APP_DIR/saveformastemplate.cpp \
++ $$APP_DIR/versiondialog.cpp
++
++HEADERS+= $$APP_DIR/appfontdialog.h \
++ $$APP_DIR/assistantclient.h \
++ $$APP_DIR/designer_enums.h \
++ $$APP_DIR/mainwindow.h \
++ $$APP_DIR/newform.h \
++ $$APP_DIR/plugindialog.h \
++ $$APP_DIR/preferencesdialog.h \
++ $$APP_DIR/qdesigner_actions.h \
++ $$APP_DIR/qdesigner_appearanceoptions.h \
++ $$APP_DIR/qdesigner_formwindow.h \
++ $$APP_DIR/qdesigner.h \
++ $$APP_DIR/qdesigner_pch.h \
++ $$APP_DIR/qdesigner_server.h \
++ $$APP_DIR/qdesigner_settings.h \
++ $$APP_DIR/qdesigner_toolwindow.h \
++ $$APP_DIR/qdesigner_workbench.h \
++ $$APP_DIR/saveformastemplate.h \
++ $$APP_DIR/versiondialog.h
++
++FORMS += $$APP_DIR/plugindialog.ui \
++ $$APP_DIR/preferencesdialog.ui \
++ $$APP_DIR/qdesigner_appearanceoptions.ui \
++ $$APP_DIR/saveformastemplate.ui
++
++# Shared solutions
++SOURCES += ../../shared/fontpanel/fontpanel.cpp \
++ ../../shared/deviceskin/deviceskin.cpp \
++ ../../shared/findwidget/abstractfindwidget.cpp \
++ ../../shared/findwidget/itemviewfindwidget.cpp \
++ ../../shared/findwidget/texteditfindwidget.cpp \
++
++HEADERS += ../../shared/findwidget/abstractfindwidget.h \
++ ../../shared/findwidget/itemviewfindwidget.h \
++ ../../shared/findwidget/texteditfindwidget.h
++
++TR_DIR = $$PWD/../../../translations
++TRANSLATIONS = \
++ $$TR_DIR/designer_de.ts \
++ $$TR_DIR/designer_ja.ts \
++ $$TR_DIR/designer_pl.ts \
++ $$TR_DIR/designer_ru.ts \
++ $$TR_DIR/designer_sl.ts \
++ $$TR_DIR/designer_zh_CN.ts \
++ $$TR_DIR/designer_zh_TW.ts
diff --git a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
index 87e2f53..5a9cc12 100644
--- a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
+++ b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
@@ -5,7 +5,7 @@ This patch enable them.
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
-@@ -3321,8 +3321,6 @@ HEADERS += $$WEBKIT_API_HEADERS
+@@ -3320,8 +3320,6 @@ HEADERS += $$WEBKIT_API_HEADERS
CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4) {
# start with 4.5
# Remove the following 2 lines if you want debug information in WebCore
--
Qt 4 Debian packaging
More information about the pkg-kde-commits
mailing list