diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-22 03:05:09 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-22 03:05:09 -0600 |
| commit | 99d9097f5e112ca8605e28ae36fd748c19d3e9b0 (patch) | |
| tree | 32ce7c84a30012bc8890e911a4a4097b54f2e7de /ubuntu/maverick/dependencies/sip4-tqt/debian/patches | |
| parent | a4a5eb7bc74f7aaf5a093ddb4a73a17101a1f42e (diff) | |
| download | tde-packaging-99d9097f5e112ca8605e28ae36fd748c19d3e9b0.tar.gz tde-packaging-99d9097f5e112ca8605e28ae36fd748c19d3e9b0.zip | |
Initial import of sip4-tqt packaging for Ubuntu
Diffstat (limited to 'ubuntu/maverick/dependencies/sip4-tqt/debian/patches')
3 files changed, 52 insertions, 0 deletions
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/series b/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/series new file mode 100644 index 000000000..c42871d34 --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/series @@ -0,0 +1,2 @@ +siputils_debian_changes.diff +siputils_objdir_module_fix.diff diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff b/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff new file mode 100644 index 000000000..2640f57c2 --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_siputils.dpatch by Torsten Marek <shlomme@debian.org> +Index: sip4-qt3-4.10/siputils.py +=================================================================== +--- sip4-qt3-4.10.orig/siputils.py 2010-01-14 15:52:09.000000000 +0100 ++++ sip4-qt3-4.10/siputils.py 2010-01-26 21:09:49.172700039 +0100 +@@ -718,7 +718,8 @@ + + libs.extend(self.optional_list("LIBS_WINDOWS")) + +- lflags.extend(self._platform_rpaths(rpaths.as_list())) ++ # Don't append any rpaths ++ #lflags.extend(self._platform_rpaths(rpaths.as_list())) + + # Save the transformed values. + self.CFLAGS.set(cflags) +@@ -843,6 +844,15 @@ + clib is the library name in cannonical form. + framework is set of the library is implemented as a MacOS framework. + """ ++ ################################################################## ++ # Generally, the linker is intelligent enough not to need this # ++ # additional information! # ++ # And Qt4's pkg-config and prl files are broken # ++ # Changed for Debian packaging, Torsten Marek <shlomme@gmx.net> # ++ ################################################################## ++ ++ return [] ++ + prl_libs = [] + + if self.generator in ("MSVC", "MSVC.NET", "BMAKE"): 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 new file mode 100644 index 000000000..3391b4a28 --- /dev/null +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff @@ -0,0 +1,18 @@ +Index: sip4-qt3-4.10/siputils.py +=================================================================== +--- sip4-qt3-4.10.orig/siputils.py 2010-01-26 23:45:34.144734105 +0100 ++++ sip4-qt3-4.10/siputils.py 2010-01-26 23:46:51.605699383 +0100 +@@ -1546,9 +1546,12 @@ + mfile.write("\n$(OFILES): $(HFILES)\n") + + for mf in self._build["moc_headers"].split(): +- root, discard = os.path.splitext(mf) ++ root, _ = os.path.splitext(mf) + cpp = "moc_" + 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)) + |