Changeset 141679


Ignore:
Timestamp:
Oct 26, 2015, 7:10:54 PM (4 years ago)
Author:
michaelld@…
Message:

qscintialla & py*-qscintilla: update to 2.9.1. Fix notes & patches.

Location:
trunk/dports
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/devel/qscintilla/Portfile

    r140960 r141679  
    77name                qscintilla
    88
    9 # NOTE: the version of this port must be kept in sync with the 'py*-qscintilla' port(s),
    10 #       since they contain the python bindings!
     9# NOTE: The version of this port must be kept in sync with the
     10# 'py*-qscintilla' port(s), since they contain the python bindings!
    1111
    12 version             2.9
    13 revision            1
    14 checksums           rmd160 3b3682a578a988466ef35aeab757466ea908934f \
    15                     sha256 d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417
     12version             2.9.1
     13checksums           rmd160 690f8384de9aea15bb0a89455c0303d6a2890710 \
     14                    sha256 79e9c39d51549061d3d489387bcee86ff20c1f746d1b25ac173d5165426eabaf
    1615
    1716categories          devel
  • trunk/dports/devel/qscintilla/files/patch-add_debug.diff

    r135260 r141679  
    4343+}
    4444 
    45  DEFINES += QSCINTILLA_MAKE_DLL SCINTILLA_QT SCI_LEXER
    46  greaterThan(QT_MAJOR_VERSION, 3) {
     45 !CONFIG(staticlib) {
     46     DEFINES += QSCINTILLA_MAKE_DLL
  • trunk/dports/python/py-qscintilla/Portfile

    r140994 r141679  
    88name                py-qscintilla
    99
    10 # WARNING: The version of these python bindings must match the version
    11 #          number of the installed qscintilla port, or configure/building
    12 #          will fail with strange error messages.
     10# NOTE: The version of these python bindings must match that of the
     11# installed devel/qscintilla port, or configure/building will fail
     12# with strange error messages.
    1313
    14 version             2.9
    15 revision            2
    16 checksums           rmd160 3b3682a578a988466ef35aeab757466ea908934f \
    17                     sha256 d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417
     14version             2.9.1
     15checksums           rmd160 690f8384de9aea15bb0a89455c0303d6a2890710 \
     16                    sha256 79e9c39d51549061d3d489387bcee86ff20c1f746d1b25ac173d5165426eabaf
    1817
    1918categories          python devel
  • trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff

    r135261 r141679  
    11--- Python/configure.py.orig    2014-07-03 06:15:50.000000000 -0400
    22+++ Python/configure.py 2014-07-25 13:43:38.000000000 -0400
    3 @@ -1157,6 +1157,13 @@
    4              action='store_true',
    5              help="suppress timestamps in the header comments of generated "
     3@@ -1154,6 +1154,13 @@
    64                     "code [default: include timestamps]")
     5 
     6     module_config.init_optparser(p, target_config)
    77+    if sys.platform == 'darwin':
    88+        g = optparse.OptionGroup(p, title="MacOS X Configuration")
     
    1313+        p.add_option_group(g)
    1414 
    15      module_config.init_optparser(p, target_config)
     15     return p
    1616 
    17 @@ -1315,6 +1315,11 @@
     17@@ -1315,6 +1322,11 @@
    1818     pro.write('CONFIG += %s\n' % ('debug' if opts.debug else 'release'))
    1919     pro.write('CONFIG += %s\n' % ('staticlib' if opts.static else 'plugin'))
     
    2323+        use_arch = ' '.join(iter(opts.use_arch))
    2424+        pro.write('CONFIG += %s\n' % use_arch)
    25 + 
     25+
    2626     config = qmake_config.get('CONFIG')
    2727     if config:
    2828         pro.write('CONFIG += %s\n' % config)
    29 @@ -1432,9 +1444,7 @@
    30  
    31  macx {
    32      QMAKE_LFLAGS += "-undefined dynamic_lookup"
    33 -    greaterThan(QT_MAJOR_VERSION, 4) {
    34 -        QMAKE_LFLAGS += "-install_name $$absolute_path($$PY_MODULE, $$target.path)"
    35 -    }
    36 +    QMAKE_LFLAGS += "-install_name $$target.path/$$PY_MODULE"
    37  ''')
    38  
    39          dylib = module_config.get_mac_wrapped_library_file(target_config)
Note: See TracChangeset for help on using the changeset viewer.