[141679] trunk/dports

[michaelld at macports.org]

Revision: 141679
          https://trac.macports.org/changeset/141679
Author:   michaelld at macports.org
Date:     2015-10-26 12:10:54 -0700 (Mon, 26 Oct 2015)
Log Message:
-----------
qscintialla & py*-qscintilla: update to 2.9.1. Fix notes & patches.

Modified Paths:
--------------
    trunk/dports/devel/qscintilla/Portfile
    trunk/dports/devel/qscintilla/files/patch-add_debug.diff
    trunk/dports/python/py-qscintilla/Portfile
    trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff

Modified: trunk/dports/devel/qscintilla/Portfile
===================================================================
--- trunk/dports/devel/qscintilla/Portfile	2015-10-26 19:05:20 UTC (rev 141678)
+++ trunk/dports/devel/qscintilla/Portfile	2015-10-26 19:10:54 UTC (rev 141679)
@@ -6,13 +6,12 @@
 
 name                qscintilla
 
-# NOTE: the version of this port must be kept in sync with the 'py*-qscintilla' port(s),
-#       since they contain the python bindings!
+# NOTE: The version of this port must be kept in sync with the
+# 'py*-qscintilla' port(s), since they contain the python bindings!
 
-version             2.9
-revision            1
-checksums           rmd160 3b3682a578a988466ef35aeab757466ea908934f \
-                    sha256 d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417
+version             2.9.1
+checksums           rmd160 690f8384de9aea15bb0a89455c0303d6a2890710 \
+                    sha256 79e9c39d51549061d3d489387bcee86ff20c1f746d1b25ac173d5165426eabaf
 
 categories          devel
 license             {GPL-2 GPL-3 OpenSSLException}

Modified: trunk/dports/devel/qscintilla/files/patch-add_debug.diff
===================================================================
--- trunk/dports/devel/qscintilla/files/patch-add_debug.diff	2015-10-26 19:05:20 UTC (rev 141678)
+++ trunk/dports/devel/qscintilla/files/patch-add_debug.diff	2015-10-26 19:10:54 UTC (rev 141679)
@@ -42,5 +42,5 @@
 +    }
 +}
  
- DEFINES += QSCINTILLA_MAKE_DLL SCINTILLA_QT SCI_LEXER
- greaterThan(QT_MAJOR_VERSION, 3) {
+ !CONFIG(staticlib) {
+     DEFINES += QSCINTILLA_MAKE_DLL

Modified: trunk/dports/python/py-qscintilla/Portfile
===================================================================
--- trunk/dports/python/py-qscintilla/Portfile	2015-10-26 19:05:20 UTC (rev 141678)
+++ trunk/dports/python/py-qscintilla/Portfile	2015-10-26 19:10:54 UTC (rev 141679)
@@ -7,14 +7,13 @@
 
 name                py-qscintilla
 
-# WARNING: The version of these python bindings must match the version
-#          number of the installed qscintilla port, or configure/building
-#          will fail with strange error messages.
+# NOTE: The version of these python bindings must match that of the
+# installed devel/qscintilla port, or configure/building will fail
+# with strange error messages.
 
-version             2.9
-revision            2
-checksums           rmd160 3b3682a578a988466ef35aeab757466ea908934f \
-                    sha256 d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417
+version             2.9.1
+checksums           rmd160 690f8384de9aea15bb0a89455c0303d6a2890710 \
+                    sha256 79e9c39d51549061d3d489387bcee86ff20c1f746d1b25ac173d5165426eabaf
 
 categories          python devel
 license             {GPL-2 GPL-3}

Modified: trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff
===================================================================
--- trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff	2015-10-26 19:05:20 UTC (rev 141678)
+++ trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff	2015-10-26 19:10:54 UTC (rev 141679)
@@ -1,9 +1,9 @@
 --- Python/configure.py.orig	2014-07-03 06:15:50.000000000 -0400
 +++ Python/configure.py	2014-07-25 13:43:38.000000000 -0400
-@@ -1157,6 +1157,13 @@
-             action='store_true',
-             help="suppress timestamps in the header comments of generated "
+@@ -1154,6 +1154,13 @@
                      "code [default: include timestamps]")
+ 
+     module_config.init_optparser(p, target_config)
 +    if sys.platform == 'darwin':
 +        g = optparse.OptionGroup(p, title="MacOS X Configuration")
 +        g.add_option("--use-arch", action="append", metavar="ARCH",
@@ -12,9 +12,9 @@
 +                        "[default: system default]")
 +        p.add_option_group(g)
  
-     module_config.init_optparser(p, target_config)
+     return p
  
-@@ -1315,6 +1315,11 @@
+@@ -1315,6 +1322,11 @@
      pro.write('CONFIG += %s\n' % ('debug' if opts.debug else 'release'))
      pro.write('CONFIG += %s\n' % ('staticlib' if opts.static else 'plugin'))
  
@@ -22,18 +22,7 @@
 +        # convert opts.use_arch from a list to a string
 +        use_arch = ' '.join(iter(opts.use_arch))
 +        pro.write('CONFIG += %s\n' % use_arch)
-+ 
++
      config = qmake_config.get('CONFIG')
      if config:
          pro.write('CONFIG += %s\n' % config)
-@@ -1432,9 +1444,7 @@
- 
- macx {
-     QMAKE_LFLAGS += "-undefined dynamic_lookup"
--    greaterThan(QT_MAJOR_VERSION, 4) {
--        QMAKE_LFLAGS += "-install_name $$absolute_path($$PY_MODULE, $$target.path)"
--    }
-+    QMAKE_LFLAGS += "-install_name $$target.path/$$PY_MODULE"
- ''')
- 
-         dylib = module_config.get_mac_wrapped_library_file(target_config)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/ad22a121/attachment-0001.html>