Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>pull/298/head
parent
c010a8f038
commit
2fd95788ca
@ -1,2 +0,0 @@
|
|||||||
# siputils_debian_changes.diff
|
|
||||||
# siputils_objdir_module_fix.diff
|
|
@ -1,32 +0,0 @@
|
|||||||
#! /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"):
|
|
@ -1,18 +0,0 @@
|
|||||||
Index: b/siputils.py
|
|
||||||
===================================================================
|
|
||||||
--- a/siputils.py
|
|
||||||
+++ b/siputils.py
|
|
||||||
@@ -1547,9 +1547,12 @@
|
|
||||||
mfile.write("\n$(OFILES): $(HFILES)\n")
|
|
||||||
|
|
||||||
for mf in self._build["tqmoc_headers"].split():
|
|
||||||
- root, discard = os.path.splitext(mf)
|
|
||||||
+ root, _ = os.path.splitext(mf)
|
|
||||||
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))
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
|||||||
# siputils_debian_changes.diff
|
|
||||||
# siputils_objdir_module_fix.diff
|
|
@ -1,32 +0,0 @@
|
|||||||
#! /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"):
|
|
@ -1,18 +0,0 @@
|
|||||||
Index: b/siputils.py
|
|
||||||
===================================================================
|
|
||||||
--- a/siputils.py
|
|
||||||
+++ b/siputils.py
|
|
||||||
@@ -1547,9 +1547,12 @@
|
|
||||||
mfile.write("\n$(OFILES): $(HFILES)\n")
|
|
||||||
|
|
||||||
for mf in self._build["tqmoc_headers"].split():
|
|
||||||
- root, discard = os.path.splitext(mf)
|
|
||||||
+ root, _ = os.path.splitext(mf)
|
|
||||||
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))
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
|||||||
# siputils_debian_changes.diff
|
|
||||||
# siputils_objdir_module_fix.diff
|
|
@ -1,32 +0,0 @@
|
|||||||
#! /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"):
|
|
@ -1,18 +0,0 @@
|
|||||||
Index: b/siputils.py
|
|
||||||
===================================================================
|
|
||||||
--- a/siputils.py
|
|
||||||
+++ b/siputils.py
|
|
||||||
@@ -1547,9 +1547,12 @@
|
|
||||||
mfile.write("\n$(OFILES): $(HFILES)\n")
|
|
||||||
|
|
||||||
for mf in self._build["tqmoc_headers"].split():
|
|
||||||
- root, discard = os.path.splitext(mf)
|
|
||||||
+ root, _ = os.path.splitext(mf)
|
|
||||||
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))
|
|
||||||
|
|
Loading…
Reference in new issue