diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-09-10 16:16:32 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-09-10 16:16:32 -0500 |
| commit | 02dc85a95b228b7242b0d11ea35619faad96db03 (patch) | |
| tree | e161ba877a0720bbdf7818bdec06eb239d8ad271 /ubuntu/precise/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff | |
| parent | 6f2c7dc70e77d2f768d687838b6cc9f7632f609e (diff) | |
| download | tde-packaging-02dc85a95b228b7242b0d11ea35619faad96db03.tar.gz tde-packaging-02dc85a95b228b7242b0d11ea35619faad96db03.zip | |
Split precise from maverick
Diffstat (limited to 'ubuntu/precise/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff')
| -rw-r--r-- | ubuntu/precise/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/ubuntu/precise/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff b/ubuntu/precise/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff new file mode 100644 index 000000000..2640f57c2 --- /dev/null +++ b/ubuntu/precise/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"): |