rpms/kdemultimedia/F-9 kdemultimedia-4.1.1-kde#170941-dragon.patch, NONE, 1.1 kdemultimedia.spec, 1.113, 1.114

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdemultimedia/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15305

Modified Files:
	kdemultimedia.spec 
Added Files:
	kdemultimedia-4.1.1-kde#170941-dragon.patch 
Log Message:
backport from trunk to fix dragon kpart crash in the embedding application


kdemultimedia-4.1.1-kde#170941-dragon.patch:

--- NEW FILE kdemultimedia-4.1.1-kde#170941-dragon.patch ---
diff -up kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp.orig kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp
--- kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp.orig	2008-09-17 00:14:07.000000000 +0200
+++ kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp	2008-09-17 00:16:49.000000000 +0200
@@ -529,15 +529,13 @@ debug() << "chapters: " << m_controller-
         refreshXineStream();
         updateChannels();
 
-		if(m_adjustedSize==false)
-		{
-		  ( (QWidget*) mainWindow() )->adjustSize();
-		  m_adjustedSize=true;
-		  debug() << "adjusting size to video resolution";
-		}
-        //m_vWidget->updateGeometry();
-        //updateGeometry();
-        
+        if(m_adjustedSize==false)
+        {
+           if( mainWindow() )
+             ( (QWidget*) mainWindow() )->adjustSize();
+           m_adjustedSize=true;
+           debug() << "adjusting size to video resolution";
+	}
     }
     emit stateChanged( state( currentState ) ); 
 }


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-9/kdemultimedia.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- kdemultimedia.spec	29 Aug 2008 19:20:33 -0000	1.113
+++ kdemultimedia.spec	18 Sep 2008 09:28:20 -0000	1.114
@@ -1,7 +1,7 @@
 Name: kdemultimedia
 Epoch: 6
 Version: 4.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
 Group:     Applications/Multimedia
@@ -9,6 +9,8 @@
 License:   GPLv2+
 URL:       http://www.kde.org/
 Source0:   ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2
+# upstream patches
+Patch100:  kdemultimedia-4.1.1-kde#170941-dragon.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # This one is normal, FLAC_OGG_LIBRARY is not actually used anyway:
@@ -75,6 +77,9 @@
 %prep
 %setup -q -n kdemultimedia-%{version}
 
+# upstream patches
+%patch100 -p1 -b .kde#170941-dragon
+
 %build
 
 mkdir -p %{_target_platform} 
@@ -147,6 +152,9 @@
 
 
 %changelog
+* Wed Sep 17 2008 Than Ngo <than at redhat.com> 4.1.1-2
+- backport from trunk to fix dragon kpart crash in the embedding application 
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1