diff options
Diffstat (limited to 'community/kvirc')
-rw-r--r-- | community/kvirc/PKGBUILD | 14 | ||||
-rw-r--r-- | community/kvirc/kvirc-4.0.4-gcc-4.7.0.patch | 62 |
2 files changed, 72 insertions, 4 deletions
diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD index 1566792fb..bec61f747 100644 --- a/community/kvirc/PKGBUILD +++ b/community/kvirc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61081 2011-12-21 20:51:13Z andrea $ +# $Id: PKGBUILD 71745 2012-06-02 10:29:12Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=kvirc pkgver=4.0.4 -pkgrel=4 +pkgrel=5 pkgdesc="Qt-based IRC client" url="http://www.kvirc.net" depends=('python2' 'qt' 'libxss' 'qtwebkit') @@ -12,11 +12,17 @@ makedepends=('cmake') license=('GPL') options=("!libtool") install=kvirc.install -source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2) -md5sums=('26fd24979ae4a29bac9309b3b0c98788') +source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2 + kvirc-4.0.4-gcc-4.7.0.patch) +md5sums=('26fd24979ae4a29bac9309b3b0c98788' + '863e33f5b38f0b5124144e9a8b640e42') build() { cd $srcdir + + # Fix build with GCC 4.7 + patch -d "$pkgname-$pkgver" -Np4 -i "$srcdir/kvirc-4.0.4-gcc-4.7.0.patch" + mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/community/kvirc/kvirc-4.0.4-gcc-4.7.0.patch b/community/kvirc/kvirc-4.0.4-gcc-4.7.0.patch new file mode 100644 index 000000000..f122a29af --- /dev/null +++ b/community/kvirc/kvirc-4.0.4-gcc-4.7.0.patch @@ -0,0 +1,62 @@ +Index: /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp
+===================================================================
+--- /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp (revision 4667)
++++ /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp (revision 6024)
+@@ -190,6 +190,6 @@
+ QString artist;
+ QString title;
+- foreach (QVariant v, reply.arguments()) {
+- QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++ foreach (QVariant w, reply.arguments()) {
++ QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ QVariant v = qdbus_cast<QVariantMap>(arg);
+ if (v.userType() == QVariant::Map) {
+Index: /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp
+===================================================================
+--- /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp (revision 6024)
++++ /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp (revision 6025)
+@@ -139,6 +139,6 @@
+ return __return_if_fail; \
+ MPRIS_CALL_METHOD("GetMetadata", __return_if_fail) \
+- foreach (QVariant v, reply.arguments()) { \
+- QDBusArgument arg = qvariant_cast<QDBusArgument>(v); \
++ foreach (QVariant w, reply.arguments()) { \
++ QDBusArgument arg = qvariant_cast<QDBusArgument>(w); \
+ QVariant v = qdbus_cast<QVariantMap>(arg); \
+ if (v.userType() == QVariant::Map) { \
+@@ -214,6 +214,6 @@
+ MPRIS_CALL_METHOD("GetMetadata", "")
+
+- foreach (QVariant v, reply.arguments()) {
+- QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++ foreach (QVariant w, reply.arguments()) {
++ QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ QVariant v = qdbus_cast<QVariantMap>(arg);
+ if (v.userType() == QVariant::Map) {
+@@ -292,6 +292,6 @@
+ MPRIS_CALL_METHOD("GetMetadata", -1)
+
+- foreach (QVariant v, reply.arguments()) {
+- QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++ foreach (QVariant w, reply.arguments()) {
++ QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ QVariant v = qdbus_cast<QVariantMap>(arg);
+ if (v.userType() == QVariant::Map) {
+@@ -353,6 +353,6 @@
+ MPRIS_CALL_METHOD("GetMetadata", "")
+
+- foreach (QVariant v, reply.arguments()) {
+- QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++ foreach (QVariant w, reply.arguments()) {
++ QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ QVariant v = qdbus_cast<QVariantMap>(arg);
+ if (v.userType() == QVariant::Map) {
+@@ -404,6 +404,6 @@
+ MPRIS_CALL_METHOD("GetMetadata", -1)
+
+- foreach (QVariant v, reply.arguments()) {
+- QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++ foreach (QVariant w, reply.arguments()) {
++ QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ QVariant v = qdbus_cast<QVariantMap>(arg);
+ if (v.userType() == QVariant::Map) {
|