Date: Sunday, July 21, 2013 @ 22:40:01
Author: eric
Revision: 191225
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kaffeine/repos/extra-i686/PKGBUILD
(from rev 191224, kaffeine/trunk/PKGBUILD)
kaffeine/repos/extra-i686/kaffeine-1.2.2-gcc4.7.patch
(from rev 191224, kaffeine/trunk/kaffeine-1.2.2-gcc4.7.patch)
kaffeine/repos/extra-i686/kaffeine.install
(from rev 191224, kaffeine/trunk/kaffeine.install)
kaffeine/repos/extra-x86_64/PKGBUILD
(from rev 191224, kaffeine/trunk/PKGBUILD)
kaffeine/repos/extra-x86_64/kaffeine-1.2.2-gcc4.7.patch
(from rev 191224, kaffeine/trunk/kaffeine-1.2.2-gcc4.7.patch)
kaffeine/repos/extra-x86_64/kaffeine.install
(from rev 191224, kaffeine/trunk/kaffeine.install)
Deleted:
kaffeine/repos/extra-i686/PKGBUILD
kaffeine/repos/extra-i686/kaffeine.install
kaffeine/repos/extra-x86_64/PKGBUILD
kaffeine/repos/extra-x86_64/kaffeine.install
------------------------------------------+
/PKGBUILD | 76 +++++++++++++++++++++++++++++
/kaffeine.install | 24 +++++++++
extra-i686/PKGBUILD | 31 -----------
extra-i686/kaffeine-1.2.2-gcc4.7.patch | 32 ++++++++++++
extra-i686/kaffeine.install | 12 ----
extra-x86_64/PKGBUILD | 31 -----------
extra-x86_64/kaffeine-1.2.2-gcc4.7.patch | 32 ++++++++++++
extra-x86_64/kaffeine.install | 12 ----
8 files changed, 164 insertions(+), 86 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-07-21 20:39:30 UTC (rev 191224)
+++ extra-i686/PKGBUILD 2013-07-21 20:40:01 UTC (rev 191225)
@@ -1,31 +0,0 @@
-# $Id$
-# Contributor: Pierre Schmitz <[email protected]>
-
-pkgname=kaffeine
-pkgver=1.2.2
-pkgrel=2
-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')
-install=kaffeine.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz";)
-md5sums=('690e48d2e5fe123887109aa9b1bc1c31')
-
-build() {
- cd "$srcdir"
- 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
-}
Copied: kaffeine/repos/extra-i686/PKGBUILD (from rev 191224,
kaffeine/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-07-21 20:40:01 UTC (rev 191225)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer:
+# Contributor: Pierre Schmitz <[email protected]>
+
+pkgname=kaffeine
+pkgver=1.2.2
+pkgrel=3
+pkgdesc='KDE media player'
+license=('GPL')
+arch=('i686' 'x86_64')
+url="http://kaffeine.kde.org";
+depends=('kdebase-runtime' 'xine-lib')
+makedepends=('cmake' 'automoc4')
+install=kaffeine.install
+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() {
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: kaffeine/repos/extra-i686/kaffeine-1.2.2-gcc4.7.patch (from rev 191224,
kaffeine/trunk/kaffeine-1.2.2-gcc4.7.patch)
===================================================================
--- extra-i686/kaffeine-1.2.2-gcc4.7.patch (rev 0)
+++ extra-i686/kaffeine-1.2.2-gcc4.7.patch 2013-07-21 20:40:01 UTC (rev
191225)
@@ -0,0 +1,32 @@
+commit 2da9df1e67004c3cfa879578c351300a99f23da1
+Author: Christoph Pfister <[email protected]>
+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) &&
Deleted: extra-i686/kaffeine.install
===================================================================
--- extra-i686/kaffeine.install 2013-07-21 20:39:30 UTC (rev 191224)
+++ extra-i686/kaffeine.install 2013-07-21 20:40:01 UTC (rev 191225)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kaffeine/repos/extra-i686/kaffeine.install (from rev 191224,
kaffeine/trunk/kaffeine.install)
===================================================================
--- extra-i686/kaffeine.install (rev 0)
+++ extra-i686/kaffeine.install 2013-07-21 20:40:01 UTC (rev 191225)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-07-21 20:39:30 UTC (rev 191224)
+++ extra-x86_64/PKGBUILD 2013-07-21 20:40:01 UTC (rev 191225)
@@ -1,31 +0,0 @@
-# $Id$
-# Contributor: Pierre Schmitz <[email protected]>
-
-pkgname=kaffeine
-pkgver=1.2.2
-pkgrel=2
-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')
-install=kaffeine.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz";)
-md5sums=('690e48d2e5fe123887109aa9b1bc1c31')
-
-build() {
- cd "$srcdir"
- 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
-}
Copied: kaffeine/repos/extra-x86_64/PKGBUILD (from rev 191224,
kaffeine/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-07-21 20:40:01 UTC (rev 191225)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer:
+# Contributor: Pierre Schmitz <[email protected]>
+
+pkgname=kaffeine
+pkgver=1.2.2
+pkgrel=3
+pkgdesc='KDE media player'
+license=('GPL')
+arch=('i686' 'x86_64')
+url="http://kaffeine.kde.org";
+depends=('kdebase-runtime' 'xine-lib')
+makedepends=('cmake' 'automoc4')
+install=kaffeine.install
+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() {
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: kaffeine/repos/extra-x86_64/kaffeine-1.2.2-gcc4.7.patch (from rev
191224, kaffeine/trunk/kaffeine-1.2.2-gcc4.7.patch)
===================================================================
--- extra-x86_64/kaffeine-1.2.2-gcc4.7.patch (rev 0)
+++ extra-x86_64/kaffeine-1.2.2-gcc4.7.patch 2013-07-21 20:40:01 UTC (rev
191225)
@@ -0,0 +1,32 @@
+commit 2da9df1e67004c3cfa879578c351300a99f23da1
+Author: Christoph Pfister <[email protected]>
+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) &&
Deleted: extra-x86_64/kaffeine.install
===================================================================
--- extra-x86_64/kaffeine.install 2013-07-21 20:39:30 UTC (rev 191224)
+++ extra-x86_64/kaffeine.install 2013-07-21 20:40:01 UTC (rev 191225)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kaffeine/repos/extra-x86_64/kaffeine.install (from rev 191224,
kaffeine/trunk/kaffeine.install)
===================================================================
--- extra-x86_64/kaffeine.install (rev 0)
+++ extra-x86_64/kaffeine.install 2013-07-21 20:40:01 UTC (rev 191225)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
