From 1129c797617ec47a2b0af2c7399bcd73de3faacb Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Sep 18 2008 09:28:20 +0000
Subject: backport from trunk to fix dragon kpart crash in the embedding application


---

diff --git a/kdemultimedia-4.1.1-kde#170941-dragon.patch b/kdemultimedia-4.1.1-kde#170941-dragon.patch
new file mode 100644
index 0000000..2529958
--- /dev/null
+++ b/kdemultimedia-4.1.1-kde#170941-dragon.patch
@@ -0,0 +1,26 @@
+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 ) ); 
+ }
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index cf313c5..716e1df 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -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 @@ Group:     Applications/Multimedia
 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 @@ Requires: kdelibs4-devel kdebase-workspace-devel
 %prep
 %setup -q -n kdemultimedia-%{version}
 
+# upstream patches
+%patch100 -p1 -b .kde#170941-dragon
+
 %build
 
 mkdir -p %{_target_platform} 
@@ -147,6 +152,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 17 2008 Than Ngo <than@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@redhat.com> 4.1.1-1
 - 4.1.1