diff options
| author | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2012-12-17 21:52:45 -0300 |
|---|---|---|
| committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2012-12-17 21:52:45 -0300 |
| commit | 454bd2153eef913fd831d0abb64caf5119811fce (patch) | |
| tree | 717cfbf92b4deaa07818b6cc989c743aff664035 | |
| parent | 176983b0e270cb6707be3544f45bdc671cbb1119 (diff) | |
| download | qt4-x11-454bd2153eef913fd831d0abb64caf5119811fce.tar.gz | |
Remove the patch add-winvalid.patch.
It has served it's purpose.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/add-winvalid-pch.patch | 16 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 3 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog index 7d50750..237c2e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ qt4-x11 (4:4.8.2+dfsg-6) UNRELEASED; urgency=low - + * Hopefully fix ia64 FTBFS: + - Remove add-winvalid.patch. Stephan Schreiber has determined the problem + with the precompiled headers on ia64. Thanks *a lot* Stephan. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Mon, 17 Dec 2012 21:47:47 -0300 diff --git a/debian/patches/add-winvalid-pch.patch b/debian/patches/add-winvalid-pch.patch deleted file mode 100644 index 3183cf2..0000000 --- a/debian/patches/add-winvalid-pch.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Add -Winvalid-pch to CFLAGS. - This will allow a more verbose build, which may help us to determine the reason - of the FTBFS on ia64. -Author: Stephan Schreiber <info@fs-driver.org> -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=696096 - ---- a/mkspecs/common/g++-base.conf.orig 2012-12-16 14:36:37.347714646 +0100 -+++ b/mkspecs/common/g++-base.conf 2012-12-16 14:37:45.335717820 +0100 -@@ -25,6 +25,6 @@ - QMAKE_PCH_OUTPUT_EXT = .gch - - QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} --QMAKE_CFLAGS_USE_PRECOMPILE = -include ${QMAKE_PCH_OUTPUT_BASE} -+QMAKE_CFLAGS_USE_PRECOMPILE = -include ${QMAKE_PCH_OUTPUT_BASE} -Winvalid-pch - QMAKE_CXXFLAGS_PRECOMPILE = -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} - QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE diff --git a/debian/patches/series b/debian/patches/series index 4dd0d8a..d37d71b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -51,4 +51,3 @@ qt_atomic_sparc64.patch no_libicu_message.diff QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch fix_use_after_free_qlocale_unix.patch -add-winvalid-pch.patch |