diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-22 15:03:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-22 15:03:41 -0600 |
| commit | 143b8ac9fa5ddfbdf0e755727aca5149e7f3fe26 (patch) | |
| tree | 8d971cfbd68b2d7180f52d2753d04c0a8b1e985b /ubuntu | |
| parent | 99d9097f5e112ca8605e28ae36fd748c19d3e9b0 (diff) | |
| download | tde-packaging-143b8ac9fa5ddfbdf0e755727aca5149e7f3fe26.tar.gz tde-packaging-143b8ac9fa5ddfbdf0e755727aca5149e7f3fe26.zip | |
Fix sip4-tqt FTBFS on Ubuntu and add sip4-tqt to Debian
Diffstat (limited to 'ubuntu')
3 files changed, 6 insertions, 6 deletions
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff b/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff index 3391b4a28..a9d580737 100644 --- a/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff @@ -5,14 +5,14 @@ Index: sip4-qt3-4.10/siputils.py @@ -1546,9 +1546,12 @@ mfile.write("\n$(OFILES): $(HFILES)\n") - for mf in self._build["moc_headers"].split(): + for mf in self._build["tqmoc_headers"].split(): - root, discard = os.path.splitext(mf) + root, _ = os.path.splitext(mf) - cpp = "moc_" + root + ".cpp" + cpp = "tqmoc_" + root + ".cpp" + if self._src_dir != self.dir: + mf = os.path.join(self._src_dir, mf) + mfile.write("\n%s: %s\n" % (cpp, mf)) - mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf)) + mfile.write("\t$(TQMOC) -o %s %s\n" % (cpp, mf)) diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules index 63db1e3d2..0dd14099f 100755 --- a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules @@ -35,7 +35,7 @@ build-%/configure-stamp: cd build-$* \ && python$* ../configure.py \ -d /usr/lib/python$*/$(call py_sitename,$*) \ - -u STRIP="" CFLAGS="${CFLAGS}" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS}" CXXFLAGS_RELEASE="" + -u STRIP="" CFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS} -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" touch $@ dbg-build-%/configure-stamp: @@ -45,7 +45,7 @@ dbg-build-%/configure-stamp: && python$*-dbg ../configure.py \ -d /usr/lib/python$*/$(call py_sitename,$*) \ -e /usr/include/python$*_d \ - -u CFLAGS="-O0 -g" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g" CXXFLAGS_RELEASE="" STRIP="" + -u CFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt -I/usr/include/tqt3 -I/usr/include/qt3" CXXFLAGS_RELEASE="" STRIP="" touch $@ diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/source/format b/ubuntu/maverick/dependencies/sip4-tqt/debian/source/format index 163aaf8d8..d00491fd7 100644 --- a/ubuntu/maverick/dependencies/sip4-tqt/debian/source/format +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +1 |