rpms/kdebase/devel kdebase-4.0.3-nspluginviewer.patch, NONE, 1.1 kdebase.spec, 1.315, 1.316
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon Apr 14 14:08:36 UTC 2008
- Previous message: rpms/nautilus/devel nautilus-2.22.2-hide-livecd-mount.diff, NONE, 1.1 nautilus.spec, 1.196, 1.197
- Next message: rpms/mkinitrd/devel .cvsignore, 1.185, 1.186 mkinitrd.spec, 1.263, 1.264 sources, 1.227, 1.228
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15208
Modified Files:
kdebase.spec
Added Files:
kdebase-4.0.3-nspluginviewer.patch
Log Message:
* Mon Apr 14 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-7
- nspluginviewer patch (kde#160413)
kdebase-4.0.3-nspluginviewer.patch:
--- NEW FILE kdebase-4.0.3-nspluginviewer.patch ---
Index: kdebase/apps/nsplugins/viewer/nsplugin.cpp
===================================================================
--- kdebase/apps/nsplugins/viewer/nsplugin.cpp (revision 796100)
+++ kdebase/apps/nsplugins/viewer/nsplugin.cpp (working copy)
@@ -1391,14 +1391,10 @@
memset(npp, 0, sizeof(NPP_t));
npp->ndata = NULL;
- // Create plugin instance object
- NSPluginInstance *inst = new NSPluginInstance( npp, &_pluginFuncs, _handle,
- baseURL, mimeType, appId,
- callbackId, embed, this );
-
// create plugin instance
NPError error = _pluginFuncs.newp(mime, npp, embed ? NP_EMBED : NP_FULL,
argc, _argn, _argv, 0);
+
kDebug(1431) << "NPP_New = " << (int)error;
// free arrays with arguments
@@ -1408,12 +1404,17 @@
// check for error
if ( error!=NPERR_NO_ERROR)
{
- delete inst;
//delete npp; double delete!
kDebug(1431) << "<- PluginClass::NewInstance = 0";
return QDBusObjectPath();
}
+ // Create plugin instance object
+ NSPluginInstance *inst = new NSPluginInstance( npp, &_pluginFuncs, _handle,
+ baseURL, mimeType, appId,
+ callbackId, embed, this );
+
+
// create source stream
if ( !src.isEmpty() )
inst->requestURL( src, mimeType, QString(), 0, false, reload );
Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- kdebase.spec 6 Apr 2008 10:16:57 -0000 1.315
+++ kdebase.spec 14 Apr 2008 14:08:01 -0000 1.316
@@ -1,7 +1,7 @@
Summary: K Desktop Environment 4 - Core Files
Version: 4.0.3
-Release: 6%{?dist}
+Release: 7%{?dist}
%if 0%{?fedora} > 8
Name: kdebase
@@ -23,11 +23,15 @@
Group: User Interface/Desktops
URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+## upstream patches
# fix Konsole window size (backported from 4.1, #439638, kde#160422)
# http://websvn.kde.org/?view=rev&revision=793964
# http://websvn.kde.org/?view=rev&revision=793970
Patch100: kdebase-4.0.3-kde#160422.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# http://bugs.kde.org/160143
+Patch101: kdebase-4.0.3-nspluginviewer.patch
BuildRequires: kde-filesystem >= 4
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -119,6 +123,8 @@
%prep
%setup -q -n kdebase-%{version}
%patch100 -p0 -b .kde#160422
+%patch101 -p1 -b .kde#160143
+
%build
@@ -296,6 +302,9 @@
%changelog
+* Mon Apr 14 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-7
+- nspluginviewer patch (kde#160413)
+
* Sun Apr 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.3-6
- backport Konsole window size fixes from 4.1 (#439638, kde#160422)
- Previous message: rpms/nautilus/devel nautilus-2.22.2-hide-livecd-mount.diff, NONE, 1.1 nautilus.spec, 1.196, 1.197
- Next message: rpms/mkinitrd/devel .cvsignore, 1.185, 1.186 mkinitrd.spec, 1.263, 1.264 sources, 1.227, 1.228
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list