[arch-commits] Commit in qwt/trunk (PKGBUILD qwtconfig-archlinux.pri)
Ronald van Haren
ronald at archlinux.org
Wed Jul 13 18:32:35 UTC 2011
Date: Wednesday, July 13, 2011 @ 14:32:34
Author: ronald
Revision: 131712
upgpkg: qwt 6.0.0-1
update to 6.0.0
Modified:
qwt/trunk/PKGBUILD
qwt/trunk/qwtconfig-archlinux.pri
-------------------------+
PKGBUILD | 18 ++++----
qwtconfig-archlinux.pri | 95 ++++++++++++++++++++++++++++++----------------
2 files changed, 73 insertions(+), 40 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-07-13 17:29:07 UTC (rev 131711)
+++ PKGBUILD 2011-07-13 18:32:34 UTC (rev 131712)
@@ -2,18 +2,18 @@
# Maintainer: Ronald van Haren <ronald.archlinux.org>
pkgname=qwt
-pkgver=5.2.1
+pkgver=6.0.0
pkgrel=1
pkgdesc="Qt Widgets for Technical Applications"
arch=('i686' 'x86_64')
url="http://qwt.sourceforge.net/"
-depends=('qt>=4.5.1')
+depends=('qt')
options=('!makeflags')
license=("custom:$pkgname")
source=("http://downloads.sourceforge.net/sourceforge/qwt/$pkgname-$pkgver.tar.bz2" \
"qwtconfig-archlinux.pri")
-md5sums=('4a595b8db0ec3856b117836c1d60cb27'
- '2cb9135ec875d6de0214fcb032f184a3')
+sha1sums=('306957fc06c90f2049aec57e13a971f54c3cb21a'
+ 'aba0fc75f6d450237028b7b143bdcf05a79cabb3')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -24,7 +24,7 @@
# build qwt:
qmake qwt.pro
- make || return 1
+ make
}
package() {
@@ -32,10 +32,10 @@
make INSTALL_ROOT=${pkgdir} QTDIR=/usr install
- # fix doc files
- install -d ${pkgdir}/usr/share/doc/${pkgname}
- mv -f ${pkgdir}/usr/share/html/* ${pkgdir}/usr/share/doc/${pkgname}
-
+ # Move man files to proper directory.
+ install -d ${pkgdir}/usr/share/man/man3
+ mv -f ${pkgdir}/usr/share/doc/qwt/man/man3/* ${pkgdir}/usr/share/man/man3
+
# install licence
install -Dm644 ${srcdir}/${pkgname}-${pkgver}/COPYING \
${pkgdir}/usr/share/licenses/${pkgname}/license.txt
Modified: qwtconfig-archlinux.pri
===================================================================
--- qwtconfig-archlinux.pri 2011-07-13 17:29:07 UTC (rev 131711)
+++ qwtconfig-archlinux.pri 2011-07-13 18:32:34 UTC (rev 131712)
@@ -1,3 +1,17 @@
+################################################################
+# Qwt Widget Library
+# Copyright (C) 1997 Josef Wilgen
+# Copyright (C) 2002 Uwe Rathmann
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the Qwt License, Version 1.0
+################################################################
+
+QWT_VER_MAJ = 6
+QWT_VER_MIN = 1
+QWT_VER_PAT = 0
+QWT_VERSION = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${QWT_VER_PAT}
+
######################################################################
# Install paths
######################################################################
@@ -2,29 +16,37 @@
+QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
+
unix {
- INSTALLBASE = /usr
+ QWT_INSTALL_PREFIX = /usr
}
win32 {
- INSTALLBASE = C:/Qwt
+ QWT_INSTALL_PREFIX = C:/Qwt
}
-target.path = $$INSTALLBASE/lib
-headers.path = $$INSTALLBASE/include/qwt
-doc.path = $$INSTALLBASE/share
+QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/share/doc/qwt
+QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qwt
+QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib
######################################################################
-# qmake internal options
+# Designer plugin
######################################################################
-CONFIG += qt # Also for Qtopia Core!
-CONFIG += warn_on
-CONFIG += thread
+#QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
+# QWT_INSTALL_PLUGINS = $${QT_INSTALL_PREFIX}/plugins/designer
######################################################################
-# release/debug mode
-# The designer plugin is always built in release mode.
-# If want to change this, you have to edit designer/designer.pro.
+# Features
+# When building a Qwt application with qmake you might want to load
+# the compiler/linker flags, that are required to build a Qwt application
+# from qwt.prf. Therefore all you need to do is to add "CONFIG += qwt"
+# to your project file and take care, that qwt.prf can be found by qmake.
+# ( see http://doc.trolltech.com/4.7/qmake-advanced-usage.html#adding-new-configuration-features )
+# I recommend not to install the Qwt features together with the
+# Qt features, because you will have to reinstall the Qwt features,
+# with every Qt upgrade.
######################################################################
-CONFIG += release # release/debug
+#QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features
+# QWT_INSTALL_FEATURES = $${QT_INSTALL_PREFIX}/features
@@ -36,50 +58,61 @@
# it will be a static library.
######################################################################
-CONFIG += QwtDll
+QWT_CONFIG += QwtDll
######################################################################
-# QwtPlot enables all classes, that are needed to use the QwtPlot
-# widget.
+# QwtPlot enables all classes, that are needed to use the QwtPlot
+# widget.
######################################################################
-CONFIG += QwtPlot
+QWT_CONFIG += QwtPlot
######################################################################
# QwtWidgets enables all classes, that are needed to use the all other
-# widgets (sliders, dials, ...), beside QwtPlot.
+# widgets (sliders, dials, ...), beside QwtPlot.
######################################################################
-CONFIG += QwtWidgets
+QWT_CONFIG += QwtWidgets
######################################################################
-# If you want to display svg images on the plot canvas, enable the
-# line below. Note that Qwt needs the svg+xml, when enabling
-# QwtSVGItem.
+# If you want to display svg images on the plot canvas, or
+# export a plot to a SVG document
######################################################################
-CONFIG += QwtSVGItem
+QWT_CONFIG += QwtSvg
######################################################################
-# If you have a commercial license you can use the MathML renderer
-# of the Qt solutions package to enable MathML support in Qwt.
-# So if you want this, copy qtmmlwidget.h + qtmmlwidget.cpp to
-# textengines/mathml and enable the line below.
+# You can use the MathML renderer of the Qt solutions package to
+# enable MathML support in Qwt. Because of license implications
+# the ( modified ) code of the MML Widget solution is included and
+# linked together with the QwtMathMLTextEngine into an own library.
+# To use it you will have to add "CONFIG += qwtmathml"
+# to your qmake project file.
######################################################################
-#CONFIG += QwtMathML
+#QWT_CONFIG += QwtMathML
######################################################################
-# If you want to build the Qwt designer plugin,
+# If you want to build the Qwt designer plugin,
# enable the line below.
# Otherwise you have to build it from the designer directory.
######################################################################
-CONFIG += QwtDesigner
+QWT_CONFIG += QwtDesigner
######################################################################
# If you want to auto build the examples, enable the line below
# Otherwise you have to build them from the examples directory.
######################################################################
-#CONFIG += QwtExamples
+#QWT_CONFIG += QwtExamples
+
+######################################################################
+# When Qt has been built as framework qmake ( qtAddLibrary ) wants
+# to link frameworks instead of regular libs
+######################################################################
+
+macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
+
+ QWT_CONFIG += QwtFramework
+}
More information about the arch-commits
mailing list