diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/amarok/PKGBUILD | 17 | ||||
| -rw-r--r-- | extra/amarok/amarok-2.5.0-ffmpeg-fixes.patch | 19 | ||||
| -rw-r--r-- | extra/amarok/contextviewfix.patch | 14 | ||||
| -rw-r--r-- | extra/calligra/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/claws-mail-extra-plugins/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/claws-mail/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/gcin/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/qt/PKGBUILD | 17 | ||||
| -rw-r--r-- | extra/qt/fix-assistant-crash.patch | 12 | ||||
| -rw-r--r-- | extra/raptor/PKGBUILD | 8 |
10 files changed, 99 insertions, 41 deletions
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 4d2825177..6a0c3169f 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 148378 2012-01-30 21:38:30Z ronald $ +# $Id: PKGBUILD 162671 2012-06-27 20:00:58Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -6,7 +6,7 @@ pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.5.0 -pkgrel=2 +pkgrel=4 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64") url="http://amarok.kde.org" @@ -22,14 +22,23 @@ optdepends=("libgpod: support for Apple iPod audio devices" "libmygpo-qt: gpodder.net Internet Service") install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - "toolbarfix.patch") + "toolbarfix.patch" + "amarok-2.5.0-ffmpeg-fixes.patch" + "contextviewfix.patch") sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2' - 'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f') + 'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f' + '61193ccc48e9f99b4856eef27fe7a4aaf465feec' + 'a95e3bfb177adacc268552ae479dd88b70f5f9e1') build() { cd "${srcdir}" patch -Np0 -i "${srcdir}"/toolbarfix.patch + patch -Np0 -i "${srcdir}"/amarok-2.5.0-ffmpeg-fixes.patch + + pushd ${pkgname}-${pkgver} + patch -Np1 -i "${srcdir}"/contextviewfix.patch # FS#30448 + popd mkdir build cd build diff --git a/extra/amarok/amarok-2.5.0-ffmpeg-fixes.patch b/extra/amarok/amarok-2.5.0-ffmpeg-fixes.patch new file mode 100644 index 000000000..602fe47f5 --- /dev/null +++ b/extra/amarok/amarok-2.5.0-ffmpeg-fixes.patch @@ -0,0 +1,19 @@ +diff -upr amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp +--- amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp 2012-06-07 16:12:22.000000000 +0300 ++++ amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp 2012-06-07 16:14:56.000000000 +0300 +@@ -136,7 +136,7 @@ MusicDNSAudioDecoder::run() + foreach( Meta::TrackPtr track, m_tracks ) + { + //TODO replace with "avformat_open_input" since av_open_input_file is deprecated +- if( av_open_input_file( &pFormatCtx, ( const char * )track->playableUrl().toLocalFile().toAscii(), NULL, 0, NULL ) ) ++ if( avformat_open_input( &pFormatCtx, ( const char * )track->playableUrl().toLocalFile().toAscii(), NULL, NULL ) ) + { + warning() << QLatin1String( "Unable to open input file: " ) + track->playableUrl().toLocalFile(); + continue; +@@ -259,4 +259,4 @@ MusicDNSAudioDecoder::run() + } + + +-#include "MusicDNSAudioDecoder.moc" +\ No newline at end of file ++#include "MusicDNSAudioDecoder.moc" diff --git a/extra/amarok/contextviewfix.patch b/extra/amarok/contextviewfix.patch new file mode 100644 index 000000000..2363b623c --- /dev/null +++ b/extra/amarok/contextviewfix.patch @@ -0,0 +1,14 @@ +diff --git a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp +index a23305f..8fa6f9b 100644 +--- a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp ++++ b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp +@@ -129,7 +129,8 @@ Context::VerticalToolbarContainment::updateGeometry() + if(!view()) + return; + +- QRectF rect = view()->sceneRect(); ++ // mimic ContextView::resizeEvent(), nothing else seems to work, bug 292895 ++ QRectF rect( view()->pos(), view()->maximumViewportSize() ); + setGeometry( rect ); + m_applets->setGeometry( rect ); + m_applets->refresh();
\ No newline at end of file diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index c8414750d..81d2bf0ed 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162354 2012-06-25 18:50:36Z foutrelis $ +# $Id: PKGBUILD 162542 2012-06-27 12:21:57Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -22,8 +22,8 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.4.2 -pkgrel=2 +pkgver=2.4.3 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -34,7 +34,7 @@ makedepends=('cmake' 'automoc4' 'boost ' 'eigen2' 'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('31b0c44ad4ee27017580c7c2fc8e87a9') +md5sums=('469d639f17e3d6a186baabd899147e39') build() { cd "${srcdir}" @@ -254,7 +254,7 @@ package_calligra-braindump() { package_calligra-flow() { pkgdesc="Flowchart & Diagram Editing" - depends=('calligra-libs' 'kdebase-runtime') + depends=('calligra-words' 'kdebase-runtime') conflicts=('calligra-flow-doc') replaces=('calligra-flow-doc') install=calligra-flow.install diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD index 203d1ff67..f1e137a91 100644 --- a/extra/claws-mail-extra-plugins/PKGBUILD +++ b/extra/claws-mail-extra-plugins/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 160463 2012-06-02 10:25:44Z bluewind $ +# $Id: PKGBUILD 162657 2012-06-27 15:37:05Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Mildred <mildred593 at online dot fr> pkgname=claws-mail-extra-plugins -pkgver=3.8.0 -pkgrel=3 +pkgver=3.8.1 +pkgrel=1 pkgdesc="Extra plugins for claws-mail" url="http://www.claws-mail.org/plugins.php?branch=EXT" license=('GPL3') arch=('i686' 'x86_64') -depends=('claws-mail>=3.8.0') +depends=('claws-mail>=3.8.1') makedepends=('make' 'bc' 'perl>=5.16.0' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7' 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1' - 'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata') + 'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata' + 'poppler-glib' 'ghostscript') optdepends=('libgtkhtml: for gtkhtml2_viewer plugin' 'perl: for perl plugin' 'libnotify: for notification plugin' @@ -25,7 +26,9 @@ optdepends=('libgtkhtml: for gtkhtml2_viewer plugin' 'libwebkit: for the fancy webkit html plugin' 'libsoup-gnome: for the fancy webkit html plugin' 'python2: for python plugin' - 'libgdata: for gdata plugin') + 'libgdata: for gdata plugin' + 'poppler-glib: for pdf viewer plugin' + 'ghostscript: for pdf viewer plugin') conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin' 'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin' 'sylpheed-claws-extra-plugins' 'claws-tnef-plugin' @@ -33,7 +36,7 @@ conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin' replaces=('sylpheed-claws-extra-plugins') options=('!libtool' '!strip') source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2) -md5sums=('4776f6e0357a694f384349ac73b6da52') +md5sums=('04528ff6c8a7a38d392c4f2afb1bb0d2') build() { cd "$srcdir/claws-mail-extra-plugins-$pkgver" @@ -42,7 +45,7 @@ build() { export PYTHON="/usr/bin/python2" # fix gdata plugin build - sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.3/configure + sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.4/configure for dir in */; do [[ $dir != geolocation_plugin-* ]] && ( diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index a85c8b939..c2dc3040a 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161800 2012-06-14 15:33:46Z andyrtr $ +# $Id: PKGBUILD 162656 2012-06-27 15:37:01Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=claws-mail -pkgver=3.8.0 -pkgrel=3 +pkgver=3.8.1 +pkgrel=1 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64') license=('GPL3') @@ -19,14 +19,10 @@ replaces=('sylpheed-claws') provides=('claws') options=(!libtool) install=claws-mail.install -source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2 - buildfix_gnutls3.diff) -md5sums=('df9f1657d7f34959a2205344d952c2e3' - '0c0956755ddcec939d916af35310ee3f') - +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2) +md5sums=('d388929fb1c8f04d4bcb2139faaf9e70') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np0 -i ${srcdir}/buildfix_gnutls3.diff sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 5c0882c7a..de873b4df 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 155697 2012-04-05 08:34:14Z bisson $ +# $Id: PKGBUILD 162652 2012-06-27 15:29:03Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin pkgver=2.7.6.1 -pkgrel=1 +pkgrel=2 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' license=('LGPL') arch=('i686' 'x86_64') -depends=('gtk2' 'libxtst') -makedepends=('qt' 'gtk3' 'anthy' 'libchewing') +depends=('gtk3' 'libxtst') +makedepends=('qt' 'gtk2' 'anthy' 'libchewing') optdepends=('qt: support for qt4 input method' - 'gtk3: support for gtk3 input method' + 'gtk2: support for gtk2 input method' 'anthy: support for anthy input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index b62e713bd..43ac1a361 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,36 +1,40 @@ -# $Id: PKGBUILD 159391 2012-05-23 12:59:51Z andrea $ +# $Id: PKGBUILD 162529 2012-06-27 06:33:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.8.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus' 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs' - 'mysql' 'unixodbc' 'cups' 'gtk2') + 'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient') options=('!libtool') _pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}" source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' - 'improve-cups-support.patch') + 'improve-cups-support.patch' + 'fix-assistant-crash.patch') md5sums=('3c1146ddf56247e16782f96910a8423b' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' '6b771c8a81dd90b45e8a79afa0e5bbfd' - 'c439c7731c25387352d8453ca7574971') + 'c439c7731c25387352d8453ca7574971' + 'e9c11e4606b7f55ae405e3e76f863dc1') build() { cd "${srcdir}"/${_pkgfqn} # (FS#28381) (KDEBUG#180051) patch -p1 -i "${srcdir}"/improve-cups-support.patch + + patch -p1 -i "${srcdir}"/fix-assistant-crash.patch export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} @@ -49,7 +53,7 @@ build() { -sysconfdir /etc/xdg \ -examplesdir /usr/share/doc/qt/examples \ -demosdir /usr/share/doc/qt/demos \ - -plugin-sql-{psql,mysql,sqlite,odbc} \ + -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \ -system-sqlite \ -no-phonon \ -no-phonon-backend \ @@ -76,6 +80,7 @@ package_qt() { optdepends=('postgresql-libs: PostgreSQL driver' 'libmysqlclient: MySQL driver' 'unixodbc: ODBC driver' + 'libfbclient: Firebird/iBase driver' 'libxinerama: Xinerama support' 'libxcursor: Xcursor support' 'libxfixes: Xfixes support') diff --git a/extra/qt/fix-assistant-crash.patch b/extra/qt/fix-assistant-crash.patch new file mode 100644 index 000000000..67bbbc48b --- /dev/null +++ b/extra/qt/fix-assistant-crash.patch @@ -0,0 +1,12 @@ +--- qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp 2012-06-26 17:37:47.334536023 +0000 ++++ qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp~ 2012-06-26 17:37:08.531487286 +0000 +@@ -944,8 +944,7 @@ + if (helpEngine.usesAppFont()) + font = helpEngine.appFont(); + +- const QWidgetList &widgets = qApp->allWidgets(); +- foreach (QWidget* widget, widgets) ++ foreach (QWidget* widget, QApplication::allWidgets()) + widget->setFont(font); + } + diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index 961522e87..9f47b8bff 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 157028 2012-04-23 09:28:03Z ibiru $ +# $Id: PKGBUILD 162675 2012-06-27 20:59:49Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=raptor -pkgver=2.0.7 -pkgrel=2 +pkgver=2.0.8 +pkgrel=1 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64') url="http://librdf.org/raptor" @@ -33,4 +33,4 @@ package() { cd "${srcdir}"/raptor2-${pkgver} make prefix="${pkgdir}"/usr install } -md5sums=('699073463467dc8eded2ca89de2ab2ea') +md5sums=('ac60858b875aab8fa7917f21a1237aa9') |