rpms/kdemultimedia/devel kdemultimedia-4.1.1-kde#170941-dragon.patch, NONE, 1.1 kdemultimedia.spec, 1.119, 1.120
Than Ngo
than at fedoraproject.org
Tue Sep 16 22:22:02 UTC 2008
- Previous message (by thread): rpms/libpst/devel .cvsignore,1.5,1.6 sources,1.5,1.6
- Next message (by thread): rpms/messiggy/F-8 import.log, NONE, 1.1 messiggy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: than
Update of /cvs/extras/rpms/kdemultimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13688
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/devel/kdemultimedia.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- kdemultimedia.spec 29 Aug 2008 15:57:45 -0000 1.119
+++ kdemultimedia.spec 16 Sep 2008 22:21:32 -0000 1.120
@@ -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
- Previous message (by thread): rpms/libpst/devel .cvsignore,1.5,1.6 sources,1.5,1.6
- Next message (by thread): rpms/messiggy/F-8 import.log, NONE, 1.1 messiggy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list