Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=2a67ac20f3ca73dc504f887ae6addcc3bc4842be
commit 2a67ac20f3ca73dc504f887ae6addcc3bc4842be Author: Melko <[email protected]> Date: Sat Jun 2 12:58:43 2012 +0200 kvirc-4.0.4-2-i686 * add patch for gcc-4.7 diff --git a/source/kde-extra/kvirc/FrugalBuild b/source/kde-extra/kvirc/FrugalBuild index 8007e9a..0108deb 100644 --- a/source/kde-extra/kvirc/FrugalBuild +++ b/source/kde-extra/kvirc/FrugalBuild @@ -13,8 +13,10 @@ _F_gnome_iconcache="y" Finclude gnome-scriptlet kde url="http://www.kvirc.net"; up2date="lynx -dump ftp://ftp.$pkgname.de/pub/$pkgname/ | sed -n 's|.*latest_is_\(.[0-9.]*\)$|\1|p'" -source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2) -sha1sums=('f2e42145e0e7dbbbe1353e56fe1c10c7eb6c7441') +source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2 \ + kvirc-4.0.4-gcc-4.7.0.patch) +sha1sums=('f2e42145e0e7dbbbe1353e56fe1c10c7eb6c7441' \ + 'be8611ab1a39c9caae6874fa85a9c43cee467a15') build() { KDE_build diff --git a/source/kde-extra/kvirc/kvirc-4.0.4-gcc-4.7.0.patch b/source/kde-extra/kvirc/kvirc-4.0.4-gcc-4.7.0.patch new file mode 100644 index 0000000..7f4506f --- /dev/null +++ b/source/kde-extra/kvirc/kvirc-4.0.4-gcc-4.7.0.patch @@ -0,0 +1,62 @@ +Index: /modules/mediaplayer/mp_mprisinterface.cpp +=================================================================== +--- /src/modules/mediaplayer/mp_mprisinterface.cpp (revision 4667) ++++ /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 +=================================================================== +--- /src/modules/mediaplayer/mp_mprisinterface.cpp (revision 6024) ++++ /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) { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
