Hello community,
here is the log from the commit of package kdebase3 for openSUSE:Factory
checked in at Tue Nov 2 16:13:57 CET 2010.
--------
--- KDE/kdebase3/kdebase3.changes 2010-08-10 08:30:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2010-09-23 00:18:14.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Sep 23 00:15:01 CEST 2010 - hpj@urpla.net
+
+- attempt to fix flashplayer dysfunction
+
+-------------------------------------------------------------------
+Fri Aug 13 17:03:58 UTC 2010 - neptunia@mail.ru
+
+- removing dependencies on KDE4, restoring ksysguardd but without strict dependency
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
nsplugin-init-gtk.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.ERepAY/_old 2010-11-02 16:12:45.000000000 +0100
+++ /var/tmp/diff_new_pack.ERepAY/_new 2010-11-02 16:12:45.000000000 +0100
@@ -58,8 +58,8 @@
#
%if %suse_version < 1031
Requires: kdebase3-ksysguardd
-%else
-Requires: kdebase4-workspace-ksysguardd
+#%else
+#Requires: kdebase4-workspace-ksysguardd
%endif
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
Requires: xorg-x11 misc-console-font
@@ -82,7 +82,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.10.1
-Release: 10
+Release: 11
%define kde_version 3.5.10
Requires: kdebase3-runtime == %{version}
Source0: kdebase-%{kde_version}.tar.bz2
@@ -250,6 +250,7 @@
Patch239: gcc44.diff
Patch240: bnc584223.diff
Patch241: openssl1.patch
+Patch242: nsplugin-init-gtk.diff
%description
This package contains kdebase, one of the basic packages of the K
@@ -304,6 +305,7 @@
Group: System/GUI/KDE
Requires: kdebase3 == %{version}
Provides: kdebase3:/opt/kde3/bin/kicker
+Recommends: kdebase3-ksysguardd == %{version}
%description workspace
This package contains the wrkspace components of kdebase3 like
@@ -430,13 +432,13 @@
--------
The KDE Team
-%if %suse_version < 1031
%package ksysguardd
License: GPLv2+
PreReq: %insserv_prereq %fillup_prereq aaa_base
Summary: KDE base package: ksysguard daemon
Group: System/GUI/KDE
+Provides: kdebase4-workspace-ksysguardd
%description ksysguardd
This package contains the ksysguard daemon. It is needed for ksysguard.
@@ -450,7 +452,6 @@
--------
The KDE Team
-%endif
%package session
License: GPLv2+
@@ -508,7 +509,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 575
+Release: 576
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -702,6 +703,7 @@
%patch239
%patch240 -p1
%patch241 -p0
+%patch242 -p0
rm -rf kappfinder
rm pics/crystalsvg/cr??-*emacs.png
cp %SOURCE17 l10n/tw/flag.png
@@ -792,13 +794,13 @@
ln -fs /opt/kde3/bin/startkde $RPM_BUILD_ROOT/usr/X11R6/bin/kde
%endif
ln -sf rcxdm ${RPM_BUILD_ROOT}/usr/sbin/rckdm
-%if %suse_version > 1020
-rm ${RPM_BUILD_ROOT}/opt/kde3/bin/ksysguardd
-rm ${RPM_BUILD_ROOT}/etc/ksysguarddrc
-%else
+#%if %suse_version > 1020
+#rm ${RPM_BUILD_ROOT}/opt/kde3/bin/ksysguardd
+#rm ${RPM_BUILD_ROOT}/etc/ksysguarddrc
+#%else
mv ${RPM_BUILD_ROOT}/opt/kde3/bin/ksysguardd ${RPM_BUILD_ROOT}/usr/bin/ksysguardd
ln -sf /usr/bin/ksysguardd ${RPM_BUILD_ROOT}/opt/kde3/bin/ksysguardd
-%endif
+#%endif
install -d ${RPM_BUILD_ROOT}/opt/kde3/env
%if %suse_version < 1001
install -m 0755 %SOURCE3 ${RPM_BUILD_ROOT}/opt/kde3/env
@@ -812,16 +814,16 @@
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
mkdir -p $RPM_BUILD_ROOT/etc/init.d/
install -m 0644 %SOURCE9 ${RPM_BUILD_ROOT}/opt/kde3/share/apps/kdewizard/pics/wizard_small.png
-%if %suse_version < 1031
+#%if %suse_version < 1031
install -m 0744 %SOURCE6 $RPM_BUILD_ROOT/etc/init.d/ksysguardd
-%endif
+#%endif
mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/apps/kdm/faces/
ln -s ../pics/users/root1.png $RPM_BUILD_ROOT/opt/kde3/share/apps/kdm/faces/root.face.icon
ln -s ../pics/users/default2.png $RPM_BUILD_ROOT/opt/kde3/share/apps/kdm/faces/.default.face.icon
-%if %suse_version < 1031
+#%if %suse_version < 1031
ln -sf /etc/init.d/ksysguardd $RPM_BUILD_ROOT/usr/sbin/rcksysguardd
install -D -m 644 %SOURCE15 $RPM_BUILD_ROOT/etc/slp.reg.d/ksysguardd.reg
-%endif
+#%endif
# even if we use smbro
install -D -m 644 kioslave/smb/smb-network.desktop $RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/dirtree/remote/smb-network.desktop
#
@@ -1549,24 +1551,23 @@
/opt/kde3/%_lib/libtaskmanager.la
/opt/kde3/%_lib/libkasbar.so
/opt/kde3/%_lib/libkasbar.la
-%if %suse_version < 1031
%files ksysguardd
%defattr(-,root,root)
%dir /etc/slp.reg.d
-%if %suse_version < 1020
+#%if %suse_version < 1020
/usr/bin/ksysguardd
/opt/kde3/bin/ksysguardd
%config(noreplace) /etc/ksysguarddrc
-%endif
-%if %suse_version > 1030
-/usr/bin/ksysguardd
-%config(noreplace) /etc/ksysguarddrc
-%endif
+#%endif
+#%if %suse_version > 1030
+#/usr/bin/ksysguardd
+#%config(noreplace) /etc/ksysguarddrc
+#%endif
/etc/init.d/ksysguardd
/usr/sbin/rcksysguardd
%config(noreplace) /etc/slp.reg.d/*
-%endif
+
%if %suse_version > 1010
%if %suse_version < 1140
++++++ ksysguardd.init ++++++
--- /var/tmp/diff_new_pack.ERepAY/_old 2010-11-02 16:12:48.000000000 +0100
+++ /var/tmp/diff_new_pack.ERepAY/_new 2010-11-02 16:12:48.000000000 +0100
@@ -10,8 +10,8 @@
### BEGIN INIT INFO
# Provides: ksysguardd
# Required-Start: $time $named
-# X-UnitedLinux-Should-Start: $syslog slpd
-# Required-Stop:
+# Should-Start: $syslog slpd
+# Required-Stop: $null
# Default-Start: 3 5
# Default-Stop: 0 1 2 4 6
# Description: remote monitor daemon for ksysguard
++++++ nsplugin-init-gtk.diff ++++++
--- nsplugins/viewer/nsplugin.h~ 2008-02-13 10:40:38.000000000 +0100
+++ nsplugins/viewer/nsplugin.h 2010-09-22 23:31:58.721961990 +0200
@@ -315,6 +315,10 @@ private:
QPtrList<NSPluginInstance> _trash;
QCString _app;
+
+ // If plugins use gtk, we call the gtk_init function for them ---
+ // but only do it once.
+ static bool s_initedGTK;
};
--- nsplugins/viewer/nsplugin.cpp~ 2008-02-13 10:40:38.000000000 +0100
+++ nsplugins/viewer/nsplugin.cpp 2010-09-22 23:31:58.775909705 +0200
@@ -1330,6 +1330,9 @@ DCOPRef NSPluginViewer::newClass( QStrin
/****************************************************************************/
+bool NSPluginClass::s_initedGTK = false;
+
+typedef void gtkInitFunc(int *argc, char ***argv);
NSPluginClass::NSPluginClass( const QString &library,
QObject *parent, const char *name )
@@ -1377,6 +1380,23 @@ NSPluginClass::NSPluginClass( const QStr
// initialize plugin
kdDebug(1431) << "Plugin library " << library << " loaded!" << endl;
+
+ // see if it uses gtk
+ if (!s_initedGTK) {
+ gtkInitFunc* gtkInit = (gtkInitFunc*)_handle->symbol("gtk_init");
+ if (gtkInit) {
+ kdDebug(1431) << "Calling gtk_init for the plugin" << endl;
+ // Prevent gtk_init() from replacing the X error handlers, since the Gtk
+ // handlers abort when they receive an X error, thus killing the viewer.
+ int (*old_error_handler)(Display*,XErrorEvent*) = XSetErrorHandler(0);
+ int (*old_io_error_handler)(Display*) = XSetIOErrorHandler(0);
+ gtkInit(0, 0);
+ XSetErrorHandler(old_error_handler);
+ XSetIOErrorHandler(old_io_error_handler);
+ s_initedGTK = true;
+ }
+ }
+
_constructed = true;
_error = initialize()!=NPERR_NO_ERROR;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org