[arch-commits] Commit in qwt/repos (6 files)

Levente Polyak anthraxx at archlinux.org
Tue Jul 4 20:41:31 UTC 2017


    Date: Tuesday, July 4, 2017 @ 20:41:27
  Author: anthraxx
Revision: 299680

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  qwt/repos/extra-i686/PKGBUILD
    (from rev 299679, qwt/trunk/PKGBUILD)
  qwt/repos/extra-x86_64/PKGBUILD
    (from rev 299679, qwt/trunk/PKGBUILD)
Deleted:
  qwt/repos/extra-i686/PKGBUILD
  qwt/repos/extra-i686/qwtconfig-archlinux.pri
  qwt/repos/extra-x86_64/PKGBUILD
  qwt/repos/extra-x86_64/qwtconfig-archlinux.pri

--------------------------------------+
 /PKGBUILD                            |   92 +++++++++++++++++++++++++
 extra-i686/PKGBUILD                  |   49 -------------
 extra-i686/qwtconfig-archlinux.pri   |  118 ---------------------------------
 extra-x86_64/PKGBUILD                |   49 -------------
 extra-x86_64/qwtconfig-archlinux.pri |  118 ---------------------------------
 5 files changed, 92 insertions(+), 334 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-07-04 20:41:02 UTC (rev 299679)
+++ extra-i686/PKGBUILD	2017-07-04 20:41:27 UTC (rev 299680)
@@ -1,49 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=qwt
-pkgver=6.1.3
-pkgrel=2
-pkgdesc='Qt Widgets for Technical Applications'
-url='http://qwt.sourceforge.net/'
-arch=('i686' 'x86_64')
-depends=('qt5-base' 'qt5-svg' 'qt5-tools')
-license=("custom:${pkgname}")
-source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        qwtconfig-archlinux.pri)
-sha512sums=('d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a'
-            '28f99798d8ce92c39b817435bdc7210962a7ae4a8291c294e356ade9378d637e17a316ee702fafcbf453017f47b6fa87b66ada7ac7741ff9b11ca040d79de0fd')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  # copy our config file to the right place
-  cp "${srcdir}/qwtconfig-archlinux.pri" qwtconfig.pri
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  qmake-qt5 qwt.pro
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make INSTALL_ROOT="${pkgdir}" install
-
-  # install web designer plugin
-  install -Dm 755 designer/plugins/designer/libqwt_designer_plugin.so \
-    -t "${pkgdir}/usr/lib/qt5/plugins/designer"
-
-  # needed by qmake (FS#30407)
-  install -Dm 644 qwtconfig.pri qwt.prf qwtfunctions.pri \
-    -t "${pkgdir}/usr/share/qt5/mkspecs/features"
-
-  # move man pages
-  mv "${pkgdir}/usr/share/doc/qwt/man" "${pkgdir}/usr/share"
-
-  # install licence
-  install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-# vim: ts=2 sw=2 et:

Copied: qwt/repos/extra-i686/PKGBUILD (from rev 299679, qwt/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-07-04 20:41:27 UTC (rev 299680)
@@ -0,0 +1,46 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=qwt
+pkgver=6.1.3
+pkgrel=3
+pkgdesc='Qt Widgets for Technical Applications'
+url='http://qwt.sourceforge.net/'
+arch=('i686' 'x86_64')
+depends=('qt5-base' 'qt5-svg')
+optdepends=('qt5-tools: For Designer plugin')
+makedepends=('qt5-tools')
+license=("custom:${pkgname}")
+source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+sha512sums=('d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  sed -e '/^\s*QWT_INSTALL_PREFIX/ s|=.*|= /usr|' \
+      -e '/^QWT_INSTALL_DOCS/ s|/doc|/share/doc/qwt|' \
+      -e '/^QWT_INSTALL_HEADERS/ s|include|&/qwt|' \
+      -e '/^QWT_INSTALL_PLUGINS/ s|plugins/designer|lib/qt/&|' \
+      -e '/^QWT_INSTALL_FEATURES/ s|features|lib/qt/mkspecs/&|' \
+      -i qwtconfig.pri
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  qmake-qt5 qwt.pro
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # move man pages
+  mv "${pkgdir}/usr/share/doc/qwt/man" "${pkgdir}/usr/share"
+
+  # install licence
+  install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+# vim: ts=2 sw=2 et:

Deleted: extra-i686/qwtconfig-archlinux.pri
===================================================================
--- extra-i686/qwtconfig-archlinux.pri	2017-07-04 20:41:02 UTC (rev 299679)
+++ extra-i686/qwtconfig-archlinux.pri	2017-07-04 20:41:27 UTC (rev 299680)
@@ -1,118 +0,0 @@
-################################################################
-# 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      = 3
-QWT_VERSION      = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${QWT_VER_PAT}
-
-######################################################################
-# Install paths
-######################################################################
-
-QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
-
-unix {
-    QWT_INSTALL_PREFIX    = /usr
-}
-
-win32 {
-    QWT_INSTALL_PREFIX    = C:/Qwt
-}
-
-QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/share/doc/qwt
-QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include/qwt
-QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
-
-######################################################################
-# Designer plugin
-######################################################################
-
-#QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_PREFIX}/plugins/designer
-# QWT_INSTALL_PLUGINS   = $${QT_INSTALL_PREFIX}/plugins/designer
-
-######################################################################
-# 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. 
-######################################################################
-
-#QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
-# QWT_INSTALL_FEATURES  = $${QT_INSTALL_PREFIX}/features
-
-######################################################################
-# Build the static/shared libraries.
-# If QwtDll is enabled, a shared library is built, otherwise
-# it will be a static library.
-######################################################################
-
-QWT_CONFIG           += QwtDll
-
-######################################################################
-# QwtPlot enables all classes, that are needed to use the QwtPlot 
-# widget. 
-######################################################################
-
-QWT_CONFIG       += QwtPlot
-
-######################################################################
-# QwtWidgets enables all classes, that are needed to use the all other
-# widgets (sliders, dials, ...), beside QwtPlot. 
-######################################################################
-
-QWT_CONFIG     += QwtWidgets
-
-######################################################################
-# If you want to display svg images on the plot canvas, or
-# export a plot to a SVG document
-######################################################################
-
-QWT_CONFIG     += QwtSvg
-
-######################################################################
-# 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.
-######################################################################
-
-#QWT_CONFIG     += QwtMathML
-
-######################################################################
-# If you want to build the Qwt designer plugin, 
-# enable the line below.
-# Otherwise you have to build it from the designer directory.
-######################################################################
-
-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.
-######################################################################
-
-#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
-}  

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-07-04 20:41:02 UTC (rev 299679)
+++ extra-x86_64/PKGBUILD	2017-07-04 20:41:27 UTC (rev 299680)
@@ -1,49 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=qwt
-pkgver=6.1.3
-pkgrel=2
-pkgdesc='Qt Widgets for Technical Applications'
-url='http://qwt.sourceforge.net/'
-arch=('i686' 'x86_64')
-depends=('qt5-base' 'qt5-svg' 'qt5-tools')
-license=("custom:${pkgname}")
-source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        qwtconfig-archlinux.pri)
-sha512sums=('d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a'
-            '28f99798d8ce92c39b817435bdc7210962a7ae4a8291c294e356ade9378d637e17a316ee702fafcbf453017f47b6fa87b66ada7ac7741ff9b11ca040d79de0fd')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  # copy our config file to the right place
-  cp "${srcdir}/qwtconfig-archlinux.pri" qwtconfig.pri
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  qmake-qt5 qwt.pro
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make INSTALL_ROOT="${pkgdir}" install
-
-  # install web designer plugin
-  install -Dm 755 designer/plugins/designer/libqwt_designer_plugin.so \
-    -t "${pkgdir}/usr/lib/qt5/plugins/designer"
-
-  # needed by qmake (FS#30407)
-  install -Dm 644 qwtconfig.pri qwt.prf qwtfunctions.pri \
-    -t "${pkgdir}/usr/share/qt5/mkspecs/features"
-
-  # move man pages
-  mv "${pkgdir}/usr/share/doc/qwt/man" "${pkgdir}/usr/share"
-
-  # install licence
-  install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-# vim: ts=2 sw=2 et:

Copied: qwt/repos/extra-x86_64/PKGBUILD (from rev 299679, qwt/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-07-04 20:41:27 UTC (rev 299680)
@@ -0,0 +1,46 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=qwt
+pkgver=6.1.3
+pkgrel=3
+pkgdesc='Qt Widgets for Technical Applications'
+url='http://qwt.sourceforge.net/'
+arch=('i686' 'x86_64')
+depends=('qt5-base' 'qt5-svg')
+optdepends=('qt5-tools: For Designer plugin')
+makedepends=('qt5-tools')
+license=("custom:${pkgname}")
+source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+sha512sums=('d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  sed -e '/^\s*QWT_INSTALL_PREFIX/ s|=.*|= /usr|' \
+      -e '/^QWT_INSTALL_DOCS/ s|/doc|/share/doc/qwt|' \
+      -e '/^QWT_INSTALL_HEADERS/ s|include|&/qwt|' \
+      -e '/^QWT_INSTALL_PLUGINS/ s|plugins/designer|lib/qt/&|' \
+      -e '/^QWT_INSTALL_FEATURES/ s|features|lib/qt/mkspecs/&|' \
+      -i qwtconfig.pri
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  qmake-qt5 qwt.pro
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # move man pages
+  mv "${pkgdir}/usr/share/doc/qwt/man" "${pkgdir}/usr/share"
+
+  # install licence
+  install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+# vim: ts=2 sw=2 et:

Deleted: extra-x86_64/qwtconfig-archlinux.pri
===================================================================
--- extra-x86_64/qwtconfig-archlinux.pri	2017-07-04 20:41:02 UTC (rev 299679)
+++ extra-x86_64/qwtconfig-archlinux.pri	2017-07-04 20:41:27 UTC (rev 299680)
@@ -1,118 +0,0 @@
-################################################################
-# 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      = 3
-QWT_VERSION      = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${QWT_VER_PAT}
-
-######################################################################
-# Install paths
-######################################################################
-
-QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
-
-unix {
-    QWT_INSTALL_PREFIX    = /usr
-}
-
-win32 {
-    QWT_INSTALL_PREFIX    = C:/Qwt
-}
-
-QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/share/doc/qwt
-QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include/qwt
-QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
-
-######################################################################
-# Designer plugin
-######################################################################
-
-#QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_PREFIX}/plugins/designer
-# QWT_INSTALL_PLUGINS   = $${QT_INSTALL_PREFIX}/plugins/designer
-
-######################################################################
-# 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. 
-######################################################################
-
-#QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
-# QWT_INSTALL_FEATURES  = $${QT_INSTALL_PREFIX}/features
-
-######################################################################
-# Build the static/shared libraries.
-# If QwtDll is enabled, a shared library is built, otherwise
-# it will be a static library.
-######################################################################
-
-QWT_CONFIG           += QwtDll
-
-######################################################################
-# QwtPlot enables all classes, that are needed to use the QwtPlot 
-# widget. 
-######################################################################
-
-QWT_CONFIG       += QwtPlot
-
-######################################################################
-# QwtWidgets enables all classes, that are needed to use the all other
-# widgets (sliders, dials, ...), beside QwtPlot. 
-######################################################################
-
-QWT_CONFIG     += QwtWidgets
-
-######################################################################
-# If you want to display svg images on the plot canvas, or
-# export a plot to a SVG document
-######################################################################
-
-QWT_CONFIG     += QwtSvg
-
-######################################################################
-# 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.
-######################################################################
-
-#QWT_CONFIG     += QwtMathML
-
-######################################################################
-# If you want to build the Qwt designer plugin, 
-# enable the line below.
-# Otherwise you have to build it from the designer directory.
-######################################################################
-
-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.
-######################################################################
-
-#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