From 5072cee45a3dc5638ba936dfb4e717bf918b6d06 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 22 Jul 2013 01:12:51 -0700 Subject: Mon Jul 22 01:12:48 PDT 2013 --- extra/ddrescue/PKGBUILD | 14 +++++------ extra/fluxter/PKGBUILD | 20 ++++++++------- extra/kaffeine/PKGBUILD | 39 ++++++++++++++++++------------ extra/kaffeine/kaffeine-1.2.2-gcc4.7.patch | 32 ++++++++++++++++++++++++ extra/libpciaccess/PKGBUILD | 4 +-- extra/qtwebkit/PKGBUILD | 12 ++++----- extra/xorg-xconsole/PKGBUILD | 6 ++--- 7 files changed, 84 insertions(+), 43 deletions(-) create mode 100644 extra/kaffeine/kaffeine-1.2.2-gcc4.7.patch (limited to 'extra') diff --git a/extra/ddrescue/PKGBUILD b/extra/ddrescue/PKGBUILD index 0fe7a3286..3deeb3bd5 100644 --- a/extra/ddrescue/PKGBUILD +++ b/extra/ddrescue/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 164005 2012-07-23 18:42:21Z schiv $ +# $Id: PKGBUILD 191219 2013-07-21 14:09:43Z schiv $ # Maintainer: Ray Rashif # Contributor: Pierre Schmitz # Contributor: Paul Mattal pkgname=ddrescue -pkgver=1.16 -pkgrel=2 +pkgver=1.17 +pkgrel=1 pkgdesc="GNU data recovery tool" arch=('i686' 'x86_64') url="http://www.gnu.org/software/ddrescue/ddrescue.html" license=('GPL3') depends=('gcc-libs') install=$pkgname.install -source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" - "http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz.sig") -md5sums=('57b67407e882c6418531d48a2f20d16b' - 'bf072280587665d82829be15eb6fc9ad') +source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.lz" + "http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.lz.sig") +md5sums=('564469370fe70cd9ac280b15e1addc50' + 'SKIP') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/extra/fluxter/PKGBUILD b/extra/fluxter/PKGBUILD index 723543918..247449633 100644 --- a/extra/fluxter/PKGBUILD +++ b/extra/fluxter/PKGBUILD @@ -1,30 +1,32 @@ -# $Id: PKGBUILD 123175 2011-05-09 02:48:19Z eric $ +# $Id: PKGBUILD 191227 2013-07-21 21:10:07Z eric $ # Maintainer: Eric Bélanger pkgname=fluxter pkgver=0.1.0 -pkgrel=5 +pkgrel=6 pkgdesc="A workspace pager for fluxbox" arch=('i686' 'x86_64') url="http://benedict.isomedia.com/homes/stevencooper/projects/fluxter.html" license=('GPL') depends=('gcc-libs' 'libx11') -source=(http://benedict.isomedia.com/homes/stevencooper/files/${pkgname}-${pkgver}.tar.gz \ +source=(http://benedict.isomedia.com/homes/stevencooper/files/${pkgname}-${pkgver}.tar.gz fluxter-0.1.0-asneeded.patch) -md5sums=('6d18553220e8fc33c54762d2e7d31528' - '3deb4e816d12a262455bc8281fa82577') sha1sums=('d0da4759a21fdadc8a6457195c87b6648b5d69bc' '2fc912d40233577b34cb6c641e066863e487fab0') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p0 -i ../fluxter-0.1.0-asneeded.patch - autoreconf +} + +build() { + cd ${pkgname}-${pkgver} + autoreconf --force --install ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/kaffeine/PKGBUILD b/extra/kaffeine/PKGBUILD index cad29ec16..5bad851f1 100644 --- a/extra/kaffeine/PKGBUILD +++ b/extra/kaffeine/PKGBUILD @@ -1,31 +1,38 @@ -# $Id: PKGBUILD 146418 2012-01-10 23:37:34Z eric $ +# $Id: PKGBUILD 191225 2013-07-21 20:40:01Z eric $ +# Maintainer: # Contributor: Pierre Schmitz pkgname=kaffeine pkgver=1.2.2 -pkgrel=2 +pkgrel=3 pkgdesc='KDE media player' license=('GPL') arch=('i686' 'x86_64') url="http://kaffeine.kde.org" -depends=('kdelibs' 'kdebase-runtime' 'xine-lib') -makedepends=('pkg-config' 'cmake' 'automoc4') +depends=('kdebase-runtime' 'xine-lib') +makedepends=('cmake' 'automoc4') install=kaffeine.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('690e48d2e5fe123887109aa9b1bc1c31') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz + kaffeine-1.2.2-gcc4.7.patch) +md5sums=('690e48d2e5fe123887109aa9b1bc1c31' + '48afe5ec99b38fe02782db57a847033f') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/kaffeine-1.2.2-gcc4.7.patch" +} build() { - cd "$srcdir" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make } package() { - cd "$srcdir/build" - make DESTDIR="$pkgdir" install + cd build + make DESTDIR="$pkgdir" install } diff --git a/extra/kaffeine/kaffeine-1.2.2-gcc4.7.patch b/extra/kaffeine/kaffeine-1.2.2-gcc4.7.patch new file mode 100644 index 000000000..e74563e0b --- /dev/null +++ b/extra/kaffeine/kaffeine-1.2.2-gcc4.7.patch @@ -0,0 +1,32 @@ +commit 2da9df1e67004c3cfa879578c351300a99f23da1 +Author: Christoph Pfister +Date: Wed Apr 4 21:22:09 2012 +0200 + + fix build for gcc 4.7 + +diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp +index 7fc8f68..e70d8b8 100644 +--- a/src/dvb/dvbepg.cpp ++++ b/src/dvb/dvbepg.cpp +@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size) + // 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011) + QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC); + +- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid(); +- --entryCount, entry.advance()) { ++ for (AtscEitSectionEntry eitEntry = eitSection.entries(); ++ (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) { + DvbEpgEntry epgEntry; + epgEntry.channel = channel; +- epgEntry.begin = baseDateTime.addSecs(entry.startTime()); +- epgEntry.duration = QTime().addSecs(entry.duration()); +- epgEntry.title = entry.title(); ++ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime()); ++ epgEntry.duration = QTime().addSecs(eitEntry.duration()); ++ epgEntry.title = eitEntry.title(); + +- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId())); ++ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId())); + DvbSharedEpgEntry entry = epgEntries.value(id); + + if (entry.isValid() && (entry->channel == epgEntry.channel) && diff --git a/extra/libpciaccess/PKGBUILD b/extra/libpciaccess/PKGBUILD index 4b5bc2e8e..c79705c13 100644 --- a/extra/libpciaccess/PKGBUILD +++ b/extra/libpciaccess/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Alexander Baldeck pkgname=libpciaccess -pkgver=0.13.1 +pkgver=0.13.2 pkgrel=1 pkgdesc="X11 PCI access library" arch=(i686 x86_64) @@ -13,7 +13,7 @@ depends=('glibc') makedepends=('pkgconfig' 'xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('ae4dcf27a1b52c6a1fd90b21165fbaecae34e8ac') +sha256sums=('abab8c2b050afb89bc29280e9c6b50ec5867174960d88bfb81a01036ec20de19') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index 1a0c2b797..66e16f740 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184430 2013-05-06 19:39:36Z foutrelis $ +# $Id: PKGBUILD 191221 2013-07-21 19:23:31Z andrea $ # Maintainer: Andrea Scarpino pkgname=qtwebkit -pkgver=2.3.1 -pkgrel=2 +pkgver=2.3.2 +pkgrel=1 arch=('i686' 'x86_64') url='http://trac.webkit.org/wiki/QtWebKit' pkgdesc='An open source web browser engine (Qt port)' @@ -11,13 +11,13 @@ license=('LGPL2.1' 'GPL3') depends=('qt4' 'systemd' 'gstreamer0.10-base') makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa') conflicts=('qt<4.8') -_qtver=4.8.4 +_qtver=4.8.5 source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${pkgver}" "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz" 'use-python2.patch' 'qwebview.patch') -sha1sums=('5b71baa0c92290d00b8cc3739c298098c1ed4bcd' - 'f5880f11c139d7d8d01ecb8d874535f7d9553198' +sha1sums=('adf66bc92b0c3e41791a419c6b776d0167acaa7c' + '745f9ebf091696c0d5403ce691dc28c039d77b9e' '315b6ff603f35e5492a036f7082f6aa075dfb607' 'ef467fcfc9e74aa88356f27acc21792706ed1e4d') diff --git a/extra/xorg-xconsole/PKGBUILD b/extra/xorg-xconsole/PKGBUILD index 426f9300f..bc3ca28f5 100644 --- a/extra/xorg-xconsole/PKGBUILD +++ b/extra/xorg-xconsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 175083 2013-01-13 09:45:06Z andyrtr $ +# $Id: PKGBUILD 191215 2013-07-21 06:57:40Z lcarlier $ # Maintainer: Jan de Groot pkgname=xorg-xconsole -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="Monitor system console messages with X" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('custom') depends=('libxaw' 'libxmu' 'libxt' 'libx11') makedepends=('xorg-util-macros') source=(http://xorg.freedesktop.org/archive/individual/app/xconsole-${pkgver}.tar.bz2) -sha256sums=('195fad7a1ca274835fc346c82acce90a0c2e9f288e85bd1a3c256dbc1c8c11e5') +sha256sums=('e561959b6ee8b735a32c1050015cfd8c551ed162cabb6cb72e36ce72966855d1') build() { cd "${srcdir}/xconsole-${pkgver}" -- cgit v1.2.3-54-g00ecf