[144931] trunk/dports/graphics/qwt/files
vince at macports.org
vince at macports.org
Thu Jan 21 07:57:30 PST 2016
Revision: 144931
https://trac.macports.org/changeset/144931
Author: vince at macports.org
Date: 2016-01-21 07:57:30 -0800 (Thu, 21 Jan 2016)
Log Message:
-----------
qwt61: add patchfiles
Added Paths:
-----------
trunk/dports/graphics/qwt/files/patch-designer_designer.pro.61.diff
trunk/dports/graphics/qwt/files/patch-qwtbuild.pri.61.diff
trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.61.diff
Added: trunk/dports/graphics/qwt/files/patch-designer_designer.pro.61.diff
===================================================================
--- trunk/dports/graphics/qwt/files/patch-designer_designer.pro.61.diff (rev 0)
+++ trunk/dports/graphics/qwt/files/patch-designer_designer.pro.61.diff 2016-01-21 15:57:30 UTC (rev 144931)
@@ -0,0 +1,11 @@
+--- designer/designer.pro.orig 2013-01-25 19:21:02.000000000 -0500
++++ designer/designer.pro 2013-02-08 13:24:07.000000000 -0500
+@@ -42,7 +42,7 @@
+
+
+ TEMPLATE = lib
+- TARGET = qwt_designer_plugin
++ TARGET = $$qwtLibraryTarget(qwt_designer_plugin)
+
+ DESTDIR = plugins/designer
+
Added: trunk/dports/graphics/qwt/files/patch-qwtbuild.pri.61.diff
===================================================================
--- trunk/dports/graphics/qwt/files/patch-qwtbuild.pri.61.diff (rev 0)
+++ trunk/dports/graphics/qwt/files/patch-qwtbuild.pri.61.diff 2016-01-21 15:57:30 UTC (rev 144931)
@@ -0,0 +1,42 @@
+--- qwtbuild.pri.orig 2015-11-24 16:24:28.000000000 +0100
++++ qwtbuild.pri 2015-11-24 16:25:55.000000000 +0100
+@@ -14,7 +14,6 @@
+ CONFIG += qt
+ CONFIG += warn_on
+ CONFIG += no_keywords
+-CONFIG += silent
+
+ ######################################################################
+ # release/debug mode
+@@ -32,7 +31,7 @@
+ }
+ else {
+
+- CONFIG += release
++ CONFIG += @ARCHES@ release
+
+ VER_MAJ = $${QWT_VER_MAJ}
+ VER_MIN = $${QWT_VER_MIN}
+@@ -40,22 +39,6 @@
+ VERSION = $${QWT_VERSION}
+ }
+
+-linux-g++ | linux-g++-64 {
+- #CONFIG += separate_debug_info
+- #QMAKE_CXXFLAGS *= -Wfloat-equal
+- #QMAKE_CXXFLAGS *= -Wshadow
+- #QMAKE_CXXFLAGS *= -Wpointer-arith
+- #QMAKE_CXXFLAGS *= -Wconversion
+- #QMAKE_CXXFLAGS *= -Wsign-compare
+- #QMAKE_CXXFLAGS *= -Wsign-conversion
+- #QMAKE_CXXFLAGS *= -Wlogical-op
+- #QMAKE_CXXFLAGS *= -Werror=format-security
+- #QMAKE_CXXFLAGS *= -std=c++11
+-
+- # when using the gold linker ( Qt < 4.8 ) - might be
+- # necessary on non linux systems too
+- #QMAKE_LFLAGS += -lrt
+-}
+
+ ######################################################################
+ # paths for building qwt
Added: trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.61.diff
===================================================================
--- trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.61.diff (rev 0)
+++ trunk/dports/graphics/qwt/files/patch-qwtconfig.pri.61.diff 2016-01-21 15:57:30 UTC (rev 144931)
@@ -0,0 +1,68 @@
+--- qwtconfig.pri.orig 2015-11-24 16:17:25.000000000 +0100
++++ qwtconfig.pri 2015-11-24 16:22:51.000000000 +0100
+@@ -16,20 +16,10 @@
+ # Install paths
+ ######################################################################
+
+-QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
++QWT_INSTALL_PREFIX = $$INSTALLBASE
+
+-unix {
+- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION
+- # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
+-}
+-
+-win32 {
+- QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION
+- # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION
+-}
+-
+-QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc
+-QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include
++QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/share/qwt/doc
++QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qwt
+ QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
+
+ ######################################################################
+@@ -42,7 +32,7 @@
+ # runtime environment of designer/creator.
+ ######################################################################
+
+-QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
++QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PLUGINS]/designer
+
+ # linux distributors often organize the Qt installation
+ # their way and QT_INSTALL_PREFIX doesn't offer a good
+@@ -63,8 +53,7 @@
+ # with every Qt upgrade.
+ ######################################################################
+
+-QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
+-# QWT_INSTALL_FEATURES = $$[QT_INSTALL_PREFIX]/features
++QWT_INSTALL_FEATURES = $$[QT_INSTALL_DATA]/mkspecs/features
+
+ ######################################################################
+ # Build the static/shared libraries.
+@@ -110,7 +99,7 @@
+ # to your qmake project file.
+ ######################################################################
+
+-#QWT_CONFIG += QwtMathML
++QWT_CONFIG += QwtMathML
+
+ ######################################################################
+ # If you want to build the Qwt designer plugin,
+@@ -161,8 +150,11 @@
+
+ macx:!static:CONFIG(qt_framework, qt_framework|qt_no_framework) {
+
+- QWT_CONFIG += QwtFramework
+-}
++ QWT_CONFIG += QwtFramework
++ QWT_INSTALL_LIBS = $$[QT_INSTALL_FRAMEWORKS]
++} else {
++ QWT_INSTALL_LIBS = $$[QT_INSTALL_LIBS]
++}
+
+ ######################################################################
+ # Create and install pc files for pkg-config
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160121/4655dc7a/attachment.html>
More information about the macports-changes
mailing list