diff -Nru /tmp/EnQvBuTvwU/python-qt4-4.3/debian/changelog /tmp/5if6esgivY/python-qt4-4.3/debian/changelog --- /tmp/EnQvBuTvwU/python-qt4-4.3/debian/changelog 2007-09-18 20:32:56.000000000 +0100 +++ /tmp/5if6esgivY/python-qt4-4.3/debian/changelog 2007-09-18 20:32:56.000000000 +0100 @@ -1,3 +1,9 @@ +python-qt4 (4.3-2ubuntu6) gutsy; urgency=low + + * Build with -fpermissive when building with g++-4.3. LP: #138640. + + -- Matthias Klose Thu, 13 Sep 2007 17:44:11 +0000 + python-qt4 (4.3-2ubuntu5) gutsy; urgency=low * Make the dbus extension available in /var as well. LP: #135893. diff -Nru /tmp/EnQvBuTvwU/python-qt4-4.3/debian/rules /tmp/5if6esgivY/python-qt4-4.3/debian/rules --- /tmp/EnQvBuTvwU/python-qt4-4.3/debian/rules 2007-09-18 20:32:56.000000000 +0100 +++ /tmp/5if6esgivY/python-qt4-4.3/debian/rules 2007-09-18 20:32:56.000000000 +0100 @@ -26,12 +26,16 @@ DEFAULT_PYTHON=$(shell pyversions -vd) -GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p') +_P=) +GCCVER := $(shell gcc --version | sed -n "/^gcc/s/^[^$(_P)]*$(_P) \(.\..\).*/\1/p") ifneq (,$(filter $(GCCVER),4.2 4.3)) SPLIT=40 else SPLIT=10 endif +ifneq (,$(filter $(GCCVER),4.3)) + CXXFLAGS += -fpermissive +endif configure: configure-stamp configure-stamp: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp) @@ -47,6 +51,7 @@ $(if $(filter $(DEFAULT_PYTHON),$*),,--disable-designer-plugin) \ LIBDIR_QT=/usr/lib LIBS_X11="" LIBS_THREAD="" \ -m /usr/lib/python$*/config \ + CXXFLAGS_RELEASE="${CXXFLAGS}" \ MOC=moc-qt4 touch $@ @@ -66,6 +71,7 @@ LIBDIR_QT=/usr/lib LIBS_X11="" LIBS_THREAD="" \ -l /usr/include/python$*_d \ -m /usr/lib/python$*/config_d \ + CXXFLAGS_RELEASE="${CXXFLAGS}" \ MOC=moc-qt4 touch $@