rpms/amarok/FC-4 amarok-1.2.4-forward-decl.patch, NONE, 1.1 amarok.spec, 1.19, 1.20

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/amarok/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10085

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.2.4-forward-decl.patch 
Log Message:
* Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-6.fc4
- add patch to fix several missing forward declarations which let
  compilation with gcc >= 4.0.0-9 fail
- re-enable SMP make flags


amarok-1.2.4-forward-decl.patch:

--- NEW FILE amarok-1.2.4-forward-decl.patch ---
diff -Nur amarok-1.2.4-orig/amarok/src/collectionbrowser.h amarok-1.2.4/amarok/src/collectionbrowser.h
--- amarok-1.2.4-orig/amarok/src/collectionbrowser.h	2005-05-19 19:00:19.000000000 +0200
+++ amarok-1.2.4/amarok/src/collectionbrowser.h	2005-06-02 23:30:30.000000000 +0200
@@ -15,6 +15,7 @@
 
 class ClickLineEdit;
 class CollectionDB;
+class CollectionView;
 class sqlite;
 
 class QCString;
diff -Nur amarok-1.2.4-orig/amarok/src/mediabrowser.h amarok-1.2.4/amarok/src/mediabrowser.h
--- amarok-1.2.4-orig/amarok/src/mediabrowser.h	2005-05-19 19:00:19.000000000 +0200
+++ amarok-1.2.4/amarok/src/mediabrowser.h	2005-06-02 23:36:50.000000000 +0200
@@ -39,6 +39,10 @@
 };
 
 
+class MediaDevice;
+class MediaDeviceList;
+class MediaDeviceView;
+
 class MediaBrowser : public QVBox
 {
     Q_OBJECT
diff -Nur amarok-1.2.4-orig/amarok/src/playlistbrowser.h amarok-1.2.4/amarok/src/playlistbrowser.h
--- amarok-1.2.4-orig/amarok/src/playlistbrowser.h	2005-05-19 19:00:19.000000000 +0200
+++ amarok-1.2.4/amarok/src/playlistbrowser.h	2005-06-02 23:34:23.000000000 +0200
@@ -22,6 +22,10 @@
 class QSplitter;
 class QTimer;
 
+class PlaylistBrowserItem;
+class PlaylistBrowserView;
+#include "smartplaylist.h"
+
 class PlaylistBrowser : public QVBox
 {
 Q_OBJECT
@@ -112,6 +116,9 @@
 };
 
 
+class PlaylistTrackItem;
+class TrackItemInfo;
+
 class PlaylistBrowserItem :  public QObject, public KListViewItem
 {
 Q_OBJECT
diff -Nur amarok-1.2.4-orig/amarok/src/smartplaylisteditor.h amarok-1.2.4/amarok/src/smartplaylisteditor.h
--- amarok-1.2.4-orig/amarok/src/smartplaylisteditor.h	2005-05-19 19:00:19.000000000 +0200
+++ amarok-1.2.4/amarok/src/smartplaylisteditor.h	2005-06-02 23:38:48.000000000 +0200
@@ -18,6 +18,7 @@
 class QToolButton;
 class QVGroupBox;
 
+class CriteriaEditor;
 
 class SmartPlaylistEditor : public KDialogBase
 {


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- amarok.spec	2 Jun 2005 15:28:10 -0000	1.19
+++ amarok.spec	2 Jun 2005 22:08:12 -0000	1.20
@@ -7,7 +7,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.2.4
-Release:    5%{?dist}
+Release:    6%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -15,6 +15,7 @@
 Source0:    http://dl.sf.net/amarok/amarok-1.2.4.tar.bz2
 Patch0:     amarok-1.2.4-gcc4bl.patch
 Patch1:     amarok-1.2.4-workaround-missing-libfam.la.patch
+Patch2:     amarok-1.2.4-forward-decl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -95,6 +96,7 @@
 # remove test for GCC blacklisting
 %patch0 -p1 -b .gcc4bl
 %patch1 -p1 -b .workaround-missing-libfam.la
+%patch2 -p1 -b .forward-decl
 
 
 %build
@@ -111,8 +113,7 @@
 #     --with-nmm \
 #     --with-mas
 
-make
-# %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
@@ -207,6 +208,11 @@
 
 
 %changelog
+* Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-6.fc4
+- add patch to fix several missing forward declarations which let
+  compilation with gcc >= 4.0.0-9 fail
+- re-enable SMP make flags
+
 * Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-5.fc4
 - disable SMP make flags, since previous release failed miserably on
   i386 while the one before it succeeded