[120855] trunk/dports

michaelld at macports.org michaelld at macports.org
Mon Jun 9 18:25:48 PDT 2014 

Revision: 120855
          https://trac.macports.org/changeset/120855
Author:   michaelld at macports.org
Date:     2014-06-09 18:25:48 -0700 (Mon, 09 Jun 2014)
Log Message:
-----------
qscintilla and py*qscintilla:
+ update to 2.8.2;
+ rearrange sections to make more convenient.

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	2014-06-10 01:16:11 UTC (rev 120854)
+++ trunk/dports/devel/qscintilla/Portfile	2014-06-10 01:25:48 UTC (rev 120855)
@@ -5,7 +5,14 @@
 PortGroup           qt4 1.0
 
 name                qscintilla
-version             2.8.1
+
+# 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.8.2
+checksums           rmd160 030773b5013cc6e36a928b607ba24d5d5d841e55 \
+                    sha256 b054d70df9f460d54d42b2879a1ac921a490ebaea8313bac932282d234a53f74
+
 categories          devel
 license             {GPL-2 GPL-3 OpenSSLException}
 maintainers         michaelld openmaintainer
@@ -24,17 +31,9 @@
                 	bold and italics, multiple foreground and background colours and	\
                 	multiple fonts. See the py*-qscintilla port to install 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!
-#
-
 distname            QScintilla-gpl-${version}
 master_sites        sourceforge:pyqt
 
-checksums           rmd160 7301f1d9bea71b15cc9d98a20a2ece2b6843f3aa \
-                    sha256 fbf3db4fe876152af56b5c9d5ec6f101c96bf97c05fdc5a87f358c707801c422
-
 # fix up QMake .pro files for +debug, if selected; also fixed up the
 # library and header paths to include .. and ../Qt4 before others.
 patchfiles-append   patch-add_debug.diff

Modified: trunk/dports/devel/qscintilla/files/patch-add_debug.diff
===================================================================
--- trunk/dports/devel/qscintilla/files/patch-add_debug.diff	2014-06-10 01:16:11 UTC (rev 120854)
+++ trunk/dports/devel/qscintilla/files/patch-add_debug.diff	2014-06-10 01:25:48 UTC (rev 120855)
@@ -25,24 +25,22 @@
 +
 +INCLUDEPATH += ../Qt4Qt5
 +LIBS += -L../Qt4Qt5 -l$$QSCI_LIB
---- Qt4Qt5/qscintilla.pro.orig	2014-03-17 13:40:20.000000000 -0400
-+++ Qt4Qt5/qscintilla.pro	2014-03-17 13:43:15.000000000 -0400
-@@ -29,10 +29,16 @@
+--- Qt4Qt5/qscintilla.pro.orig	2014-05-26 09:42:15.000000000 -0400
++++ Qt4Qt5/qscintilla.pro	2014-06-02 14:40:49.000000000 -0400
+@@ -29,8 +29,14 @@
  
  TEMPLATE = lib
  TARGET = qscintilla2
--CONFIG += qt warn_off release dll thread exceptions
+-CONFIG += qt warn_off release thread exceptions
 -INCLUDEPATH += . ../include ../lexlib ../src
-+CONFIG += qt warn_off dll thread exceptions @ARCHES@ @BUILD_TYPE@
++CONFIG += qt warn_off thread exceptions @ARCHES@ @BUILD_TYPE@
 +INCLUDEPATH += . .. ../include ../lexlib ../src
- DEFINES += QSCINTILLA_MAKE_DLL SCINTILLA_QT SCI_LEXER
- 
++
 +!debug_and_release|build_pass {
-+	CONFIG(debug, debug|release) {
-+		macx:TARGET = $$member(TARGET, 0)_debug
-+	}
++    CONFIG(debug, debug|release) {
++        macx:TARGET = $$member(TARGET, 0)_debug
++    }
 +}
-+
- greaterThan(QT_MAJOR_VERSION, 4) {
- 	QT += widgets
- 	QT += printsupport
+ 
+ DEFINES += QSCINTILLA_MAKE_DLL SCINTILLA_QT SCI_LEXER
+ greaterThan(QT_MAJOR_VERSION, 3) {

Modified: trunk/dports/python/py-qscintilla/Portfile
===================================================================
--- trunk/dports/python/py-qscintilla/Portfile	2014-06-10 01:16:11 UTC (rev 120854)
+++ trunk/dports/python/py-qscintilla/Portfile	2014-06-10 01:25:48 UTC (rev 120855)
@@ -10,8 +10,11 @@
 # 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.
-version             2.8.1
 
+version             2.8.2
+checksums           rmd160 030773b5013cc6e36a928b607ba24d5d5d841e55 \
+                    sha256 b054d70df9f460d54d42b2879a1ac921a490ebaea8313bac932282d234a53f74
+
 categories          python devel
 license             {GPL-2 GPL-3}
 maintainers         michaelld openmaintainer
@@ -26,9 +29,6 @@
 distname            QScintilla-gpl-${version}
 master_sites        sourceforge:pyqt
 
-checksums           rmd160 7301f1d9bea71b15cc9d98a20a2ece2b6843f3aa \
-                    sha256 fbf3db4fe876152af56b5c9d5ec6f101c96bf97c05fdc5a87f358c707801c422
-
 python.versions     25 26 27 31 32 33 34
 python.default_version 27
 

Modified: trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff
===================================================================
--- trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff	2014-06-10 01:16:11 UTC (rev 120854)
+++ trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff	2014-06-10 01:25:48 UTC (rev 120855)
@@ -1,6 +1,6 @@
---- Python/configure.py.orig	2014-03-17 14:40:05.000000000 -0400
-+++ Python/configure.py	2014-03-17 14:40:50.000000000 -0400
-@@ -498,6 +498,13 @@
+--- Python/configure.py.orig	2014-05-26 09:42:16.000000000 -0400
++++ Python/configure.py	2014-06-02 14:51:02.000000000 -0400
+@@ -1108,6 +1108,13 @@
              action='store_true',
              help="suppress timestamps in the header comments of generated "
                      "code [default: include timestamps]")
@@ -12,25 +12,29 @@
 +                        "[default: system default]")
 +        p.add_option_group(g)
  
-     return p
+     module_config.init_optparser(p, target_config)
  
-@@ -671,6 +678,10 @@
+@@ -1235,6 +1242,11 @@
      pro.write('CONFIG += %s\n' % ('debug' if opts.debug else 'release'))
      pro.write('CONFIG += %s\n' % ('staticlib' if opts.static else 'plugin'))
-     pro.write('CONFIG += qscintilla2\n')
+ 
 +    if sys.platform == 'darwin' and opts.use_arch is not None:
 +        # 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)
+@@ -1334,10 +1346,7 @@
  
-     if not opts.static:
-         # I don't really understand why the linker needs to find the Python
-@@ -758,7 +769,7 @@
- 
  macx {
      QMAKE_LFLAGS += "-undefined dynamic_lookup"
--    QMAKE_LFLAGS += "-install_name $$absolute_path($$PY_MODULE, $$target.path)"
+-    greaterThan(QT_MAJOR_VERSION, 4) {
+-        QMAKE_LFLAGS += "-install_name $$absolute_path($$PY_MODULE, $$target.path)"
+-    }
+-
 +    QMAKE_LFLAGS += "-install_name $$target.path/$$PY_MODULE"
-     QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\\\n\\\\t)$$quote(install_name_tool -change libqscintilla2.%s.dylib %s/libqscintilla2.%s.dylib $$PY_MODULE)
+     QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\\\n\\\\t)$$quote(install_name_tool -change %s %s $$PY_MODULE)
  }
- ''' % (QSCI_API_MAJOR, lib_dir, QSCI_API_MAJOR))
+ ''' % (os.path.basename(dylib), dylib))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140609/d6a9458a/attachment-0001.html>

More information about the macports-changes mailing list