[117960] trunk/dports/devel/qscintilla
michaelld at macports.org
michaelld at macports.org
Mon Mar 17 12:40:15 PDT 2014
Revision: 117960
https://trac.macports.org/changeset/117960
Author: michaelld at macports.org
Date: 2014-03-17 12:40:15 -0700 (Mon, 17 Mar 2014)
Log Message:
-----------
qscintilla: update to 2.8.1.
Modified Paths:
--------------
trunk/dports/devel/qscintilla/Portfile
trunk/dports/devel/qscintilla/files/patch-add_debug.diff
Modified: trunk/dports/devel/qscintilla/Portfile
===================================================================
--- trunk/dports/devel/qscintilla/Portfile 2014-03-17 19:37:55 UTC (rev 117959)
+++ trunk/dports/devel/qscintilla/Portfile 2014-03-17 19:40:15 UTC (rev 117960)
@@ -5,7 +5,7 @@
PortGroup qt4 1.0
name qscintilla
-version 2.7.2
+version 2.8.1
categories devel
license {GPL-2 GPL-3 OpenSSLException}
maintainers michaelld openmaintainer
@@ -32,9 +32,8 @@
distname QScintilla-gpl-${version}
master_sites sourceforge:pyqt
-checksums md5 0fbfb06078f206a241a62c94861cce21 \
- sha1 2a11fb6be2c3005bc6502f929a0a339d4303af9b \
- rmd160 09552e7c41695822e7eebf86781901c7de90e521
+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.
Modified: trunk/dports/devel/qscintilla/files/patch-add_debug.diff
===================================================================
--- trunk/dports/devel/qscintilla/files/patch-add_debug.diff 2014-03-17 19:37:55 UTC (rev 117959)
+++ trunk/dports/devel/qscintilla/files/patch-add_debug.diff 2014-03-17 19:40:15 UTC (rev 117960)
@@ -1,20 +1,19 @@
---- designer-Qt4Qt5/designer.pro.orig 2013-06-25 13:23:02.000000000 -0400
-+++ designer-Qt4Qt5/designer.pro 2013-06-25 13:29:15.000000000 -0400
+--- designer-Qt4Qt5/designer.pro.orig 2014-03-17 13:51:54.000000000 -0400
++++ designer-Qt4Qt5/designer.pro 2014-03-17 13:51:41.000000000 -0400
@@ -4,7 +4,7 @@
TEMPLATE = lib
TARGET = qscintillaplugin
--CONFIG += release plugin
-+CONFIG += plugin @ARCHES@ @BUILD_TYPE@
+-CONFIG += release plugin qscintilla2
++CONFIG += plugin qscintilla2 @ARCHES@ @BUILD_TYPE@
greaterThan(QT_MAJOR_VERSION, 4) {
QT += designer
-@@ -22,4 +22,14 @@
+@@ -21,3 +21,15 @@
+
target.path = $$[QT_INSTALL_PLUGINS]/designer
INSTALLS += target
-
--LIBS += -L$$[QT_INSTALL_LIBS] -lqscintilla2
-+INCLUDEPATH += ../Qt4Qt5
++
+QSCI_LIB = qscintilla2
+
+!debug_and_release|build_pass {
@@ -24,18 +23,19 @@
+ }
+}
+
++INCLUDEPATH += ../Qt4Qt5
+LIBS += -L../Qt4Qt5 -l$$QSCI_LIB
---- Qt4Qt5/qscintilla.pro.orig 2013-06-25 13:40:06.000000000 -0400
-+++ Qt4Qt5/qscintilla.pro 2013-06-25 13:40:35.000000000 -0400
+--- 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 @@
TEMPLATE = lib
TARGET = qscintilla2
--CONFIG += qt warn_off release dll thread
--INCLUDEPATH = . ../include ../lexlib ../src
-+CONFIG += qt warn_off dll thread @ARCHES@ @BUILD_TYPE@
-+INCLUDEPATH = . .. ../include ../lexlib ../src
- DEFINES = QSCINTILLA_MAKE_DLL QT SCI_LEXER
+-CONFIG += qt warn_off release dll thread exceptions
+-INCLUDEPATH += . ../include ../lexlib ../src
++CONFIG += qt warn_off dll 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) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140317/e816b8cc/attachment.html>
More information about the macports-changes
mailing list