← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/pyside/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/usePySpecificShiboken.patch

  • Committer: Bazaar Package Importer
  • Author(s): Didier Raboud
  • Date: 2010-10-19 22:52:14 UTC
  • mfrom: (1.2.2 upstream) (6.1.4 experimental)
  • Revision ID: james.westby@ubuntu.com-20101019225214-39nuv0l2v7ftju5p
Tags: 0.4.2-1
* New 0.4.2 upstream release.
  - Add some 0.4.1 and 0.4.2 symbols.
  - Bump apiextractor and shiboken B-D versions.
  - Update patches.
  - Update debian/dh_pycmakedeps to work with new upstream coding style.

* Patches:
  - u_c130273_fix_py25_QtScript_property.patch
    Remove, was from upstream.
  - u_20e226b_fix_missing_qcoreapplication_arguments_method.patch
    Remove, was from upstream.
  - u_268bf77_fixed_signal_signature_parser.patch
    Remove, was from upstream.
  + libPythonVersionPostfix.patch: Refresh
  + usePySpecificShiboken.patch: Refresh
  + lessBuildVerbosity.patch: Refresh
 
* Bump the B-D chain versions.
* Make sure the private.py is installed in QtCore module.
* Build against Qt 4.7.
  - Add libqtwebkit-dev
  - Drop QtMultimedia module.
  - Add the QtDeclarative package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/usePySpecificShiboken.patch
5
5
Last-Update: 2010-08-04
6
6
Index: pyside/CMakeLists.txt
7
7
===================================================================
8
 
--- pyside.orig/CMakeLists.txt  2010-09-14 10:57:23.000000000 +0200
9
 
+++ pyside/CMakeLists.txt       2010-09-14 10:57:29.000000000 +0200
10
 
@@ -171,7 +171,7 @@
 
8
--- pyside.orig/CMakeLists.txt  2010-10-13 15:00:50.000000000 +0200
 
9
+++ pyside/CMakeLists.txt       2010-10-15 09:07:56.000000000 +0200
 
10
@@ -178,7 +178,7 @@
 
11
     set(PYSIDE_PYTHON_LIBRARIES "-undefined dynamic_lookup")
11
12
 endif()
12
13
 
13
 
 
14
14
-set(GENERATOR_EXTRA_FLAGS --generatorSet=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic)
15
15
+set(GENERATOR_EXTRA_FLAGS --generatorSet=/usr/lib/generatorrunner/shiboken_generator${SHIBOKEN_POSTFIX}.so --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic)
16
16