[SCM] bangarang/master: Drop 01_MediaItem.diff, no longer needed

ryanakca-guest at users.alioth.debian.org ryanakca-guest at users.alioth.debian.org
Tue Feb 1 20:51:24 UTC 2011


The following commit has been merged in the master branch:
commit b3c747130e768836bef9a9e592438e5c3e640046
Author: Ryan Kavanagh <ryanakca at kubuntu.org>
Date:   Tue Feb 1 14:31:33 2011 -0500

    Drop 01_MediaItem.diff, no longer needed

diff --git a/debian/patches/01_MediaItem.diff b/debian/patches/01_MediaItem.diff
deleted file mode 100644
index 8fb61aa..0000000
--- a/debian/patches/01_MediaItem.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-## 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
deleted file mode 100644
index c8eb8b5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_MediaItem.diff

-- 
bangarang packaging



More information about the pkg-multimedia-commits mailing list