]> git.pld-linux.org Git - packages/qscintilla2.git/blob - qscintilla2-outoftree.patch
- rediff patches
[packages/qscintilla2.git] / qscintilla2-outoftree.patch
1 diff -urNp -x '*.orig' QScintilla_gpl-2.11.2.org/Python/configure.py QScintilla_gpl-2.11.2/Python/configure.py
2 --- QScintilla_gpl-2.11.2.org/Python/configure.py       2021-03-05 20:11:27.200117035 +0100
3 +++ QScintilla_gpl-2.11.2/Python/configure.py   2021-03-05 20:11:27.296783130 +0100
4 @@ -294,7 +294,7 @@ class ModuleConfiguration(object):
5              return None
6  
7          path = os.path.join(target_configuration.qsci_sip_dir, 'Qsci')
8 -        files = glob.glob('sip/*.sip')
9 +        files = glob.glob(os.path.join(target_configuration.src_dir, 'sip/*.sip'))
10  
11          return path, files
12  
13 @@ -1351,7 +1351,7 @@ def _generate_code(target_config, opts,
14      # any '-I' needed appears first.
15      pkg_root = os.path.dirname(os.path.abspath(__file__))
16  
17 -    sip_file = module_config.get_sip_file(target_config)
18 +    sip_file = os.path.join(target_config.src_dir, module_config.get_sip_file(target_config))
19  
20      head, tail = os.path.split(sip_file)
21      while head:
22 @@ -1823,8 +1823,11 @@ def _main(argv, pkg_config):
23      arguments.  pkg_config is the package configuration.
24      """
25  
26 +    src_dir = os.path.dirname(os.path.abspath(__file__))
27 +
28      # Create the default target configuration.
29      target_config = _TargetConfiguration(pkg_config)
30 +    target_config.src_dir = src_dir
31  
32      # Parse the command line.
33      p = _create_optparser(target_config, pkg_config)
This page took 0.079606 seconds and 3 git commands to generate.