media-sound/flacon: remove old

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1070

3 files changed, 0 insertions, 194 deletions

diff --git a/media-sound/flacon/files/flacon-1.2.0-fix-corrupt-file-crash.patch b/media-sound/flacon/files/flacon-1.2.0-fix-corrupt-file-crash.patch
deleted file mode 100644
index 11a4f1307a1c..000000000000
--- a/media-sound/flacon/files/flacon-1.2.0-fix-corrupt-file-crash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 01bf112e4bfd0718829b7dc6f83de6fbceb3ac0c Mon Sep 17 00:00:00 2001
-From: "sokoloff (Alexander)" <sokoloff.a@gmail.com>
-Date: Fri, 18 Sep 2015 20:15:16 +0300
-Subject: [PATCH] Fix crash if audio file is corrupt
-
----
- disk.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/disk.cpp b/disk.cpp
-index 99c7dff..23d7ab2 100644
---- a/disk.cpp
-+++ b/disk.cpp
-@@ -577,7 +577,7 @@ bool Disk::replaceAudioFile(const QString &fileName, bool force)
-         audio = 0;
-     }
- 
--    if (force || audio->isValid())
-+    if (force || audio)
-     {
-         delete mAudioFile;
-         mAudioFile = audio;
diff --git a/media-sound/flacon/files/flacon-1.2.0-fix-disks-or-tracks-number-change-crash.patch b/media-sound/flacon/files/flacon-1.2.0-fix-disks-or-tracks-number-change-crash.patch
deleted file mode 100644
index 1e9a3369671a..000000000000
--- a/media-sound/flacon/files/flacon-1.2.0-fix-disks-or-tracks-number-change-crash.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From bf2dc4aa42e91bda2d41e129f7fe6597b9f86673 Mon Sep 17 00:00:00 2001
-From: "sokoloff (Alexander)" <sokoloff.a@gmail.com>
-Date: Sun, 27 Sep 2015 09:24:35 +0300
-Subject: [PATCH] Fix: the program sometimes crash when you change the number
- of disks or tracks
-
----
- disk.cpp             | 3 +++
- project.cpp          | 9 +++++----
- tests/testflacon.cpp | 6 +++---
- 3 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/disk.cpp b/disk.cpp
-index 969cb71..3b624de 100644
---- a/disk.cpp
-+++ b/disk.cpp
-@@ -433,6 +433,9 @@ void Disk::loadFromCue(const CueTagSet &cueTags, bool activate)
-     for (int i=mTracks.count(); i<mCount; ++i)
-         mTracks.append(new Track(this, i));
- 
-+    while (mTracks.count() > mCount)
-+        mTracks.takeLast()->deleteLater();
-+
-     for (int t=0; t<cueTags.tracksCount(); ++t)
-     {
-         for (int idx=0; idx<100; ++idx)
-diff --git a/project.cpp b/project.cpp
-index 00486e4..38710ae 100644
---- a/project.cpp
-+++ b/project.cpp
-@@ -169,7 +169,8 @@ void Project::removeDisk(const QList<Disk*> *disks)
-         Disk *disk = disks->at(i);
-         emit beforeRemoveDisk(disk);
-         if (mDisks.removeAll(disk))
--            delete disk;
-+            disk->deleteLater();
-+
-         emit afterRemoveDisk();
-     }
- 
-@@ -274,10 +275,10 @@ DiskList Project::addCueFile(const QString &fileName, bool showErrors)
-     }
-     else
-     {
--        foreach(Disk *d, res)
-+        foreach(Disk *disk, res)
-         {
--            mDisks.removeAll(d);
--            delete d;
-+            mDisks.removeAll(disk);
-+            disk->deleteLater();
-         }
- 
-         emit layoutChanged();
-diff --git a/tests/testflacon.cpp b/tests/testflacon.cpp
-index bcd7c46..571b425 100644
---- a/tests/testflacon.cpp
-+++ b/tests/testflacon.cpp
-@@ -830,7 +830,7 @@ void TestFlacon::testTrackResultFileName()
-                     expected);
-         QFAIL(msg.toLocal8Bit());
-     }
--    delete disk;
-+    disk->deleteLater();
- }
- 
- 
-@@ -983,7 +983,7 @@ void TestFlacon::testTrackResultFilePath()
-         QFAIL(msg.toLocal8Bit());
-     }
-     //QCOMPARE(result, expected);
--    delete disk;
-+    disk->deleteLater();
- }
- 
- 
-@@ -1117,7 +1117,7 @@ void TestFlacon::testTrackSetCodepages()
-         QFAIL((msg + "\n    " + cmd).toLocal8Bit());
-     }
- 
--    delete disk;
-+    disk->deleteLater();
- }
- 
- 
diff --git a/media-sound/flacon/files/flacon-1.2.0-fix-qpainter-error.patch b/media-sound/flacon/files/flacon-1.2.0-fix-qpainter-error.patch
deleted file mode 100644
index cc7398730eda..000000000000
--- a/media-sound/flacon/files/flacon-1.2.0-fix-qpainter-error.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 8ffd4d83e19e8f1e28841f37248e99fae0796b10 Mon Sep 17 00:00:00 2001
-From: "sokoloff (Alexander)" <sokoloff.a@gmail.com>
-Date: Fri, 18 Sep 2015 20:14:31 +0300
-Subject: [PATCH] Fix QPainter::font: Painter not active error
-
----
- gui/trackviewdelegate.cpp | 20 +++++++++-----------
- gui/trackviewdelegate.h   |  4 ++--
- 2 files changed, 11 insertions(+), 13 deletions(-)
-
-diff --git a/gui/trackviewdelegate.cpp b/gui/trackviewdelegate.cpp
-index ab05833..02b6137 100644
---- a/gui/trackviewdelegate.cpp
-+++ b/gui/trackviewdelegate.cpp
-@@ -261,8 +261,8 @@ void TrackViewDelegate::paintDisk(QPainter *painter, const QStyleOptionViewItem
-     //cache = self.cache(index)
-     painter->save();
-     painter->setClipRect(option.rect);
--    QFont titleFont = this->titleFont(painter);
--    QFont filesFont = this->filesFont(painter);
-+    QFont titleFont = this->titleFont(painter->font());
-+    QFont filesFont = this->filesFont(painter->font());
- 
- 
-     int topPadding = index.row() ? TOP_PADDING : 0;
-@@ -408,19 +408,17 @@ QSize TrackViewDelegate::sizeHint(const QStyleOptionViewItem &option, const QMod
- 
-     if (!index.parent().isValid())
-     {
--
-         if (!mDiskHeightHint)
-         {
-             int h = 8;
--            QPainter painter(mTrackView);
--            QFont titleFont = this->titleFont(&painter);
--            QFont filesFont = this->filesFont(&painter);
-+
-+            QFont titleFont = this->titleFont(option.font);
-+            QFont filesFont = this->filesFont(option.font);
-             h += QFontMetrics(titleFont).height();
-             h += QFontMetrics(filesFont).height() * 2;
-             mDiskHeightHint = qMax(IMG_HEIGHT, h) + 2 * MARGIN + BOTTOM_PADDING; //For Line
-         }
- 
--
-         res.rheight() = mDiskHeightHint;
-         if (index.row())
-             res.rheight() += TOP_PADDING;
-@@ -533,9 +531,9 @@ void TrackViewDelegate::downloadingFinished(DataProvider *provider)
- /************************************************
- 
-  ************************************************/
--QFont TrackViewDelegate::titleFont(const QPainter *painter) const
-+QFont TrackViewDelegate::titleFont(const QFont &font) const
- {
--    QFont res = painter->font();
-+    QFont res = font;
-     res.setPointSize(res.pointSize() + 1);
-     res.setBold(true);
-     return res;
-@@ -545,9 +543,9 @@ QFont TrackViewDelegate::titleFont(const QPainter *painter) const
- /************************************************
- 
-  ************************************************/
--QFont TrackViewDelegate::filesFont(const QPainter *painter) const
-+QFont TrackViewDelegate::filesFont(const QFont &font) const
- {
--    QFont res = painter->font();
-+    QFont res = font;
-     return res;
- }
- 
-diff --git a/gui/trackviewdelegate.h b/gui/trackviewdelegate.h
-index 3a6aa09..492e514 100644
---- a/gui/trackviewdelegate.h
-+++ b/gui/trackviewdelegate.h
-@@ -76,8 +76,8 @@ private slots:
-     QMovie mDownloadMovie;
-     mutable int mDiskHeightHint;
- 
--    QFont titleFont(const QPainter *painter) const;
--    QFont filesFont(const QPainter *painter) const;
-+    QFont titleFont(const QFont &font) const;
-+    QFont filesFont(const QFont &font) const;
-     void paintTrack(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index, const Track *track) const;
-     void paintDisk(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index, const Disk *disk) const;
-     QRect drawLabel(const QString &text, QRect rect, QPainter *painter) const;