From 43983783a3e8bf61896eb93a2858a14bbaf3a53b Mon Sep 17 00:00:00 2001 From: root Date: Sun, 24 Jul 2011 23:18:01 +0000 Subject: Sun Jul 24 23:18:00 UTC 2011 --- extra/kdeplasma-addons/PKGBUILD | 14 +++- extra/kdeplasma-addons/kdeobservatory-qwt6.patch | 12 +++ extra/kipi-plugins/PKGBUILD | 6 +- extra/live-media/PKGBUILD | 6 +- extra/qwt/PKGBUILD | 20 ++--- extra/qwt/qwtconfig-archlinux.pri | 95 ++++++++++++++++-------- extra/r/PKGBUILD | 31 ++++---- extra/r/r.install | 12 +++ 8 files changed, 132 insertions(+), 64 deletions(-) create mode 100644 extra/kdeplasma-addons/kdeobservatory-qwt6.patch create mode 100644 extra/r/r.install (limited to 'extra') diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index 749887ce4..a100ad0a1 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130264 2011-07-04 19:28:03Z andrea $ +# $Id: PKGBUILD 131799 2011-07-15 11:47:07Z ronald $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -73,18 +73,24 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') pkgver=4.6.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL') groups=('kde' 'kdeplasma-addons') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdegraphics-libs' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('3bce5e41160ec318dbea9128c3e9104a4428deb8') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + "kdeobservatory-qwt6.patch") +sha1sums=('3bce5e41160ec318dbea9128c3e9104a4428deb8' + '140b2611fb23aed583c2691a77870e5c48152409') build() { cd ${srcdir} + + # qwt 6.0.0 patch + patch -Np0 -i ${srcdir}/kdeobservatory-qwt6.patch + mkdir build cd build cmake ../${pkgbase}-${pkgver} \ diff --git a/extra/kdeplasma-addons/kdeobservatory-qwt6.patch b/extra/kdeplasma-addons/kdeobservatory-qwt6.patch new file mode 100644 index 000000000..46ba0345d --- /dev/null +++ b/extra/kdeplasma-addons/kdeobservatory-qwt6.patch @@ -0,0 +1,12 @@ +diff -Naur kdeplasma-addons-4.6.5.bak/applets/kdeobservatory/src/commithistoryview.cpp kdeplasma-addons-4.6.5/applets/kdeobservatory/src/commithistoryview.cpp +--- kdeplasma-addons-4.6.5.bak/applets/kdeobservatory/src/commithistoryview.cpp 2011-07-15 14:04:17.323188525 +0200 ++++ kdeplasma-addons-4.6.5/applets/kdeobservatory/src/commithistoryview.cpp 2011-07-15 14:04:39.186521458 +0200 +@@ -124,7 +124,7 @@ + plot->setCanvasBackground(QColor(0, 0, 140)); + + QwtPlotCurve *curve = new QwtPlotCurve; +- curve->setData(x, y, j); ++ curve->setSamples(x, y, j); + delete []x; + delete []y; + diff --git a/extra/kipi-plugins/PKGBUILD b/extra/kipi-plugins/PKGBUILD index 1a707bb6a..6794902ad 100644 --- a/extra/kipi-plugins/PKGBUILD +++ b/extra/kipi-plugins/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 112839 2011-03-07 07:34:56Z tpowa $ +# $Id: PKGBUILD 132346 2011-07-23 09:53:11Z andrea $ # Maintainer: Tobias Powalowski pkgname=kipi-plugins pkgver=1.9.0 -pkgrel=1 -pkgdesc="libkipi plugins for digikam and kde apps" +pkgrel=2 +pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam" arch=('i686' 'x86_64') license=('GPL') url="http://www.kipi-plugins.org" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 1766ef232..9593435ea 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 131676 2011-07-13 14:16:16Z giovanni $ +# $Id: PKGBUILD 132361 2011-07-23 15:00:18Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Gilles CHAUVIN pkgname=live-media -pkgver=2011.07.08 +pkgver=2011.07.21 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('527ebb1061ed1c2b439b02bd26e52440') +md5sums=('9377b34ad465950d423bac5f6f1e5307') build() { cd ${srcdir}/live diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD index daac13765..913a21ba7 100644 --- a/extra/qwt/PKGBUILD +++ b/extra/qwt/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 94465 2010-10-07 10:54:24Z ronald $ +# $Id: PKGBUILD 131712 2011-07-13 18:32:34Z ronald $ # Maintainer: Ronald van Haren 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() { # build qwt: qmake qwt.pro - make || return 1 + make } package() { @@ -32,10 +32,10 @@ package() { 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 diff --git a/extra/qwt/qwtconfig-archlinux.pri b/extra/qwt/qwtconfig-archlinux.pri index 646a2b759..520e32d4b 100644 --- a/extra/qwt/qwtconfig-archlinux.pri +++ b/extra/qwt/qwtconfig-archlinux.pri @@ -1,34 +1,56 @@ +################################################################ +# 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 ###################################################################### +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 ###################################################################### # Build the static/shared libraries. @@ -36,50 +58,61 @@ CONFIG += release # release/debug # 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 +} diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index 7ef4e0b0e..e6b7af9dc 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,42 +1,39 @@ -# $Id: PKGBUILD 122820 2011-05-06 10:48:44Z ronald $ +# $Id: PKGBUILD 132100 2011-07-20 07:19:13Z ronald $ # Maintainer: Ronald van Haren # Contributor: Damir Perisa # Contributor: K. Piche pkgname=r -pkgver=2.13.0 +pkgver=2.13.1 pkgrel=1 -pkgdesc="R is a language and environment for statistical computing and graphics" +pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64') license=('GPL') url=('http://www.r-project.org/') depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs' - 'tk' 'libxt' 'libxmu' 'pango') + 'tk' 'libxt' 'libxmu' 'pango' 'xz') makedepends=('openjdk6' 'gcc-fortran') +backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories') options=('!makeflags') source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz" 'r.desktop' 'r.png') -sha1sums=('878510e8a5fa1ccd1e0c4af5866f5416f3c27469' +install=r.install +sha1sums=('8b9d48c7a654186064f369652ea34a085eff239b' '13aa29219bcaa102e575de8c1c8e0833d233e836' 'a69a07ec363440efc18ce0a7f2af103375dea978') - build() { cd ${srcdir}/R-${pkgver} sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c ./configure --prefix=/usr \ --libdir=/usr/lib \ + --sysconfdir=/etc/R \ --datarootdir=/usr/share \ rsharedir=/usr/share/R/ \ rincludedir=/usr/include/R/ \ - rdocdir=/usr/share/R/docs/ \ - --with-gnu-ld \ - --with-readline \ + rdocdir=/usr/share/doc/R/ \ --with-x \ - --with-zlib \ - --with-bzlib \ - --with-pcre \ --enable-R-shlib \ --with-lapack \ --with-blas \ @@ -60,4 +57,12 @@ package() { ${pkgdir}/usr/share/applications/r.desktop install -Dm644 ${srcdir}/r.png \ ${pkgdir}/usr/share/pixmaps/r.png - } + + # move the config directory to /etc and create symlinks + install -d ${pkgdir}/etc/R + cd ${pkgdir}/usr/lib/R/etc + for i in *; do + mv -f ${i} ${pkgdir}/etc/R + ln -s /etc/R/${i} ${i} + done +} diff --git a/extra/r/r.install b/extra/r/r.install new file mode 100644 index 000000000..d3289ab64 --- /dev/null +++ b/extra/r/r.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + -- cgit v1.2.3-54-g00ecf