[SCM] bangarang packaging branch, master, updated. debian/1.0.beta2-1-35-g4c79971

[ryanakca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 658b34a33a36a1db84bb4bdb8a26f73c0a083291
Author: Ryan Kavanagh <ryanakca at kubuntu.org>
Date:   Sun Jan 17 17:02:13 2010 -0500

    Imported upstream patch to fix FTBFS with gcc-4.4

diff --git a/debian/patches/01_MediaItem.diff b/debian/patches/01_MediaItem.diff
new file mode 100644
index 0000000..8fb61aa
--- /dev/null
+++ b/debian/patches/01_MediaItem.diff
@@ -0,0 +1,37 @@
+## 01_MediaItem.diff by Andrew Lake <jamboarder at yahoo.com>
+## Fix a FTBFS with gcc-4.4
+diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
+index dbccde7..6523c2c 100644
+--- a/src/mainwindow.cpp
++++ b/src/mainwindow.cpp
+@@ -834,7 +834,7 @@ void MainWindow::delayedNotificationHide()
+     QTimer::singleShot(3000, ui->notificationWidget, SLOT(hide()));
+ }
+ 
+-void MainWindow::sourceInfoUpdated(MediaItem mediaItem)
++void MainWindow::sourceInfoUpdated(const MediaItem &mediaItem)
+ {
+     QFontMetrics fm =  ui->notificationText->fontMetrics();
+ 	//TODO: I tried fixing this word puzzle, I couldn't test it myself, but it should work. Please check if it really is :-) thanks
+diff --git a/src/mainwindow.h b/src/mainwindow.h
+index c456831..bb546bd 100644
+--- a/src/mainwindow.h
++++ b/src/mainwindow.h
+@@ -39,7 +39,7 @@
+ #include <QDateTime>
+ #include <QMainWindow>
+ 
+-class MediaItem;
++struct MediaItem;
+ class MediaListProperties;
+ class MediaItemModel;
+ class MediaListCache;
+@@ -189,7 +189,7 @@ private slots:
+     void showLoading();
+     void showNotification();
+     void delayedNotificationHide();
+-    void sourceInfoUpdated(MediaItem mediaItem);
++    void sourceInfoUpdated(const MediaItem &mediaItem);
+     void sourceInfoRemoved(QString url);
+     void updateNowPlayingStyleSheet();
+     void volumeChanged(qreal newVolume);
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..c8eb8b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_MediaItem.diff

-- 
bangarang packaging