Hello community, here is the log from the commit of package kvirc for openSUSE:Factory checked in at 2012-03-26 11:02:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kvirc (Old) and /work/SRC/openSUSE:Factory/.kvirc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kvirc", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kvirc/kvirc.changes 2011-11-29 12:52:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kvirc.new/kvirc.changes 2012-03-26 11:02:54.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Mar 24 16:49:53 UTC 2012 - [email protected] + +- Add kvirc-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- kvirc-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvirc.spec ++++++ --- /var/tmp/diff_new_pack.IysbqW/_old 2012-03-26 11:02:55.000000000 +0200 +++ /var/tmp/diff_new_pack.IysbqW/_new 2012-03-26 11:02:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package kvirc # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,15 @@ # - Name: kvirc Version: 4.0.4 -Release: 2 -License: KVIrc Irc Client license +Release: 0 Summary: Graphical Front-End for IRC -Url: http://www.kvirc.net/ +License: KVIrc Irc Client license Group: Productivity/Networking/IRC +Url: http://www.kvirc.net/ Source: ftp://ftp.kvirc.de/pub/kvirc/%{version}/source/kvirc-%{version}.tar.bz2 +Patch0: kvirc-gcc47.patch %define _realversion 4.0 BuildRequires: audiofile-devel BuildRequires: fdupes @@ -48,7 +48,6 @@ SOCKSV4 & V5 support; and more. %package devel -License: KVIrc Irc Client license Summary: Graphical Front-End for IRC Group: Development/Libraries/C and C++ Requires: kvirc = %{version} @@ -61,6 +60,7 @@ %prep %setup -q -n kvirc-%{version} +%patch0 -p1 sed -i -e 's|@CMAKE_KVIRC_BUILD_DATE@||g' cmake/kvirc-config.cmake %build ++++++ kvirc-gcc47.patch ++++++ Index: kvirc-4.0.4/src/modules/mediaplayer/mp_mprisinterface.cpp =================================================================== --- kvirc-4.0.4.orig/src/modules/mediaplayer/mp_mprisinterface.cpp +++ kvirc-4.0.4/src/modules/mediaplayer/mp_mprisinterface.cpp @@ -138,8 +138,8 @@ bool KviMPRISInterface::quit() if (this->status() != KviMediaPlayerInterface::Playing) \ 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) { \ const QVariantMap map = v.toMap(); \ @@ -189,8 +189,8 @@ QString KviMPRISInterface::nowPlaying() 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) { const QVariantMap map = v.toMap(); @@ -213,8 +213,8 @@ QString KviMPRISInterface::mrl() { 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) { const QVariantMap map = v.toMap(); @@ -291,8 +291,8 @@ int KviMPRISInterface::length() { 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) { const QVariantMap map = v.toMap(); @@ -352,8 +352,8 @@ QString KviAudaciousInterface::mrl() { 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) { const QVariantMap map = v.toMap(); @@ -403,8 +403,8 @@ int KviAudaciousInterface::length() /* compability with older versions */ 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) { const QVariantMap map = v.toMap(); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
