diff options
| -rw-r--r-- | debian/patches/05_append_qt4_target.diff | 13 | ||||
| -rw-r--r-- | debian/patches/11_build_translations.diff | 305 | ||||
| -rw-r--r-- | debian/qt4-demos-dbg.install | 2 | ||||
| -rw-r--r-- | debian/qt4-demos-dbg.lintian | 2 |
4 files changed, 310 insertions, 12 deletions
diff --git a/debian/patches/05_append_qt4_target.diff b/debian/patches/05_append_qt4_target.diff index 3a4bd00..33e1ef1 100644 --- a/debian/patches/05_append_qt4_target.diff +++ b/debian/patches/05_append_qt4_target.diff @@ -215,3 +215,16 @@ author: Fathi Boudra <fabo@debian.org> DESTDIR = ../../bin target.path=$$[QT_INSTALL_BINS] +--- a/translations/translations.pri ++++ b/translations/translations.pri +@@ -16,8 +16,8 @@ WIN { + } + } + +-LUPDATE = $$fixPath($$QT_BUILD_TREE/bin/lupdate) -locations relative -no-ui-lines +-LRELEASE = $$fixPath($$QT_BUILD_TREE/bin/lrelease) ++LUPDATE = $$fixPath($$QT_BUILD_TREE/bin/lupdate-qt4) -locations relative -no-ui-lines ++LRELEASE = $$fixPath($$QT_BUILD_TREE/bin/lrelease-qt4) + + ###### Qt Libraries + diff --git a/debian/patches/11_build_translations.diff b/debian/patches/11_build_translations.diff index df977de..f5df690 100644 --- a/debian/patches/11_build_translations.diff +++ b/debian/patches/11_build_translations.diff @@ -3,12 +3,289 @@ author: Fathi Boudra <fabo@debian.org> translations fails to build under autobuilders. Use case: Qt sources comes from git and we need to build them. +--- /dev/null ++++ b/tools/assistant/translations/qt_help.pro +@@ -0,0 +1,50 @@ ++# 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 ++ ++ ++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.") +--- /dev/null ++++ b/tools/assistant/translations/translations.pro +@@ -0,0 +1,50 @@ ++# 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 \ ++ ++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 +--- /dev/null ++++ b/tools/assistant/translations/translations_adp.pro +@@ -0,0 +1,41 @@ ++# 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 ++ ++ ++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.") +--- /dev/null ++++ b/tools/designer/translations/translations.pro +@@ -0,0 +1,124 @@ ++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 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 ++ ++TRANSLATIONS=../../../translations/designer_de.ts \ ++ ../../../translations/designer_ja.ts \ ++ ../../../translations/designer_pl.ts \ ++ ../../../translations/designer_ru.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 -@@ -98,11 +98,11 @@ FORMS += statistics.ui \ +@@ -96,11 +96,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 \ @@ -28,9 +305,9 @@ Use case: Qt sources comes from git and we need to build them. --- 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 \ @@ -46,7 +323,7 @@ Use case: Qt sources comes from git and we need to build them. @@ -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 \ @@ -59,24 +336,32 @@ Use case: Qt sources comes from git and we need to build them. + ../../../translations/qvfb_zh_TW.ts --- a/translations/translations.pri +++ b/translations/translations.pri -@@ -39,10 +39,10 @@ ts-qt.commands = (cd $$QT_SOURCE_TREE/sr +@@ -26,7 +26,6 @@ QT_TS = de fr zh_CN untranslated + ts-qt.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \ + 3rdparty/phonon \ + 3rdparty/webkit \ +- activeqt \ + corelib \ + gui \ + network \ +@@ -38,10 +37,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 diff --git a/debian/qt4-demos-dbg.install b/debian/qt4-demos-dbg.install index c16db82..fc4a8b6 100644 --- a/debian/qt4-demos-dbg.install +++ b/debian/qt4-demos-dbg.install @@ -178,7 +178,7 @@ usr/lib/qt4/examples/tutorials/addressbook/part7/part7.debug usr/lib/qt4/examples/uitools/multipleinheritance/multipleinheritance.debug usr/lib/qt4/examples/uitools/textfinder/textfinder.debug usr/lib/qt4/examples/webkit/fancybrowser/fancybrowser.debug -usr/lib/qt4/examples/webkit/formextractor/formExtractor.debug +usr/lib/qt4/examples/webkit/formextractor/formextractor.debug usr/lib/qt4/examples/webkit/googlechat/googlechat.debug usr/lib/qt4/examples/webkit/previewer/previewer.debug usr/lib/qt4/examples/widgets/analogclock/analogclock.debug diff --git a/debian/qt4-demos-dbg.lintian b/debian/qt4-demos-dbg.lintian index 391f1db..c7ce40f 100644 --- a/debian/qt4-demos-dbg.lintian +++ b/debian/qt4-demos-dbg.lintian @@ -191,7 +191,7 @@ qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/tutorials/address qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/uitools/multipleinheritance/multipleinheritance.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/uitools/textfinder/textfinder.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/webkit/fancybrowser/fancybrowser.debug -qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/webkit/formextractor/formExtractor.debug +qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/webkit/formextractor/formextractor.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/webkit/googlechat/googlechat.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/webkit/previewer/previewer.debug qt4-demos-dbg: statically-linked-binary ./usr/lib/qt4/examples/widgets/analogclock/analogclock.debug |