[Python-modules-commits] r26235 - in packages/pyqt5/trunk/debian (4 files)

[mitya57-guest at users.alioth.debian.org]

    Date: Monday, October 21, 2013 @ 15:28:39
  Author: mitya57-guest
Revision: 26235

Backport upstream patch to always apply passed qmake variables.

Added:
  packages/pyqt5/trunk/debian/patches/
  packages/pyqt5/trunk/debian/patches/series
  packages/pyqt5/trunk/debian/patches/use-qmake-variables.diff
Modified:
  packages/pyqt5/trunk/debian/changelog

Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog	2013-10-21 11:02:41 UTC (rev 26234)
+++ packages/pyqt5/trunk/debian/changelog	2013-10-21 15:28:39 UTC (rev 26235)
@@ -9,10 +9,11 @@
   * Do not install Windows-specific activeqt examples.
   * Add new package for QtSerialPort module.
   * Make sure dpkg build flags are actually applied.
+  * Backport upstream patch to always apply passed qmake variables.
   * Pass --debug option to configure.py when doing debug builds.
   * Link with --as-needed.
 
- -- Dmitry Shachnev <mitya57 at gmail.com>  Tue, 15 Oct 2013 17:59:27 +0400
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Mon, 21 Oct 2013 19:28:02 +0400
 
 pyqt5 (5.1+dfsg-1) unstable; urgency=low
 

Added: packages/pyqt5/trunk/debian/patches/series
===================================================================
--- packages/pyqt5/trunk/debian/patches/series	                        (rev 0)
+++ packages/pyqt5/trunk/debian/patches/series	2013-10-21 15:28:39 UTC (rev 26235)
@@ -0,0 +1 @@
+use-qmake-variables.diff

Added: packages/pyqt5/trunk/debian/patches/use-qmake-variables.diff
===================================================================
--- packages/pyqt5/trunk/debian/patches/use-qmake-variables.diff	                        (rev 0)
+++ packages/pyqt5/trunk/debian/patches/use-qmake-variables.diff	2013-10-21 15:28:39 UTC (rev 26235)
@@ -0,0 +1,23 @@
+Description: add qmake variables when generating all .pro files
+Origin: upstream, changeset 44c92d7c6f19
+Last-Update: 2013-10-21
+
+--- a/configure.py
++++ b/configure.py
+@@ -1331,6 +1331,8 @@
+ VPATH = %s
+ ''' % (qmake_quote(sp_plugin_dir), qmake_quote(sp_plugin_dir)))
+ 
++    fout.write('\n'.join(target_config.qmake_variables) + '\n')
++
+     fout.close()
+ 
+     # Create the makefile.
+@@ -1373,6 +1375,7 @@
+         pro_lines.append('VPATH = %s' % qmake_quote(sp_src_dir))
+ 
+     pro_lines.extend(pro_sources(sp_src_dir))
++    pro_lines.extend(target_config.qmake_variables)
+ 
+     pro_name = os.path.join(src_dir, app + '.pro')
+