diff options
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/02_launch_assistant-qt4.diff | 3 | ||||
-rw-r--r-- | debian/patches/10_config_tests_fixes.diff | 4 | ||||
-rw-r--r-- | debian/patches/15_fix_qmake_makefile_generation.diff | 3 | ||||
-rw-r--r-- | debian/patches/16_hide_std_symbols_on_qtwebkit.diff | 4 | ||||
-rw-r--r-- | debian/patches/40_alpha_ice.diff | 6 |
5 files changed, 20 insertions, 0 deletions
diff --git a/debian/patches/02_launch_assistant-qt4.diff b/debian/patches/02_launch_assistant-qt4.diff index 2eefe4f..eb4cd95 100644 --- a/debian/patches/02_launch_assistant-qt4.diff +++ b/debian/patches/02_launch_assistant-qt4.diff @@ -1,3 +1,6 @@ +Description: launch assistant-qt4 explicitely (Debian naming scheme) +Author: Fathi Boudra <fabo@debian.org> + --- a/demos/qtdemo/menumanager.cpp +++ b/demos/qtdemo/menumanager.cpp @@ -286,7 +286,7 @@ void MenuManager::showDocInAssistant(con diff --git a/debian/patches/10_config_tests_fixes.diff b/debian/patches/10_config_tests_fixes.diff index 28acd03..44588af 100644 --- a/debian/patches/10_config_tests_fixes.diff +++ b/debian/patches/10_config_tests_fixes.diff @@ -1,3 +1,7 @@ +Description: Various config.test fixes. + Build ibase sql plugin against firebird. +Author: Fathi Boudra <fabo@debian.org> + --- a/config.tests/unix/ibase/ibase.pro +++ b/config.tests/unix/ibase/ibase.pro @@ -1,4 +1,4 @@ diff --git a/debian/patches/15_fix_qmake_makefile_generation.diff b/debian/patches/15_fix_qmake_makefile_generation.diff index ef1bbb7..c8fad2f 100644 --- a/debian/patches/15_fix_qmake_makefile_generation.diff +++ b/debian/patches/15_fix_qmake_makefile_generation.diff @@ -1,3 +1,6 @@ +Description: Fix qmake makefile generation - should not add double slashes to makefiles. +Author: Sune Vuorela <debian@pusling.com> + --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2396,7 +2396,7 @@ MakefileGenerator::writeSubTargets(QText diff --git a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff index 484b57e..5bb6ee8 100644 --- a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff +++ b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff @@ -1,3 +1,7 @@ +Description: Don't make the std:: symbols in webkit public. +Solution based on the work of Mike Hommey in the gtk webkit package. +Author: Sune Vuorela <debian@pusling.com> + --- a/src/3rdparty/webkit/WebKit.pri +++ b/src/3rdparty/webkit/WebKit.pri @@ -45,6 +45,7 @@ CONFIG(release, debug|release) { diff --git a/debian/patches/40_alpha_ice.diff b/debian/patches/40_alpha_ice.diff index 3c98e70..599627c 100644 --- a/debian/patches/40_alpha_ice.diff +++ b/debian/patches/40_alpha_ice.diff @@ -1,3 +1,9 @@ +Description: Workaround for -fvisibility-inlines-hidden on alpha: + break out the static methods so they're not inlined. + fix FTBFS on alpha. +Bug-Debian: http://bugs.debian.org/368883 +Author: Steve Langasek <vorlon@debian.org> + --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -83,12 +83,7 @@ class QLibraryInfoPrivate |