From c34f78dd37c2a2015d43de5d89748a2f8147ba1b Mon Sep 17 00:00:00 2001 From: root Date: Tue, 31 Jan 2012 23:14:57 +0000 Subject: Tue Jan 31 23:14:56 UTC 2012 --- extra/amarok/PKGBUILD | 13 ++++++--- extra/amarok/toolbarfix.patch | 61 ++++++++++++++++++++++++++++++++++++++++++ extra/cfitsio/PKGBUILD | 24 +++++++++++------ extra/cifs-utils/PKGBUILD | 7 +++-- extra/kdebase-konsole/PKGBUILD | 6 ++--- extra/libgadu/PKGBUILD | 6 ++--- extra/proftpd/PKGBUILD | 4 +-- extra/samba/PKGBUILD | 8 +++--- extra/virtuoso/PKGBUILD | 10 +++++-- 9 files changed, 109 insertions(+), 30 deletions(-) create mode 100644 extra/amarok/toolbarfix.patch (limited to 'extra') diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index d8f0ce047..4d2825177 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145092 2011-12-16 20:04:34Z ronald $ +# $Id: PKGBUILD 148378 2012-01-30 21:38:30Z ronald $ # Maintainer: Ronald van Haren # Contributor: Andrea Scarpino # Contributor: damir @@ -6,7 +6,7 @@ pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64") url="http://amarok.kde.org" @@ -21,11 +21,16 @@ optdepends=("libgpod: support for Apple iPod audio devices" "ifuse: support for Apple iPod Touch and iPhone" "libmygpo-qt: gpodder.net Internet Service") install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + "toolbarfix.patch") +sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2' + 'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f') build() { cd "${srcdir}" + + patch -Np0 -i "${srcdir}"/toolbarfix.patch + mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/amarok/toolbarfix.patch b/extra/amarok/toolbarfix.patch new file mode 100644 index 000000000..ec012ca74 --- /dev/null +++ b/extra/amarok/toolbarfix.patch @@ -0,0 +1,61 @@ +diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp +--- amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp 2011-12-15 08:36:48.000000000 +0100 ++++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp 2012-01-29 20:20:01.901360205 +0100 +@@ -108,6 +108,17 @@ Context::AppletToolbar::appletRemoved( P + } + } + ++void Context::AppletToolbar::setContainment( Containment * containment ) ++{ ++ m_cont = containment; ++} ++ ++Context::Containment * ++Context::AppletToolbar::containment() const ++{ ++ return m_cont; ++} ++ + QSizeF + Context::AppletToolbar::sizeHint( Qt::SizeHint which, const QSizeF &constraint ) const + { +Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.orig +Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.rej +diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.h amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h +--- amarok-2.5.0/src/context/toolbar/AppletToolbar.h 2011-12-15 08:36:48.000000000 +0100 ++++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h 2012-01-29 20:17:52.414686784 +0100 +@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWi + + void appletRemoved( Plasma::Applet* applet ); + ++ void setContainment( Containment * containment ); ++ Containment* containment() const; ++ + signals: + void showApplet( Plasma::Applet* ); + void appletAddedToToolbar( Plasma::Applet* applet, int loc ); +Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.h.orig +diff -rup amarok-2.5.0/src/context/ToolbarView.cpp amarok-2.5.0.new/src/context/ToolbarView.cpp +--- amarok-2.5.0/src/context/ToolbarView.cpp 2011-12-15 08:36:48.000000000 +0100 ++++ amarok-2.5.0.new/src/context/ToolbarView.cpp 2012-01-29 20:17:52.394686782 +0100 +@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasm + setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); + + // now we create the toolbar +- m_toolbar = new AppletToolbar( containment ); ++ m_toolbar = new AppletToolbar(0); ++ scene->addItem(m_toolbar.data()); ++ m_toolbar.data()->setContainment( qobject_cast(containment) ); + m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 ); + m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 ); + +@@ -96,7 +98,7 @@ Context::ToolbarView::ToolbarView( Plasm + + Context::ToolbarView::~ToolbarView() + { +- ++ delete m_toolbar.data(); + } + + void +Only in amarok-2.5.0.new/src/context: ToolbarView.cpp.orig diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD index 554c12923..d84626440 100644 --- a/extra/cfitsio/PKGBUILD +++ b/extra/cfitsio/PKGBUILD @@ -1,28 +1,36 @@ -# $Id: PKGBUILD 127670 2011-06-17 17:20:53Z andrea $ +# $Id: PKGBUILD 148037 2012-01-30 10:37:49Z eric $ # Maintainer: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=cfitsio -pkgver=3.280 -_pkgver=3280 +pkgver=3.290 pkgrel=1 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format" arch=('i686' 'x86_64') url="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html" -license=('GPL2') +license=('custom') depends=('glibc') -makedepends=('pkgconfig') options=('!libtool') -source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${_pkgver}.tar.gz") -md5sums=('fdb9c0f51678b47e78592c70fb5dc793') +source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz") +md5sums=('bba93808486cf5edac236a941283b3c3') build() { cd "${srcdir}"/${pkgname} + export CFLAGS="$CFLAGS -lm" ./configure --prefix=/usr - make shared + make shared +} + +check() { + cd "${srcdir}"/${pkgname} + make testprog + LD_LIBRARY_PATH=. ./testprog > testprog.lis + [[ -z $(diff testprog.lis testprog.out) ]] || return 1 + [[ -z $(cmp testprog.fit testprog.std) ]] || return 1 } package() { cd "${srcdir}"/${pkgname} make DESTDIR="${pkgdir}" install + install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt" } diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD index e04077a1b..279bf9f78 100644 --- a/extra/cifs-utils/PKGBUILD +++ b/extra/cifs-utils/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 146919 2012-01-19 07:41:51Z tpowa $ +# $Id: PKGBUILD 148030 2012-01-30 07:42:40Z tpowa $ # Maintainer: Tobias Powalowski pkgname=cifs-utils -pkgver=5.2 +pkgver=5.3 pkgrel=1 pkgdesc="CIFS filesystem user-space tools" arch=(i686 x86_64) @@ -20,8 +20,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - rm -r $pkgdir/usr/bin # set mount.cifs uid, to enable none root mounting form fstab chmod +s $pkgdir/sbin/mount.cifs } -md5sums=('2ca839553cccd0c3042f7dd8737cc9de') +md5sums=('e1a428558a96d2d28ccdaacdc47ea0b7') diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index fd33da488..1479303b3 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 147820 2012-01-28 10:33:47Z andrea $ +# $Id: PKGBUILD 148039 2012-01-30 11:43:20Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebase-konsole pkgver=4.8.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://kde.org/applications/system/konsole/' pkgdesc="Terminal" license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') -depends=('kdebase-runtime') +depends=('kdebase-runtime' 'kdebase-lib') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.bz2") sha1sums=('f99abc20fd0042be62e48308f334b66a6a3135d7') diff --git a/extra/libgadu/PKGBUILD b/extra/libgadu/PKGBUILD index eb86b103d..23d872f0e 100644 --- a/extra/libgadu/PKGBUILD +++ b/extra/libgadu/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 125846 2011-05-30 12:25:37Z andrea $ +# $Id: PKGBUILD 148371 2012-01-30 19:05:43Z eric $ # Maintainer: Andrea Scarpino # Contributor: Mateusz Herych pkgname=libgadu -pkgver=1.11.0 +pkgver=1.11.1 pkgrel=1 pkgdesc="This library implements the client side of the Gadu-Gadu protocol" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('openssl') options=('!libtool') source=("http://toxygen.net/${pkgname}/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('c779891298ce5d081c1e871e1e5b256d') +md5sums=('01016ad3b0ea955b61ef4badf2bd48bf') build() { cd "${srcdir}"/${pkgname}-${pkgver} diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD index 86d1bce67..60bfc1842 100644 --- a/extra/proftpd/PKGBUILD +++ b/extra/proftpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146388 2012-01-10 00:35:24Z eric $ +# $Id: PKGBUILD 148035 2012-01-30 08:08:56Z eric $ # Maintainer: # Contributor: Daniel J Griffiths pkgname=proftpd pkgver=1.3.4a -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc="A high-performance, scalable FTP server" arch=('i686' 'x86_64') diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index a50f2b475..c5abd161c 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 147668 2012-01-26 08:10:51Z tpowa $ +# $Id: PKGBUILD 148032 2012-01-30 07:48:01Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: judd pkgbase=samba pkgname=('smbclient' 'samba') -pkgver=3.6.2 +pkgver=3.6.3 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=3.6.2 +_realver=3.6.3 pkgrel=1 arch=(i686 x86_64) url="http://www.samba.org" @@ -136,7 +136,7 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('bd2bb63b1c90161b88262f813bd1ce8b' +md5sums=('98ac9db9f4b6ebfc3f013aa193ffb0d1' 'a3da19515a234c703876cf850c44e996' '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD index 6d79cde5f..fb34b6640 100644 --- a/extra/virtuoso/PKGBUILD +++ b/extra/virtuoso/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142435 2011-11-09 18:50:28Z andrea $ +# $Id: PKGBUILD 148047 2012-01-30 18:21:09Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Massimiliano Torromeo pkgname=virtuoso pkgver=6.1.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality' url='http://virtuoso.openlinksw.com/wiki/main/Main/' @@ -35,4 +35,10 @@ package() { # install driver cd ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/driver make DESTDIR=${pkgdir} install + + # Install some useful tools; rename to avoid conflicts + for bin in isql isqlw; do + install -Dm755 ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/tests/$bin \ + ${pkgdir}/usr/bin/$bin-vt + done } -- cgit v1.2.3-54-g00ecf