rpms/kdebase/FC-5 cr16-app-package_games_kids.png, NONE, 1.1 cr32-app-package_games_kids.png, NONE, 1.1 cr48-app-package_games_kids.png, NONE, 1.1 kdebase-3.5.4-kde#131770.patch, NONE, 1.1 kdebase-3.5.4-kde#133665.patch, NONE, 1.1 kdebase-3.5.4-kde#53642.patch, NONE, 1.1 kdebase-3.5.4-leaks.patch, NONE, 1.1 kdebase-3.5.4-tango-icon-theme.patch, NONE, 1.1 kdebase.spec, 1.186, 1.187 kdebase-3.5.4-konsole-bz#203221.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Sep 18 13:28:59 UTC 2006
Author: than
Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22509
Modified Files:
kdebase.spec
Added Files:
cr16-app-package_games_kids.png
cr32-app-package_games_kids.png
cr48-app-package_games_kids.png kdebase-3.5.4-kde#131770.patch
kdebase-3.5.4-kde#133665.patch kdebase-3.5.4-kde#53642.patch
kdebase-3.5.4-leaks.patch kdebase-3.5.4-tango-icon-theme.patch
Removed Files:
kdebase-3.5.4-konsole-bz#203221.patch
Log Message:
- apply upstream patch
fix #205701, no bold is displayed in konsole
fix two possible mem leaks
fix #53642, Menubar is always visible after coming back from fullscreen
fix #133665, crash in kiosk mode
- add missing icons for package_games_kids
- add more icon contexts (Tango icontheme)
kdebase-3.5.4-kde#131770.patch:
TECommon.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE kdebase-3.5.4-kde#131770.patch ---
Index: konsole/konsole/TECommon.h
===================================================================
--- konsole/konsole/TECommon.h (Revision 583167)
+++ konsole/konsole/TECommon.h (Revision 583168)
@@ -227,8 +227,8 @@
inline bool ca::isBold(const ColorEntry* base) const
{
- return (b.t == CO_DFT) && base[b.u+0+(b.v?BASE_COLORS:0)].bold
- || (b.t == CO_SYS) && base[b.u+2+(b.v?BASE_COLORS:0)].bold;
+ return (f.t == CO_DFT) && base[f.u+0+(f.v?BASE_COLORS:0)].bold
+ || (f.t == CO_SYS) && base[f.u+2+(f.v?BASE_COLORS:0)].bold;
}
#endif // TECOMMON_H
kdebase-3.5.4-kde#133665.patch:
kdiconview.cc | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
--- NEW FILE kdebase-3.5.4-kde#133665.patch ---
Index: kdesktop/kdiconview.cc
===================================================================
--- kdesktop/kdiconview.cc (Revision 581570)
+++ kdesktop/kdiconview.cc (Revision 581571)
@@ -1222,8 +1222,11 @@
QString actionText = KIO::pasteActionText();
bool paste = !actionText.isEmpty();
- if ( paste )
- m_actionCollection.action( "paste" )->setText( actionText );
+ if ( paste ) {
+ KAction* pasteAction = m_actionCollection.action( "paste" );
+ if ( pasteAction )
+ pasteAction->setText( actionText );
+ }
slotEnableAction( "paste", paste );
}
kdebase-3.5.4-kde#53642.patch:
konq_mainwindow.cc | 13 +++++++++----
konq_mainwindow.h | 2 ++
2 files changed, 11 insertions(+), 4 deletions(-)
--- NEW FILE kdebase-3.5.4-kde#53642.patch ---
Index: konqueror/konq_mainwindow.h
===================================================================
--- konqueror/konq_mainwindow.h (Revision 581611)
+++ konqueror/konq_mainwindow.h (Revision 581612)
@@ -749,6 +749,8 @@
bool m_urlCompletionStarted;
+ bool m_prevMenuBarVisible;
+
static bool s_preloaded;
static KonqMainWindow* s_preloadedWindow;
static int s_initialMemoryUsage;
Index: konqueror/konq_mainwindow.cc
===================================================================
--- konqueror/konq_mainwindow.cc (Revision 581611)
+++ konqueror/konq_mainwindow.cc (Revision 581612)
@@ -170,6 +170,8 @@
m_bViewModeToggled = false;
+ m_prevMenuBarVisible = true;
+
m_pViewManager = new KonqViewManager( this );
m_toggleViewGUIClient = new ToggleViewGUIClient( this );
@@ -3544,10 +3546,10 @@
plugActionList( "fullscreen", lst );
}
-
+ m_prevMenuBarVisible = menuBar()->isVisible();
menuBar()->hide();
m_paShowMenuBar->setChecked( false );
-
+
// Qt bug, the flags are lost. They know about it.
// happens only with the hackish non-_NET_WM_STATE_FULLSCREEN way
setWFlags( WDestructiveClose );
@@ -3571,8 +3573,11 @@
#endif
unplugActionList( "fullscreen" );
- menuBar()->show(); // maybe we should store this setting instead of forcing it
- m_paShowMenuBar->setChecked( true );
+ if (m_prevMenuBarVisible)
+ {
+ menuBar()->show();
+ m_paShowMenuBar->setChecked( true );
+ }
// Qt bug, the flags aren't restored. They know about it.
setWFlags( WType_TopLevel | WDestructiveClose );
kdebase-3.5.4-leaks.patch:
katemainwindow.cpp | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
--- NEW FILE kdebase-3.5.4-leaks.patch ---
Index: kate/app/katemainwindow.cpp
===================================================================
--- kate/app/katemainwindow.cpp (Revision 583755)
+++ kate/app/katemainwindow.cpp (Revision 583756)
@@ -615,18 +615,18 @@
{
KURL::List list;
list.append( m_viewManager->activeView()->getDoc()->url() );
- QString* appname = new QString( documentOpenWith->popupMenu()->text(idx) );
+ QString appname = documentOpenWith->popupMenu()->text(idx);
- *appname = appname->remove('&'); //Remove a possible accelerator ... otherwise the application might not get found.
- if ( appname->compare(i18n("Other...")) == 0 ) {
+ appname = appname.remove('&'); //Remove a possible accelerator ... otherwise the application might not get found.
+ if ( appname.compare(i18n("Other...")) == 0 ) {
// display "open with" dialog
- KOpenWithDlg* dlg = new KOpenWithDlg(list);
- if (dlg->exec())
- KRun::run(*dlg->service(), list);
+ KOpenWithDlg dlg(list);
+ if (dlg.exec())
+ KRun::run(*dlg.service(), list);
return;
}
- QString qry = QString("((Type == 'Application') and (Name == '%1'))").arg( appname->latin1() );
+ QString qry = QString("((Type == 'Application') and (Name == '%1'))").arg( appname.latin1() );
KMimeType::Ptr mime = KMimeType::findByURL( m_viewManager->activeView()->getDoc()->url() );
KTrader::OfferList offers = KTrader::self()->query(mime->name(), qry);
@@ -635,9 +635,7 @@
KRun::run(*app, list);
}
else
- KMessageBox::error(this, i18n("Application '%1' not found!").arg(appname->latin1()), i18n("Application Not Found!"));
-
-
+ KMessageBox::error(this, i18n("Application '%1' not found!").arg(appname.latin1()), i18n("Application Not Found!"));
}
void KateMainWindow::pluginHelp()
kdebase-3.5.4-tango-icon-theme.patch:
kdialog.cpp | 14 ++++++++++++++
1 files changed, 14 insertions(+)
--- NEW FILE kdebase-3.5.4-tango-icon-theme.patch ---
--- kdebase-3.5.4/kdialog/kdialog.cpp.orig 2006-05-22 20:12:42.000000000 +0200
+++ kdebase-3.5.4/kdialog/kdialog.cpp 2006-09-13 16:48:41.000000000 +0200
@@ -621,6 +621,20 @@
context = KIcon::Application;
else if ( contextStr == QString::fromLatin1( "Actions" ) )
context = KIcon::Action;
+ else if ( contextStr == QString::fromLatin1( "Animations" ) )
+ context = KIcon::Animation;
+ else if ( contextStr == QString::fromLatin1( "Categories" ) )
+ context = KIcon::Category;
+ else if ( contextStr == QString::fromLatin1( "Emblems" ) )
+ context = KIcon::Emblem;
+ else if ( contextStr == QString::fromLatin1( "Emotes" ) )
+ context = KIcon::Emote;
+ else if ( contextStr == QString::fromLatin1( "International" ) )
+ context = KIcon::International;
+ else if ( contextStr == QString::fromLatin1( "Places" ) )
+ context = KIcon::Place;
+ else if ( contextStr == QString::fromLatin1( "Status" ) )
+ context = KIcon::StatusIcon;
KIconDialog dlg(0, "icon dialog");
kapp->setTopWidget( &dlg );
Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- kdebase.spec 28 Aug 2006 12:57:52 -0000 1.186
+++ kdebase.spec 18 Sep 2006 13:28:57 -0000 1.187
@@ -16,7 +16,7 @@
Summary: K Desktop Environment - core files
Name: kdebase
Version: 3.5.4
-Release: 0.4.fc5
+Release: 0.5.fc5
Epoch: 6
Url: http://www.kde.org
Group: User Interface/Desktops
@@ -32,6 +32,9 @@
Source6: logrotate-kdm
Source7: mailsettings.cc
Source8: env.sh
+Source9: cr16-app-package_games_kids.png
+Source10: cr32-app-package_games_kids.png
+Source11: cr48-app-package_games_kids.png
Patch1: kdebase-3.5.4-2-redhat.patch
Patch2: kdebase-3.3.92-vroot.patch
@@ -51,14 +54,18 @@
Patch21: kdebase-3.5.3-khelpcenter-sort.patch
Patch22: kdebase-3.5.4-htdig.patch
Patch23: kdebase-3.5.4-antialias.patch
+Patch24: kdebase-3.5.4-tango-icon-theme.patch
# upstream patches
Patch100: kdebase-3.5.4-halbackend-dbus.patch
Patch101: kdebase-3.5.4-kde#128552.patch
Patch102: kdebase-3.5.4-kde#124116.patch
-Patch103: kdebase-3.5.4-konsole-bz#203221.patch
+Patch103: kdebase-3.5.4-kde#131770.patch
Patch104: kdebase-3.5.4-kde#132873.patch
Patch105: kdebase-3.5.4-kdm.patch
+Patch106: kdebase-3.5.4-kde#53642.patch
+Patch107: kdebase-3.5.4-kde#133665.patch
+Patch108: kdebase-3.5.4-leaks.patch
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
@@ -167,6 +174,7 @@
%patch21 -p1 -b .khelpcenter-sort
%patch22 -p1 -b .htdig
%patch23 -p1 -b .xft
+%patch24 -p1 -b .tango-icontheme
# upstream patches
%patch100 -p0 -b .halbackend-dbus
@@ -175,6 +183,9 @@
%patch103 -p0 -b .bz#203221
%patch104 -p0 -b .kde#132873
%patch105 -p0 -b .kdm-crash
+%patch106 -p0 -b .kde#53642
+%patch107 -p0 -b .kde#133665
+%patch108 -p0 -b .leaks
%if %{rhel}
rm -rf kdeprint/kdeprintfax
@@ -185,6 +196,9 @@
# set Konqueror version
perl -pi -e "s,^#define.*KONQUEROR_VERSION.*,#define KONQUEROR_VERSION \"%{version}-%{release} Fedore Core\"," konqueror/version.h
+# add missing icons for package_games_kids
+cp %{SOURCE9} %{SOURCE10} %{SOURCE11} pics/crystalsvg/
+
%build
# set some default enviroments
unset QTDIR && . /etc/profile.d/qt.sh
@@ -371,6 +385,10 @@
# exclude fonts.dir
rm -rf %{buildroot}%{_datadir}/fonts
+# rename to kde-games-kids as it's defined in applications.menu
+mv %{buildroot}%{_datadir}/desktop-directories/kde-games-kidsgames.directory \
+ %{buildroot}%{_datadir}/desktop-directories/kde-games-kids.directory
+
%clean
rm -rf %{buildroot}
@@ -537,6 +555,15 @@
%changelog
+* Mon Sep 18 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.5.fc5
+- apply upstream patch
+ fix #205701, no bold is displayed in konsole
+ fix two possible mem leaks
+ fix #53642, Menubar is always visible after coming back from fullscreen
+ fix #133665, crash in kiosk mode
+- add missing icons for package_games_kids
+- add more icon contexts (Tango icontheme)
+
* Mon Aug 28 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.4.fc5
- fix broken deps for s390(x)
--- kdebase-3.5.4-konsole-bz#203221.patch DELETED ---
More information about the fedora-cvs-commits
mailing list