[arch-commits] Commit in (4 files)

[Andrea Scarpino]

    Date: Tuesday, May 18, 2010 @ 14:49:30
  Author: andrea
Revision: 80545

Thorsten Toepper will take care of it in [community]

Added:
  amarok/trunk/fix-qtscriptgenerator-check.patch
Modified:
  amarok/trunk/PKGBUILD
  rt2870usb-fw/trunk/PKGBUILD
Deleted:
  etherape/

------------------------------------------------+
 amarok/trunk/PKGBUILD                          |   11 +++++---
 amarok/trunk/fix-qtscriptgenerator-check.patch |   31 +++++++++++++++++++++++
 rt2870usb-fw/trunk/PKGBUILD                    |    7 ++---
 3 files changed, 41 insertions(+), 8 deletions(-)

Modified: amarok/trunk/PKGBUILD
===================================================================
--- amarok/trunk/PKGBUILD	2010-05-18 18:48:19 UTC (rev 80544)
+++ amarok/trunk/PKGBUILD	2010-05-18 18:49:30 UTC (rev 80545)
@@ -3,8 +3,7 @@
 # Contributor: damir <damir at archlinux.org>
 
 pkgname=amarok
-replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.3.0
+pkgver=2.3.0.90
 pkgrel=1
 pkgdesc="A media player for KDE"
 arch=("i686" "x86_64")
@@ -16,10 +15,14 @@
 	"libmtp: support for portable media devices"
 	"loudmouth: backend needed by mp3tunes for syncing")
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('fc672a2848e36b3b44eb81dd1466e4f4')
+source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+	'fix-qtscriptgenerator-check.patch')
+md5sums=('a2eb7e81de59ab813ac2490f657d6dc4'
+	'318f9e0e84bb473da02bad1fadb11b77')
 
 build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -Np1 -i ${srcdir}/fix-qtscriptgenerator-check.patch || return 1
    cd ${srcdir}
    mkdir build
    cd build

Added: amarok/trunk/fix-qtscriptgenerator-check.patch
===================================================================
--- amarok/trunk/fix-qtscriptgenerator-check.patch	                        (rev 0)
+++ amarok/trunk/fix-qtscriptgenerator-check.patch	2010-05-18 18:49:30 UTC (rev 80545)
@@ -0,0 +1,31 @@
+--- a/cmake/modules/bindingstest/QtScriptBindingsTest.cpp
++++ b/cmake/modules/bindingstest/QtScriptBindingsTest.cpp
+@@ -16,7 +16,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
+-#include <QtCore/QCoreApplication>
++#include <QtGui/QApplication>
+ #include <QtScript/QScriptEngine>
+ #include <QtCore/QStringList>
+ #include <QtCore/QDebug>
+@@ -25,7 +25,7 @@
+ 
+ int main(int argc, char **argv)
+ {
+-    QCoreApplication app( argc, argv );
++    QApplication app( argc, argv );
+ 
+     QStringList allowedBindings;
+     allowedBindings << "qt.core" << "qt.gui" << "qt.sql" << "qt.xml" << "qt.uitools" << "qt.network";
+--- a/cmake/modules/bindingstest/QtScriptBindingsTest.cpp
++++ b/cmake/modules/bindingstest/QtScriptBindingsTest.cpp
+@@ -25,7 +25,7 @@
+ 
+ int main(int argc, char **argv)
+ {
+-    QApplication app( argc, argv );
++    QApplication app( argc, argv, false );
+ 
+     QStringList allowedBindings;
+     allowedBindings << "qt.core" << "qt.gui" << "qt.sql" << "qt.xml" << "qt.uitools" << "qt.network";

Modified: rt2870usb-fw/trunk/PKGBUILD
===================================================================
--- rt2870usb-fw/trunk/PKGBUILD	2010-05-18 18:48:19 UTC (rev 80544)
+++ rt2870usb-fw/trunk/PKGBUILD	2010-05-18 18:49:30 UTC (rev 80545)
@@ -3,15 +3,14 @@
 # Contributor: Alois Nespor <alois.nespor at gmail.com>
 
 pkgname=rt2870usb-fw
-pkgver=8
+pkgver=22
 pkgrel=1
 pkgdesc="Firmware for RaLink RT2870USB (RT2870/RT2770) WiFi adapter"
-url="http://web.ralinktech.com/ralink/Home/Support/Linux.html"
+url="http://www.ralinktech.com/support.php?s=2"
 arch=('any')
 license=('custom')
-depends=()
 source=(ftp://ftp.archlinux.org/other/rt2870usb-fw/RT2870_Firmware_V$pkgver.zip)
-md5sums=('a7aae1d8cfd68e4d86a73000df0b6584')
+md5sums=('c5a93b466532a5617da6b203cabab62b')
 
 build() {
   cd "${srcdir}/RT2870_Firmware_V${pkgver}"