Hello community, here is the log from the commit of package kdebase3 for openSUSE:Factory checked in at Thu Oct 13 16:18:31 CEST 2011.
-------- --- openSUSE:Factory/kdebase3/kdebase3.changes 2011-09-23 02:05:58.000000000 +0200 +++ kdebase3/kdebase3.changes 2011-09-30 04:59:12.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 30 02:56:11 UTC 2011 - [email protected] + +- remove obsolete version checks +- add patch for nsplugin, backported from KDE4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- khelpcenter-gnome-support-legacy.patch startkde.suse.sh New: ---- kdebase-trinity-r1255714-nsplugin-fix-port-from-kde4.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.eY9qLI/_old 2011-10-13 16:18:24.000000000 +0200 +++ /var/tmp/diff_new_pack.eY9qLI/_new 2011-10-13 16:18:24.000000000 +0200 @@ -15,9 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - -%if %suse_version < 1210 +%if %{suse_version} < 1210 %define with_hal 1 %else %define with_hal 0 @@ -62,7 +60,7 @@ Provides: kdebase3-beagle = 3.5.10 Obsoletes: kdebase3-beagle <= 3.5.10 %endif -License: GPLv2+ +License: GPL-2.0+ Group: System/GUI/KDE Summary: The KDE Core Components BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -73,7 +71,6 @@ Requires: kdebase3-runtime == %{version} Source0: kdebase-%{kde_version}.tar.bz2 Source1: baselibs.conf -Source3: startkde.suse.sh Source4: kdebase3.fillup Source6: ksysguardd.init # we append this file for older dist verions @@ -148,7 +145,6 @@ Patch92: kcminit-ignore-arts.diff Patch94: mach_blass.diff Patch96: khelpcenter-gnome-support.patch -Patch996: khelpcenter-gnome-support-legacy.patch Patch98: workaround-pdf-on64bit-nsplugin-bug.diff Patch99: xcursor.diff Patch100: ksysguard-slp-ratelimit.diff @@ -239,6 +235,7 @@ Patch245: kdebase-trinity-r1176186-no-busy-cursor.diff Patch246: kdebase-trinity-1239915-fix-currency-symbols.dif Patch247: kdebase-trinity-launch-ksysguard-optionr1107589.diff +Patch248: kdebase-trinity-r1255714-nsplugin-fix-port-from-kde4.diff %description This package contains kdebase, one of the basic packages of the K @@ -256,21 +253,15 @@ The KDE Team <[email protected]> %package -n misc-console-font -License: GPLv2+ +License: GPL-2.0+ Group: System/GUI/KDE Summary: A font for terminal usage %description -n misc-console-font This package contains the Misc Console font as shipped with KDE. - - -Authors: --------- - The KDE Team <[email protected]> - %package runtime -License: GPLv2+ +License: GPL-2.0+ Summary: Runtime Dependencies of KDE3 Applications Group: System/GUI/KDE Provides: kio_fish @@ -281,14 +272,8 @@ This package contains runtime dependencies of KDE3 applications like KIO-slaves. - - -Authors: --------- - The KDE Team <[email protected]> - %package workspace -License: GPLv2+ +License: GPL-2.0+ Summary: Workspace Components of KDE3 Desktop Group: System/GUI/KDE Requires: kdebase3 == %{version} @@ -345,7 +330,7 @@ The KDE Team <[email protected]> %package kdm -License: GPLv2+ +License: GPL-2.0+ # usesubdirs kdm Summary: The KDE login and display manager Provides: kdebase3:/opt/kde3/bin/kdm @@ -366,7 +351,7 @@ The KDE Team <[email protected]> %package samba -License: GPLv2+ +License: GPL-2.0+ # usesubdirs kioslave/smb kcontrol/samba Summary: KDE Base package: Windows Connection Module Group: System/GUI/KDE @@ -382,7 +367,7 @@ The KDE Team <[email protected]> %package extra -License: GPLv2+ +License: GPL-2.0+ # usesubdirs kpersonalizer kcontrol/thememgr Summary: KDE Base package: Extra Applications Group: System/GUI/KDE @@ -402,7 +387,7 @@ The KDE Team <[email protected]> %package nsplugin -License: GPLv2+ +License: GPL-2.0+ %ifarch x86_64 ppc64 s390x ia64 Requires: nspluginwrapper %endif @@ -423,7 +408,7 @@ %package ksysguardd -License: GPLv2+ +License: GPL-2.0+ PreReq: %insserv_prereq %fillup_prereq aaa_base Summary: KDE base package: ksysguard daemon Group: System/GUI/KDE @@ -443,7 +428,7 @@ %package session -License: GPLv2+ +License: GPL-2.0+ Summary: The KDE Session Group: System/GUI/KDE Provides: kdebase3:/usr/bin/kde @@ -462,7 +447,7 @@ %if %suse_version < 1140 %package beagle -License: GPLv2+ +License: GPL-2.0+ Summary: Beagle dependent plugins for KDE desktop Group: System/GUI/KDE Requires: beagle >= 0.3.0 @@ -483,7 +468,7 @@ %endif %package -n fileshareset -License: GPLv2+ +License: GPL-2.0+ Summary: Set and list fileshares Group: System/Management Version: 2.0 @@ -546,10 +531,8 @@ # default-to-halt %patch81 %patch82 -%if %suse_version > 1010 %patch83 %patch77 -%endif %patch200 %patch215 %patch84 @@ -558,11 +541,7 @@ %patch22 %patch92 %patch88 -%if %suse_version > 1020 %patch96 -%else -%patch996 -%endif # xcursor %patch99 %ifnarch %ix86 x86_64 @@ -588,7 +567,6 @@ %patch156 %patch157 %patch160 -%if %suse_version > 1010 %patch161 pushd kicker %patch162 @@ -596,16 +574,13 @@ %patch158 popd popd -%if %suse_version > 1010 %if %suse_version < 1140 %patch159 %endif -%endif %patch165 %patch166 %patch167 tar xvfj %SOURCE20 -%endif %patch163 %patch125 %patch169 @@ -617,15 +592,11 @@ %patch177 %patch179 %patch180 -%if %suse_version > 1010 %patch189 -%endif %patch190 %patch195 -%if %suse_version > 1020 %patch198 %patch199 -%endif %patch203 %patch204 %patch205 @@ -648,7 +619,6 @@ %patch206 %patch227 %patch228 -%if %suse_version > 1030 %if %suse_version < 1140 pushd kicker %patch1629 @@ -656,16 +626,13 @@ %patch229 %patch230 %endif -%endif %patch231 %patch232 %patch233 %patch234 %patch235 %patch236 -%if %suse_version > 1010 %patch237 -%endif %patch238 %patch239 %patch240 -p1 @@ -676,6 +643,7 @@ %patch245 -p1 %patch246 -p1 %patch247 -p1 +%patch248 -p1 rm -rf kappfinder rm pics/crystalsvg/cr??-*emacs.png @@ -710,11 +678,7 @@ $LDAP \ $FLAGS \ $XINERAMA \ -%if %suse_version > 1010 --with-motif-libraries=/usr/%{_lib}/ \ -%else - --with-motif-libraries=/usr/X11R6/%{_lib}/ \ -%endif --with-motif-includes=$MOTIF_INCLUDE \ --with-samba-libs \ --with-pam=xdm \ @@ -742,16 +706,7 @@ rm $RPM_BUILD_ROOT/opt/kde3/share/applnk/Internet/keditbookmarks.desktop rm $RPM_BUILD_ROOT/opt/kde3/share/applnk/Toys/ktip.desktop install -m 0644 %SOURCE12 $RPM_BUILD_ROOT/opt/kde3/share/fonts/ -%if %suse_version > 1100 install -D -m 0644 %SOURCE21 $RPM_BUILD_ROOT/etc/pam.d/kcheckpass -%else -%if %suse_version > 1010 -install -D -m 0644 %SOURCE921 $RPM_BUILD_ROOT/etc/pam.d/kcheckpass -%else -install -D -m 0644 %SOURCE914 $RPM_BUILD_ROOT/etc/pam.d/xdm-np -install -D -m 0644 %SOURCE9921 $RPM_BUILD_ROOT/etc/pam.d/kcheckpass -%endif -%endif install -m 0644 %SOURCE22 $RPM_BUILD_ROOT/opt/kde3/share/services/searchproviders/ install -m 0644 %SOURCE23 $RPM_BUILD_ROOT/opt/kde3/share/services/searchproviders/ %if %suse_version < 1011 @@ -767,17 +722,9 @@ 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 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 install -d ${RPM_BUILD_ROOT}/opt/kde3/env -%if %suse_version < 1001 -install -m 0755 %SOURCE3 ${RPM_BUILD_ROOT}/opt/kde3/env -%endif install -D -m 0755 %SOURCE16 ${RPM_BUILD_ROOT}/opt/kde3/shutdown/stopkde.suse.sh mkdir -p "${RPM_BUILD_ROOT}"/etc/security/ echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}"/etc/security/fileshare.conf @@ -787,16 +734,12 @@ 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 install -m 0744 %SOURCE6 $RPM_BUILD_ROOT/etc/init.d/ksysguardd -#%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 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 # 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 # @@ -1548,20 +1491,13 @@ %files ksysguardd %defattr(-,root,root) %dir /etc/slp.reg.d -#%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 /etc/init.d/ksysguardd /usr/sbin/rcksysguardd %config(noreplace) /etc/slp.reg.d/* -%if %suse_version > 1010 %if %suse_version < 1140 %files beagle @@ -1572,7 +1508,6 @@ /opt/kde3/%_lib/kde3/kickoffsearch_beagle.* /opt/kde3/share/services/kickoffsearch_beagle.desktop %endif -%endif %files -n fileshareset %defattr(-,root,root) ++++++ kdebase-trinity-r1255714-nsplugin-fix-port-from-kde4.diff ++++++ Index: kdebase/nsplugins/sdk/npapi.h =================================================================== --- kdebase/nsplugins/sdk/npapi.h (revision 1255713) +++ kdebase/nsplugins/sdk/npapi.h (revision 1255714) @@ -256,6 +256,16 @@ uint32 end; uint32 lastmodified; void* notifyData; + const char* headers; /* Response headers from host. + * Exists only for >= NPVERS_HAS_RESPONSE_HEADERS. + * Used for HTTP only; NULL for non-HTTP. + * Available from NPP_NewStream onwards. + * Plugin should copy this data before storing it. + * Includes HTTP status line and all headers, + * preferably verbatim as received from server, + * headers formatted as in HTTP ("Header: Value"), + * and newlines (\n, NOT \r\n) separating lines. + * Terminated by \n\0 (NOT \n\n\0). */ } NPStream; @@ -602,6 +612,21 @@ #define NPVERS_68K_HAS_LIVECONNECT 11 #define NPVERS_HAS_WINDOWLESS 11 #define NPVERS_HAS_XPCONNECT_SCRIPTING 13 +// Trinity note: we claim 13 right now, though we do +// have response_headers. +#define NPVERS_HAS_NPRUNTIME_SCRIPTING 14 +#define NPVERS_HAS_FORM_VALUES 15 +#define NPVERS_HAS_POPUPS_ENABLED_STATE 16 +#define NPVERS_HAS_RESPONSE_HEADERS 17 +#define NPVERS_HAS_NPOBJECT_ENUM 18 +#define NPVERS_HAS_PLUGIN_THREAD_ASYNC_CALL 19 +#define NPVERS_HAS_ALL_NETWORK_STREAMS 20 +#define NPVERS_HAS_URL_AND_AUTH_INFO 21 +#define NPVERS_HAS_PRIVATE_MODE 22 +#define NPVERS_MACOSX_HAS_COCOA_EVENTS 23 +#define NPVERS_HAS_ADVANCED_KEY_HANDLING 25 +#define NPVERS_HAS_URL_REDIRECT_HANDLING 26 +#define NPVERS_HAS_CLEAR_SITE_DATA 27 /*----------------------------------------------------------------------*/ /* Function Prototypes */ Index: kdebase/nsplugins/viewer/nsplugin.cpp =================================================================== --- kdebase/nsplugins/viewer/nsplugin.cpp (revision 1255713) +++ kdebase/nsplugins/viewer/nsplugin.cpp (revision 1255714) @@ -1674,6 +1674,7 @@ _stream->pdata = 0; _stream->lastmodified = 0; _stream->notifyData = _notifyData; + _stream->headers = 0; _mimeType = mimeType; @@ -1898,6 +1899,7 @@ _job = KIO::get(KURL( url ), false, false); _job->addMetaData("errorPage", "false"); _job->addMetaData("AllowCompressedPage", "false"); + _job->addMetaData("PropagateHttpHeader", "true"); if (reload) { _job->addMetaData("cache", "reload"); } @@ -1925,6 +1927,7 @@ _job = KIO::http_post(KURL( url ), data, false); _job->addMetaData("content-type", args.contentType()); _job->addMetaData("errorPage", "false"); + _job->addMetaData("PropagateHttpHeader", "true"); _job->addMetaData("AllowCompressedPage", "false"); connect(_job, SIGNAL(data(KIO::Job *, const QByteArray &)), SLOT(data(KIO::Job *, const QByteArray &))); @@ -1964,13 +1967,13 @@ void NSPluginStream::mimetype(KIO::Job * job, const QString &mimeType) { - kdDebug(1431) << "NSPluginStream::QByteArray - job=" << (void*)job << " mimeType=" << mimeType << endl; + kdDebug(1431) << "NSPluginStream::mimetype - job=" << (void*)job << " mimeType=" << mimeType << endl; _mimeType = mimeType; + QString tmp_headers = job->metaData()["HTTP-Headers"]; + _headers.duplicate(tmp_headers.latin1(), tmp_headers.length()); + _stream->headers = _headers.data(); } - - - void NSPluginStream::resume() { if ( error() || tries()>8 ) { Index: kdebase/nsplugins/viewer/nsplugin.h =================================================================== --- kdebase/nsplugins/viewer/nsplugin.h (revision 1255713) +++ kdebase/nsplugins/viewer/nsplugin.h (revision 1255714) @@ -95,6 +95,7 @@ KURL _url; QString _fileURL; QString _mimeType; + QByteArray _headers; QByteArray _data; class KTempFile *_tempFile; continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
