Fixed kdesdk-misc dependency, removed code checking useflag phonon, added upstream qt-4.7 build fix. Bug 338601.

(Portage version: 2.1.9.39/cvs/Linux x86_64)

3 files changed, 172 insertions, 4 deletions

diff --git a/media-sound/kwave/ChangeLog b/media-sound/kwave/ChangeLog
index 02f86dd71f66..fcc6f0ab9e84 100644
--- a/media-sound/kwave/ChangeLog
+++ b/media-sound/kwave/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/kwave
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/ChangeLog,v 1.19 2011/02/02 04:52:24 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/ChangeLog,v 1.20 2011/02/14 23:46:58 dilfridge Exp $
+
+  14 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org> kwave-0.8.5.ebuild,
+  +files/kwave-0.8.5-qt47.patch:
+  Fixed kdesdk-misc dependency, removed code checking useflag phonon, added
+  qt-4.7 build fix. Bug 338601.
 
   02 Feb 2011; Theo Chatzimichos <tampakrap@gentoo.org> kwave-0.8.5.ebuild,
   metadata.xml:
diff --git a/media-sound/kwave/files/kwave-0.8.5-qt47.patch b/media-sound/kwave/files/kwave-0.8.5-qt47.patch
new file mode 100644
index 000000000000..6bae6077e9c0
--- /dev/null
+++ b/media-sound/kwave/files/kwave-0.8.5-qt47.patch
@@ -0,0 +1,161 @@
+Index: plugins/fileinfo/FileInfoDlg.ui
+===================================================================
+--- plugins/fileinfo/FileInfoDlg.ui	(Revision 2565)
++++ plugins/fileinfo/FileInfoDlg.ui	(Revision 2566)
+@@ -43,7 +43,7 @@
+      <property name="currentIndex">
+       <number>0</number>
+      </property>
+-     <widget class="QWidget" name="tab">
++     <widget class="QWidget" name="tab1">
+       <attribute name="title">
+        <string>File</string>
+       </attribute>
+@@ -609,7 +609,7 @@
+        </item>
+       </layout>
+      </widget>
+-     <widget class="QWidget" name="tab">
++     <widget class="QWidget" name="tab2">
+       <attribute name="title">
+        <string>Compression</string>
+       </attribute>
+@@ -736,7 +736,7 @@
+        </item>
+       </layout>
+      </widget>
+-     <widget class="QWidget" name="tab">
++     <widget class="QWidget" name="tab3">
+       <attribute name="title">
+        <string>MPEG</string>
+       </attribute>
+@@ -1235,7 +1235,7 @@
+        </item>
+       </layout>
+      </widget>
+-     <widget class="QWidget" name="tab">
++     <widget class="QWidget" name="tab4">
+       <attribute name="title">
+        <string>Content</string>
+       </attribute>
+@@ -1501,7 +1501,7 @@
+        </item>
+       </layout>
+      </widget>
+-     <widget class="QWidget" name="tab">
++     <widget class="QWidget" name="tab5">
+       <attribute name="title">
+        <string>Source</string>
+       </attribute>
+@@ -1846,7 +1846,7 @@
+        </item>
+       </layout>
+      </widget>
+-     <widget class="QWidget" name="tab">
++     <widget class="QWidget" name="tab6">
+       <attribute name="title">
+        <string>Author/Copyright</string>
+       </attribute>
+@@ -2127,7 +2127,7 @@
+        </item>
+       </layout>
+      </widget>
+-     <widget class="QWidget" name="tab">
++     <widget class="QWidget" name="tab7">
+       <attribute name="title">
+        <string>Miscellaneous</string>
+       </attribute>
+Index: plugins/sonagram/SonagramDialog.cpp
+===================================================================
+--- plugins/sonagram/SonagramDialog.cpp	(Revision 2565)
++++ plugins/sonagram/SonagramDialog.cpp	(Revision 2566)
+@@ -105,7 +105,7 @@
+     list.clear();
+ 
+     // parameter #0: number of fft points
+-    param = pointbox ? pointbox->currentText() : QString(0);
++    param = pointbox ? pointbox->currentText() : QString();
+     list.append(param);
+ 
+     // parameter #1: index of the window function
+Index: plugins/record/RecordDlg.ui
+===================================================================
+--- plugins/record/RecordDlg.ui	(Revision 2565)
++++ plugins/record/RecordDlg.ui	(Revision 2566)
+@@ -49,7 +49,7 @@
+         <property name="currentIndex">
+          <number>0</number>
+         </property>
+-        <widget class="QWidget" name="tab">
++        <widget class="QWidget" name="tab1">
+          <attribute name="title">
+           <string>Recording</string>
+          </attribute>
+@@ -375,7 +375,7 @@
+           </item>
+          </layout>
+         </widget>
+-        <widget class="QWidget" name="tab">
++        <widget class="QWidget" name="tab2">
+          <attribute name="title">
+           <string>Level</string>
+          </attribute>
+@@ -616,7 +616,7 @@
+           </item>
+          </layout>
+         </widget>
+-        <widget class="QWidget" name="tab">
++        <widget class="QWidget" name="tab3">
+          <attribute name="title">
+           <string>For&amp;mat</string>
+          </attribute>
+@@ -973,7 +973,7 @@
+           </item>
+          </layout>
+         </widget>
+-        <widget class="QWidget" name="tab">
++        <widget class="QWidget" name="tab4">
+          <attribute name="title">
+           <string>Source</string>
+          </attribute>
+Index: libgui/KwaveFileDialog.h
+===================================================================
+--- libgui/KwaveFileDialog.h	(Revision 2565)
++++ libgui/KwaveFileDialog.h	(Revision 2566)
+@@ -43,8 +43,8 @@
+      */
+     KwaveFileDialog(const QString& startDir, const QString& filter,
+                     QWidget *parent, bool modal,
+-                    const QString last_url = 0,
+-                    const QString last_ext = 0);
++                    const QString last_url = QString(),
++                    const QString last_ext = QString());
+ 
+     /** Destructor */
+     virtual ~KwaveFileDialog()
+Index: libgui/KwaveFileDialog.cpp
+===================================================================
+--- libgui/KwaveFileDialog.cpp	(Revision 2565)
++++ libgui/KwaveFileDialog.cpp	(Revision 2566)
+@@ -34,7 +34,7 @@
+     const QString &filter, QWidget *parent, bool modal,
+     const QString last_url, const QString last_ext)
+     :KFileDialog(startDir, filter, parent),
+-     m_config_group(0), m_last_url(last_url), m_last_ext(last_ext)
++     m_config_group(), m_last_url(last_url), m_last_ext(last_ext)
+ {
+     setModal(modal);
+ 
+Index: libgui/MenuItem.cpp
+===================================================================
+--- libgui/MenuItem.cpp	(Revision 2565)
++++ libgui/MenuItem.cpp	(Revision 2566)
+@@ -38,7 +38,7 @@
+                    const QKeySequence &shortcut,
+                    const QString &uid)
+     :MenuNode(parent, name, command, shortcut, uid),
+-     m_exclusive_group(0), m_action(0)
++     m_exclusive_group(), m_action(0)
+ {
+     Q_ASSERT(parent);
+     if (!parent) return;
diff --git a/media-sound/kwave/kwave-0.8.5.ebuild b/media-sound/kwave/kwave-0.8.5.ebuild
index 52619cc56ea3..2e26b2fc9e3a 100644
--- a/media-sound/kwave/kwave-0.8.5.ebuild
+++ b/media-sound/kwave/kwave-0.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/kwave-0.8.5.ebuild,v 1.2 2011/02/02 04:52:24 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/kwave-0.8.5.ebuild,v 1.3 2011/02/14 23:46:58 dilfridge Exp $
 
 EAPI=3
 KDE_LINGUAS="cs de fr"
@@ -32,11 +32,13 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	$(add_kdebase_dep kdesdk-misc)
+	$(add_kdebase_dep kdesdk-misc extras)
 	media-gfx/imagemagick"
 
 DOCS=( AUTHORS CHANGES README TODO )
 
+PATCHES=( "${FILESDIR}/${P}"-qt47.patch )
+
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with alsa)
@@ -44,7 +46,7 @@ src_configure() {
 		$(cmake-utils_use_with mad MP3)
 		$(cmake-utils_use_with vorbis OGG)
 		$(cmake-utils_use_with oss)
-		$(cmake-utils_use_with phonon)
+		-DWITH_PHONON=ON
 		$(cmake-utils_use_with pulseaudio)
 		$(cmake-utils_use debug)"