Date: Sunday, July 21, 2013 @ 22:39:30 Author: eric Revision: 191224 upgpkg: kaffeine 1.2.2-3
Add build patch (close FS#36219), Clean up depends and makedepends Added: kaffeine/trunk/kaffeine-1.2.2-gcc4.7.patch Modified: kaffeine/trunk/PKGBUILD -----------------------------+ PKGBUILD | 37 ++++++++++++++++++++++--------------- kaffeine-1.2.2-gcc4.7.patch | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-07-21 19:36:41 UTC (rev 191223) +++ PKGBUILD 2013-07-21 20:39:30 UTC (rev 191224) @@ -1,31 +1,38 @@ # $Id$ +# Maintainer: # Contributor: Pierre Schmitz <pie...@archlinux.de> 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 } Added: kaffeine-1.2.2-gcc4.7.patch =================================================================== --- kaffeine-1.2.2-gcc4.7.patch (rev 0) +++ kaffeine-1.2.2-gcc4.7.patch 2013-07-21 20:39:30 UTC (rev 191224) @@ -0,0 +1,32 @@ +commit 2da9df1e67004c3cfa879578c351300a99f23da1 +Author: Christoph Pfister <christophpfis...@gmail.com> +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) &&