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

Package-Manager: portage-2.1.9.39/cvs/Linux x86_64

4 files changed, 195 insertions, 6 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/Manifest b/media-sound/kwave/Manifest
index 9d5321859084..c6b738fa3d86 100644
--- a/media-sound/kwave/Manifest
+++ b/media-sound/kwave/Manifest
@@ -1,4 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kwave-0.8.5-qt47.patch 5332 RMD160 96ceece768cc44feb8a41d3c842f400a2c29b6b6 SHA1 5f70a1df7d7e4be6a08a79178112653695229762 SHA256 ae8d9bba4a23fce7d95f4b96e6472c6be25fe605db06bd5add19ba91e109b5b0
 DIST kwave-0.8.5-1.tar.bz2 2793431 RMD160 e188ae33b48a4abc6bd8537e7188b564dfb7bb0e SHA1 4f70f343e9a6517022617b2ad300d4925c275bda SHA256 f99944aaa507258cc5b7bae44218177ce9b3981984eacd6ebf272ece3e4358c0
-EBUILD kwave-0.8.5.ebuild 1273 RMD160 1482ad7238a2a76cd136bb6a7a48da07dba9b68c SHA1 c7b35b5e27eb22d1cb5f03d7b2c46b8015a56eaa SHA256 3f64d96958013035f4d614c89a05116939360e612a91b56fda5ae93fdce872f7
-MISC ChangeLog 3539 RMD160 7ff4495e2880440101d0fd7f6c92d6bf13b23bbc SHA1 f626baa2e1086c10bdf9ebb5cbf0a88a58b55838 SHA256 b508576c006b826bb6d63fcfb04badde716b30292594760e437e428fd8bc6668
+EBUILD kwave-0.8.5.ebuild 1309 RMD160 f919ae5d2ad187ee493eac38ff8a0b81208db924 SHA1 f9748e25547ac7b55e8bb51cc6a39206074aa39d SHA256 5888f549ee063553284b93d60a883eac2ec9e27d9c7b0a8410ca4fe4b74d75d4
+MISC ChangeLog 3758 RMD160 32f5ac82a5137bd94576724b4d14221a0cdba702 SHA1 ed1abc509dd5b8354d6af01ba38d6cceae2c1143 SHA256 70a55ddf7b3b0b4e7ad9c686553dbbc5a6f21407ffbeb8d2ae2b1435fa2eecb9
 MISC metadata.xml 521 RMD160 9d33fece426f8ae7cc9b73ce9453eabfc41eb35c SHA1 8d3f1536c4b6cc82bed328e6d714fca8b9072cfc SHA256 81070daf140e53eb1261998d7c13c8b1de6f436e7700b042a414ff0897d4aa89
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNWb8JAAoJENwGBM22xffeZt0P/itWL1qMXWvotGzaQJY8hMj2
+Di3oCH9g1EDVo7/dWx7MWmufw3BgtNtsWL65YNXaZPxlY4G45BOY7VuvqiM8tnkm
+koGQhpd6GmNDXzWrzMQalcS6rYJJDJmbot7PdbIkkWOzrIGuVBNQePDKLjiWq/Ql
++zXW3+YDEle3SWILKGapNU9RV8Tk0PHc2Qik9k7Gzwo/crDhk60vZLYwnbZD32O1
+5wVPf3lAEA1JmSL4ghKXlPIenCE9zdrJALcIQLuE+Hvw+bPd4fXEeJX6Jru69Zdu
+b81qS8z0Ym+XmuGFELq3JyyCfE7Z8vGfGccomVGctmxb+XbeEMK3E4n1xVArqMwS
+VH06/8T5fmh1+egL8EMYtTqBKEqrGAt+SA26R7KgJqRqOEPhiS557juFepmMKrVD
+2nYoczX9LWSU35oSDMm2S88nM5jvbVa12BlMawQdpy7v6KTk+wF5F+V0F5k6CdKP
+txx+nTpo8/46z7tYnINOBMBG/j49wvuYSl0lCbJVhjVtSSstW29nyax7iI8qAnvo
+wo/aLKB9rML05a1UQdeOYMJy3fsajSb3pjUFRCr+Syd3MEJMvvtsZoEWBBukOQEV
+lZhkIts3MX6UAszrI/GRmjRxBBXl09ZVvVMZgRsaugmKMcFMGCAgbd6jle7LEz0z
+e6FeSrx9wAn7GKHw6a/l
+=U8Zc
+-----END PGP SIGNATURE-----
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)"