Thu Jun 24 14:00:00 2010 Than Ngo - 6:4.3.4-10 - Resolves: bz#587243, MultilibConflicts
Mon Jun 21 14:00:00 2010 Than Ngo - 6:4.3.4-9 - Resolves: bz#587243, MultilibConflicts
Tue Jun 1 14:00:00 2010 Than Ngo - 6:4.3.4-8 - Resolves: bz#597271, drop WebKit support in Qt
Mon May 10 14:00:00 2010 Than Ngo - 6:4.3.4-7 - Resolves: bz#590651, disable dot to reduce the apidoc size
Sat May 1 14:00:00 2010 Than Ngo - 6:4.3.4-6 - Redhat branding - make kdeinit4 quiet - backport to fix critical performance - backport to fix issue in printing on pages with form widgets
Fri Mar 26 13:00:00 2010 Than Ngo - 6:4.3.4-5 - rebuilt against qt-4.6.2
Fri Jan 22 13:00:00 2010 Than Ngo - 6:4.3.4-4 - backport 4.3.5 fixes
Fri Dec 18 13:00:00 2009 Than Ngo - 4.3.4-3 - fix bz#531211, backport sonnet patch, fix rendering issue in indic, asian, arabic languages - drop noarch hack
Fri Dec 4 13:00:00 2009 Than Ngo - 4.3.4-2 - add workaound for low-mem systems
Tue Dec 1 13:00:00 2009 Than Ngo - 4.3.4-1 - 4.3.4
Mon Nov 16 13:00:00 2009 Than Ngo - 4.3.3-5 - fix conditional
Fri Nov 13 13:00:00 2009 Rex Dieter - 4.3.3-4 - kubuntu_80_kaction_qt_keys.diff (#475247) - soprano_ver 2.3.1
Fri Nov 13 13:00:00 2009 Than Ngo - 4.3.3-3 - rhel cleanup, fix conditional for RHEL
Fri Nov 6 13:00:00 2009 Kevin Kofler - 4.3.3-2 - backport adFilteredBy API from trunk, required to build konq-plugins-4.3.3 - BR flex and bison for the Solid predicate parser - fix build of fakes.c due to missing #include
Fri Oct 30 13:00:00 2009 Rex Dieter - 4.3.3-1 - 4.3.3
Mon Oct 12 14:00:00 2009 Lukáš Tinkl - 4.3.2-4 - khtml kpart crasher nr. 2 (rev.1033984)
Thu Oct 8 14:00:00 2009 Rex Dieter - 4.3.2-3 - khtml kpart crasher (kde #207173/209876)
Wed Oct 7 14:00:00 2009 Than Ngo - 4.3.2-2 - fix a deadlock in KLocale
Mon Oct 5 14:00:00 2009 Than Ngo - 4.3.2-1 - 4.3.2
Wed Sep 23 14:00:00 2009 Rex Dieter - 4.3.1-7 - move /etc/profile.d/kde4.(sh|csh) to kde-settings (F-12+)
Mon Sep 21 14:00:00 2009 Than Ngo - 4.3.1-6 - use abrt for RHEL
Sat Sep 19 14:00:00 2009 Rex Dieter - 4.3.1-5 - groupdav connect to egroupware failed (kde#186763)
Fri Sep 18 14:00:00 2009 Kevin Kofler - 4.3.1-4 - ship kde4-doxygen.sh only in -devel (fix duplicate file)
Fri Sep 4 14:00:00 2009 Than Ngo - 4.3.1-3 - security fix for -CVE-2009-2702
Wed Sep 2 14:00:00 2009 Ben Boeckel - 4.3.1-2 - Patch for kde#160679
Fri Aug 28 14:00:00 2009 Than Ngo - 4.3.1-1 - 4.3.1 - openssl-1.0 build fixes
Wed Aug 26 14:00:00 2009 Rex Dieter - 4.3.0-8 - BR: xz-devel
Sun Aug 23 14:00:00 2009 Rex Dieter - 4.3.0-7 - buildsys_phonon patch (to be compatible with newer kde-qt.git qt builds)
Wed Aug 19 14:00:00 2009 Lukáš Tinkl - 4.3.0-6 - fix crash when editting toolbars (kdebug:200815)
Tue Aug 18 14:00:00 2009 Lukáš Tinkl - 4.3.0.5 - fix KDE bug #19538, copy file after rename uses old file name
Mon Aug 17 14:00:00 2009 Lukáš Tinkl - 4.3.0-4 - fix unmounting devices - fix copying URLs to clipboard (kdebug:170608)
Fri Aug 14 14:00:00 2009 Rex Dieter - 4.3.0-3 - kde4.(sh|csh): drop KDE_IS_PRELINKED for now (workaround bug #515539)
Wed Aug 5 14:00:00 2009 Rex Dieter - 4.3.0-2 - microblog crashes plasma on show friends toggle (kdebug#202550) - khtml crasher (kdebug#199557)
Sun Jul 26 14:00:00 2009 Kevin Kofler - 4.2.98-3 - fix CVE-2009-2537 - select length DoS - fix CVE-2009-1725 - crash, possible ACE in numeric character references - fix CVE-2009-1687 - possible ACE in KJS (FIXME: now aborts, so still crashes) - fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling - fix minimum strigi version (0.7, not 0.7.0, RPM thinks 0.7 < 0.7.0)
Tue Apr 28 14:00:00 2009 Lukáš Tinkl - 4.2.2-13 - upstream patch to fix GCC4.4 crashes in kjs (kdebug:189809)
Fri Apr 24 14:00:00 2009 Kevin Kofler - 4.2.2-12 - drop the PopupApplet configuration backports (#495998) for now, kconf_update does not work as expected for Plasma
Thu Apr 23 14:00:00 2009 Kevin Kofler - 4.2.2-11 - fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)
Thu Apr 23 14:00:00 2009 Kevin Kofler - 4.2.2-10 - fix the kconf_update scriptlet for #495998 (broken .upd syntax)
Tue Apr 21 14:00:00 2009 Than Ngo - 4.2.2-9 - don\'t let plasma appear over screensaver
Mon Apr 20 14:00:00 2009 Kevin Kofler 4.2.2-8 - fix Plasma PopupApplet configuration interfering with weather applet (#495998)
Sun Apr 19 14:00:00 2009 Rex Dieter 4.2.2-7 - fix and simplify the child struct disposal (kde#180785)
Sat Apr 18 14:00:00 2009 Rex Dieter 4.2.2-6 - squash leaky file descriptors in kdeinit (kde#180785,rhbz#484370)
Fri Apr 10 14:00:00 2009 Rex Dieter 4.2.2-5 - fix bidi-related hangs in khtml (kde#189161)
Wed Apr 8 14:00:00 2009 Than Ngo - 4.2.2-4 - upstream patch fix ReadOnlyPart crash for non-local file
Mon Mar 23 13:00:00 2009 Rex Dieter - 4.2.1-9 - scriptlet optimization
Thu Mar 19 13:00:00 2009 Rex Dieter - 4.2.1-8 - Provides: kdelibs4%{?_isa} ... (#491082)
Wed Mar 18 13:00:00 2009 Rex Dieter 4.2.1-7 - Provides: kross(javascript) kross(qtscript) (#490586)
Thu Mar 12 13:00:00 2009 Than Ngo - 4.2.1-6 - apply patch to fix encoding for Qt-4.5.0
Mon Mar 9 13:00:00 2009 Than Ngo - 4.2.1-5 - apply patch to fix issue in CSS style that causes konqueror shows a blank page
Thu Mar 5 13:00:00 2009 Rex Dieter - 4.2.1-4 - move designer plugins to main/runtime (#487622)
Sun Mar 1 13:00:00 2009 Than Ngo - 4.2.1-2 - respin
Fri Feb 27 13:00:00 2009 Than Ngo - 4.2.1-1 - 4.2.1
Thu Feb 26 13:00:00 2009 Than Ngo 4.2.0-17 - fix build issue against gcc44
Wed Feb 25 13:00:00 2009 Than Ngo - 4.2.0-16 - fix files conflicts with 3.5.x
Tue Feb 24 13:00:00 2009 Kevin Kofler - 4.2.0-15 - fix crash in ~KMainWindow triggered by sending messages in KNode (kde#182322)
Mon Feb 23 13:00:00 2009 Rex Dieter - 4.2.0-14 - (Build)Req: soprano(-devel) >= 2.2 - devel: drop Req: zlib-devel libutempter-devel
Wed Feb 18 13:00:00 2009 Kevin Kofler - 4.2.0-13 - disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
Thu Feb 12 13:00:00 2009 Than Ngo - 4.2.0-11 - make plasma work better with Qt 4.5 (when built against Qt 4.5) - add gcc44-workaround
Fri Feb 6 13:00:00 2009 Than Ngo - 4.2.0-10 - Fix duplicated applications in the K menu and in keditfiletype
Thu Feb 5 13:00:00 2009 Rex Dieter 4.2.0-9 - ssl/proxy patch (kde#179934)
Sat Jan 31 13:00:00 2009 Rex Dieter 4.2.0-8 - unowned dirs (#483315,#483318)
Fri Jan 30 13:00:00 2009 Rex Dieter 4.2.0-7 - kded/kdirwatch patch (kde#182472)
Fri Jan 30 13:00:00 2009 Lukáš Tinkl 4.2.0-6 - Emit the correct FilesRemoved signal if the job was aborted in the middle of its operation, otherwise it can result in confusion and data loss (overwriting files with files that don\'t exist). kdebug:118593 - Fix \"klauncher hangs when kdeinit4 dies\" -- this happened because klauncher was doing a blocking read forever. - Repair klauncher support for unique-applications like konsole. kdebug:162729, kdebug:75492
Fri Jan 30 13:00:00 2009 Kevin Kofler - 4.2.0-5 - reenable PolicyKit and NTFS workarounds
Mon Jan 26 13:00:00 2009 Rex Dieter - 4.2.0-4 - revert Requires: qt4%{_isa}
Mon Jan 26 13:00:00 2009 Rex Dieter - 4.2.0-3 - respun tarball
Mon Jan 26 13:00:00 2009 Rex Dieter - 4.2.0-2 - plasma-on-screensaver-security patch - (Build)Req: automoc4 >= 0.9.88, phonon(-devel) >= 4.3.0 - Requires: strigi-libs >= 0.6.3 - use %{?_isa} to avoid potential multilib heartbreak
Thu Jan 22 13:00:00 2009 Than Ngo - 4.2.0-1 - 4.2.0
Fri Jan 16 13:00:00 2009 Than Ngo - 4.1.96-9 - drop kdelibs-4.1.85-plasma-default-wallpaper.patch, it\'s not needed since new plasma allows to define default wallpaper, new kde-setting is required - backport fix from trunk to allow symlinks in wallpaper theme
Fri Jan 16 13:00:00 2009 Kevin Kofler - 4.1.96-8 - rebuild for new OpenSSL
Mon Jan 12 13:00:00 2009 Rex Dieter - 4.1.96-7 - Slight speedup to profile.d/kde.sh (#465370) - (Build)Req: strigi(-devel) >= 0.6.3
Mon Jan 12 13:00:00 2009 Than Ngo - 4.1.96-6 - fix a crash (appearing in KSMServer)
Sat Jan 10 13:00:00 2009 Than Ngo - 4.1.96-5 - kdeworkspace cmake files in correct place
Fri Jan 9 13:00:00 2009 Rex Dieter - 4.1.96-4 - bump min deps (cmake, kde-filesystem, phonon) - kde.(sh|csh): cleanup QT_PLUGIN_PATH handling (#477095) - Requires: coreutils grep
Fri Jan 9 13:00:00 2009 Than Ngo - 4.1.96-3 - BR soprano >= 2.1.64
Thu Jan 8 13:00:00 2009 Than Ngo - 4.1.96-2 - kdepim cmake files in correct place
Wed Jan 7 13:00:00 2009 Than Ngo - 4.1.96-1 - 4.2rc1
Fri Dec 19 13:00:00 2008 Kevin Kofler 4.1.85-6 - add plasma-default-wallpaper libplasma patch from kdebase-workspace-4.1
Tue Dec 16 13:00:00 2008 Rex Dieter 4.1.85-5 - respun tarball, integrates kde-l10n-systemsettings patch
Tue Dec 16 13:00:00 2008 Than Ngo - 4.1.85-4 - add missing ENTITY systemsettings in pt, that fixes kde-l10 build breakage
Mon Dec 15 13:00:00 2008 Than Ngo - 4.1.85-3 - add missing ENTITY systemsettings in ru/gl/es/pt, that fixes kde-l10 build breakage - rename suffix .xxcmake to avoid install .cmake
Sun Dec 14 13:00:00 2008 Kevin Kofler - 4.1.85-2 - tweak parallel_devel patch to get a -L flag for the symlink directory
Thu Dec 11 13:00:00 2008 Than Ngo - 4.1.85-1 - 4.2beta2
Tue Dec 9 13:00:00 2008 Lorenzo Villani - 6:4.1.82-2 - rebase parallel devel patch and kde149705 patch
Mon Dec 8 13:00:00 2008 Lorenzo Villani - 6:4.1.82-1 - 4.1.82
Tue Nov 25 13:00:00 2008 Kevin Kofler 4.1.80-5 - remove workaround BR on phonon-backend-gstreamer, it\'s ineffective since phonon now explicitly Requires: phonon-backend-xine and the dependency is no longer circular anyway - update parallel_devel patch - fix minimum strigi version (only 0.5.9 needed)
Tue Nov 25 13:00:00 2008 Than Ngo 4.1.80-4 - respin
Thu Nov 20 13:00:00 2008 Rex Dieter 4.1.80-3 - -devel: Provides: plasma-devel
Thu Nov 20 13:00:00 2008 Than Ngo 4.1.80-2 - merged
Thu Nov 20 13:00:00 2008 Lorenzo Villani - 6:4.1.80-1 - 4.1.80 - BR strigi 0.60 - BR cmake 2.6 - make install/fast - rebase policykit patch - rebase cmake patch - rebase a couple of patches and drop _default_patch_fuzz 2
Wed Nov 12 13:00:00 2008 Than Ngo 4.1.3-1 - 4.1.3
Fri Nov 7 13:00:00 2008 Rex Dieter 4.1.2-6 - backport http_cache_cleaner fix (kdebug:172182)
Wed Oct 15 14:00:00 2008 Lukáš Tinkl 4.1.2-5 - backport fix for faulty window resizing (kdebug:172042)
Mon Oct 13 14:00:00 2008 Than Ngo 4.1.2-4 - backport patch to fix crash kded startup crash
Wed Oct 8 14:00:00 2008 Than Ngo 4.1.2-3 - backport fix for google maps
Sun Sep 28 14:00:00 2008 Rex Dieter 4.1.2-2 - make VERBOSE=1 - respin against new(er) kde-filesystem
Thu Sep 25 14:00:00 2008 Rex Dieter 4.1.2-1 - kde-4.1.2
Fri Sep 19 14:00:00 2008 Kevin Kofler 4.1.1-12 - make \"Stop Animations\" work again in Konqueror (KDE 4 regression kde#157789)
Thu Sep 18 14:00:00 2008 Than Ngo 4.1.1-11 - apply upstream patch to fix the regression - drop the kdelibs-4.1.1-bz#461725-regression.patch
Thu Sep 18 14:00:00 2008 Lukáš Tinkl 4.1.1-10 - Fix file association bug, the global mimeapps.list file had priority over the local one. - khtml scroll crash fix (kdebug:170880) - Don\'t eat text when the emoticons were not installed. This fixes mail text not being displayed in KMail when kdebase-runtime wasn\'t installed.
Wed Sep 17 14:00:00 2008 Than Ngo 4.1.1-9 - #461725, revert the patch to fix the regression
Sat Sep 13 14:00:00 2008 Than Ngo 4.1.1-8 - fix kdelibs-4.1.1-kdeui-widgets-fixes.patch
Sat Sep 13 14:00:00 2008 Than Ngo 4.1.1-7 - remove redundant FEDORA, use CMAKE_BUILD_TYPE=release - fix install problem with cmake > 2.5
Mon Sep 8 14:00:00 2008 Lukáš Tinkl 4.1.1-6 - fix crashes in plugin selector - fix problems in various kdeui widgets
Wed Sep 3 14:00:00 2008 Lukáš Tinkl 4.1.1-5 - fixed crash on setting cookies on empty domains (like the file system), KDE bug #170147 - fix URL navigator focus in file dialogs, KDE bug #169497, #170211
Tue Sep 2 14:00:00 2008 Than Ngo 4.1.1-4 - apply patch to fix regression in khtml
Mon Sep 1 14:00:00 2008 Than Ngo 4.1.1-3 - respun
Fri Aug 29 14:00:00 2008 Kevin Kofler 4.1.1-2 - fix #455130 (kinit crashing in kglobalconfig with no KComponentData) properly - drop revert-kinit-regression hack (fixes ioslave translations)
Fri Aug 29 14:00:00 2008 Than Ngo 4.1.1-1 - 4.1.1
Fri Aug 29 14:00:00 2008 Kevin Kofler 4.1.0-9 - -devel: +Requires: libutempter-devel (cmake wants to link it in)
Thu Aug 28 14:00:00 2008 Kevin Kofler 4.1.0-8 - rewrite kstandarddirs patch to fix side effects (#459904 (KDEDIRS), #457633)
Mon Aug 25 14:00:00 2008 Than Ngo 4.1.0-7 - konsole doesn\'t write to utmp
Sat Aug 23 14:00:00 2008 Kevin Kofler 4.1.0-6 - don\'t hide KDE 3 KCMs in kde4-applications.menu, not needed with our OnlyShowIn=KDE3 patch and breaks KDE 3 KCMs (kcmshell, apps) in KDE 4 sessions
Sun Aug 10 14:00:00 2008 Kevin Kofler 4.1.0-5 - fix kcookiejar crash on invalid cookie file from KDE 3 (patch by David Faure)
Fri Aug 1 14:00:00 2008 Rex Dieter 4.1.0-4 - -devel: Requires: phonon-devel >= 4.2 (helps multilib upgrades) - konq processes never terminate (kde#167826, rh#457526)
Thu Jul 24 14:00:00 2008 Kevin Kofler 4.1.0-2 - move Sonnet documentation back to the main package - fix #341751 (Sonnet documentation multilib conflict) properly
Wed Jul 23 14:00:00 2008 Than Ngo 4.1.0-1 - 4.1.0
Sun Jul 20 14:00:00 2008 Kevin Kofler 4.0.99-3 - fix kstandarddirs patch to always append the installed location last, even if it is already present earlier in the search path (#456004)
Sat Jul 19 14:00:00 2008 Rex Dieter 4.0.99-2 - use better fedora-buildtype patch from F-9 branch
Fri Jul 18 14:00:00 2008 Rex Dieter 4.0.99-1 - 4.0.99
Sun Jul 6 14:00:00 2008 Rex Dieter 4.0.85-1 - 4.0.85
Fri Jun 27 14:00:00 2008 Rex Dieter 4.0.84-1 - 4.0.84
Fri Jun 27 14:00:00 2008 Kevin Kofler - 4.0.83-3 - fix kstandarddirs patch so /usr/libexec/kde4 is found (#453063)
Wed Jun 25 14:00:00 2008 Rex Dieter 4.0.83-2 - -common: move /usr/share/doc/HTML/en/sonnet/ here (#341751)
Thu Jun 19 14:00:00 2008 Than Ngo 4.0.83-1 - 4.0.83 (beta2)
Fri Jun 13 14:00:00 2008 Than Ngo 4.0.82-1 - 4.0.82
Fri May 30 14:00:00 2008 Than Ngo 4.0.80-2 - fix #447965, order issue in kde path, thanks to Kevin - backport patch to check html style version
Mon May 26 14:00:00 2008 Than Ngo 4.0.80-1 - 4.1 beta1
Sat May 24 14:00:00 2008 Rex Dieter - 4.0.72-8 - revert previous, don\'t include kde3-compat symlink (here, anyway)
Fri May 23 14:00:00 2008 Rex Dieter - 4.0.72-7 - -common: provide %_datadir/apps/kdeui for kde3 apps (#447965)
Thu May 22 14:00:00 2008 Rex Dieter - 4.0.72-6 - kstandarddirs hack to search /etc/kde
Thu May 22 14:00:00 2008 Kevin Kofler - 4.0.72-5 - keep libphonon.so in %{_libdir} for non-KDE apps (#447831)
Thu May 15 14:00:00 2008 Kevin Kofler - 4.0.72-4 - fix proxy support (#443931, kde#155707) - move %{_kde4_appsdir}/ksgmltools2/ from -devel to the main package (#446435)
Tue May 13 14:00:00 2008 Kevin Kofler - 4.0.72-3 - drop no longer needed ALSA default device Phonon hack
Sun May 4 14:00:00 2008 Kevin Kofler - 4.0.72-2 - BR new minimum versions of qt4-devel and soprano-devel
Fri May 2 14:00:00 2008 Kevin Kofler - 4.0.72-1 - update to 4.0.72 (4.1 alpha 1) - parallel_devel patch ported by Lorenzo Villani - update file list (Lorenzo Villani) - drop upstreamed khtml-security, kconfig_sync_crash and klauncher-crash patches - update xdg-menu (Administration menu) patch
Thu Apr 3 14:00:00 2008 Lukáš Tinkl 4.0.3-4 - rebuild for the new %{_kde4_buildtype}
Mon Mar 31 14:00:00 2008 Kevin Kofler 4.0.3-3 - patch and update file list for _kde4_libexecdir
Mon Mar 31 14:00:00 2008 Kevin Kofler 4.0.3-2 - add Fedora build type (uses -DNDEBUG)
Fri Mar 28 13:00:00 2008 Than Ngo 4.0.3-1 - 4.0.3 - -apidocs: drop Requires: %name
Fri Mar 28 13:00:00 2008 Than Ngo - 4.0.2-13 - add Administration menu, bz#439378
Thu Mar 27 13:00:00 2008 Than Ngo 4.0.2-12 - bz#428212, adapted Kevin Kofler\'s workaround for Policykit
Thu Mar 20 13:00:00 2008 Rex Dieter 4.0.2-11 - apidocs subpackage should be noarch (#436579)
Mon Mar 10 13:00:00 2008 Kevin Kofler 4.0.2-10 - work around #436725: BR: libtool-ltdl so graphviz gets a valid libltdl
Mon Mar 10 13:00:00 2008 Kevin Kofler 4.0.2-9 - fix kdeglobals not being found in profile (e.g. kde-settings) directory
Fri Mar 7 13:00:00 2008 Rex Dieter 4.0.2-8 - touchup KDE_DISTRIBUTION_TEXT - add Fedora/V-R to KHTML UA string (thanks caillon)
Thu Mar 6 13:00:00 2008 Kevin Kofler 4.0.2-7 - exclude apidocs from the main package
Thu Mar 6 13:00:00 2008 Than Ngo 4.0.2-6 - apply upstream patch to fix issue in KPropertiesDialog
Thu Mar 6 13:00:00 2008 Kevin Kofler 4.0.2-5 - also install Doxyfile.global in -common to build kdepimlibs-apidocs against
Wed Mar 5 13:00:00 2008 Kevin Kofler 4.0.2-4 - install all .css files in kdelibs-common to build kdepimlibs-apidocs against - install doxygen.sh as kde4-doxygen.sh in -devel - build apidocs and put them into an -apidocs subpackage (can be turned off) - BR doxygen, graphviz and qt4-doc when building apidocs
Fri Feb 29 13:00:00 2008 Than Ngo 4.0.2-3 - rebuilt
Fri Feb 29 13:00:00 2008 Kevin Kofler 4.0.2-2 - drop obsolete kde#149703 patch (fixed upstream by code rewrite) - drop backports from 4.0.2: objectembed-handling, autostart, kde#771201-khtml
Thu Feb 28 13:00:00 2008 Than Ngo 4.0.2-1 - 4.0.2
Wed Feb 27 13:00:00 2008 Lukáš Tinkl - 4.0.1-8 - add Fedora branding to the package (#434815)
Mon Feb 25 13:00:00 2008 Rex Dieter 4.0.1-7 - -devel: own %_kde4_libdir/kde4/plugins (thanks wolfy!)
Tue Feb 19 13:00:00 2008 Kevin Kofler 4.0.1-6 - fix running KDE 3 apps as filetype viewers from KDE 4 Dolphin
Mon Feb 18 13:00:00 2008 Rex Dieter 4.0.1-5 - -devel: include %_kde4_appsdir/cmake here (#341751)
Wed Feb 6 13:00:00 2008 Than Ngo 4.0.1-4 - upstream patch to make sure that static widget is always at position 0,0
Fri Feb 1 13:00:00 2008 Than Ngo 4.0.1-3 - upstream patch to fix a regression in
