rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sync from kdelibs3/devel: 

* Tue Aug 26 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-1
- kde-3.5.10

* Fri Aug 22 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-18
- fix build against Rawhide kernel headers (fix flock and flock64 redefinition)

* Fri Aug 22 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-17
- fix logic error in OnlyShowIn=KDE3 patch

* Wed Jul 02 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-16
- f9+: use drkonqi from KDE 4 kdebase-runtime in KCrash (#453243)

* Wed Jun 04 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-15
- set include_crystalsvg to 1 everywhere
- use Epoch 1 for crystalsvg-icon-theme, add Obsoletes

* Tue Jun 03 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-14
- revert kdeui symlink hack (there be dragons)
- unbreak -apidocs, add %%check so this never ever happens again

* Sat May 24 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-13
- f9+: include kdeui symlink here + scriptlets to help rpm handle it

* Fri May 23 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-12
- f9+: omit %%{_datadir}/apps/kdeui, use version from kdelibs-common (rh#447965, kde#157850)

* Thu May 15 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-11
- (Only|Not)ShowIn=KDE3 patch (helps #446466)

* Thu May 15 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-10
- fix kresources.desktop: NoDisplay=true

* Mon Apr 14 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-8
- omit Requires: kdndsd-avahi (#441222)

* Wed Apr 02 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-7
- more qt->qt3 fixes

* Tue Mar 25 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-6
- s/qt-devel/qt3-devel/
This commit is contained in:
Kevin Kofler 2008-09-02 17:24:54 +00:00
parent 92e0f09493
commit accd83f770
3 changed files with 62 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
kdelibs-3.5.9-KDE3.patch Normal file
View File

@ -0,0 +1,41 @@
diff -up kdelibs-3.5.9/kio/kio/kservice.cpp.KDE3 kdelibs-3.5.9/kio/kio/kservice.cpp
--- kdelibs-3.5.9/kio/kio/kservice.cpp.KDE3 2008-02-13 03:41:06.000000000 -0600
+++ kdelibs-3.5.9/kio/kio/kservice.cpp 2008-05-15 15:36:13.000000000 -0500
@@ -701,7 +701,7 @@ bool KService::noDisplay() const {
{
QString aValue = it.data().toString();
QStringList aList = QStringList::split(';', aValue);
- if (!aList.contains("KDE"))
+ if (!(aList.contains("KDE") || aList.contains("KDE3")) )
return true;
}
@@ -710,7 +710,7 @@ bool KService::noDisplay() const {
{
QString aValue = it.data().toString();
QStringList aList = QStringList::split(';', aValue);
- if (aList.contains("KDE"))
+ if (aList.contains("KDE") || aList.contains("KDE3"))
return true;
}
diff -up kdelibs-3.5.9/kio/kio/kservicegroup.cpp.KDE3 kdelibs-3.5.9/kio/kio/kservicegroup.cpp
--- kdelibs-3.5.9/kio/kio/kservicegroup.cpp.KDE3 2007-05-14 02:52:35.000000000 -0500
+++ kdelibs-3.5.9/kio/kio/kservicegroup.cpp 2008-05-15 15:39:34.000000000 -0500
@@ -76,12 +76,14 @@ KServiceGroup::KServiceGroup( const QStr
QStringList tmpList;
if (config.hasKey("OnlyShowIn"))
{
- if (!config.readListEntry("OnlyShowIn", ';').contains("KDE"))
+ QStringList onlyShowInList = config.readListEntry("OnlyShowIn", ';');
+ if (! (onlyShowInList.contains("KDE") || onlyShowInList.contains("KDE3")))
d->m_bNoDisplay = true;
}
if (config.hasKey("NotShowIn"))
{
- if (config.readListEntry("NotShowIn", ';').contains("KDE"))
+ QStringList notShowInList = config.readListEntry("NotShowIn", ';');
+ if (notShowInList.contains("KDE") || notShowInList.contains("KDE3"))
d->m_bNoDisplay = true;
}

21
kdelibs-3.5.9-drkonqi-kde4.patch Normal file
View File

@ -0,0 +1,21 @@
diff -ur kdelibs-3.5.9/kdecore/kcrash.cpp kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp
--- kdelibs-3.5.9/kdecore/kcrash.cpp 2007-01-15 12:34:17.000000000 +0100
+++ kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp 2008-07-02 08:24:37.000000000 +0200
@@ -158,7 +158,7 @@
int i = 0;
// argument 0 has to be drkonqi
- argv[i++] = "drkonqi";
+ argv[i++] = "/usr/libexec/kde4/drkonqi";
#if defined Q_WS_X11
// start up on the correct display
@@ -325,7 +325,7 @@
_exit(253);
if(!geteuid() && setuid(getuid()) < 0)
_exit(253);
- execvp("drkonqi", const_cast< char** >( argv ));
+ execv("/usr/libexec/kde4/drkonqi", const_cast< char** >( argv ));
_exit(errno);
}
else

11
kdelibs-3.5.9-kate-regression.patch
View File

@ -1,11 +0,0 @@
--- kdelibs/kate/part/katesupercursor.cpp 2008/02/08 14:17:43 772352
+++ kdelibs/kate/part/katesupercursor.cpp 2008/02/20 11:02:18 777286
@@ -186,7 +186,7 @@
{
if (newLine)
{
- if (m_line > int(line) || (m_line == int(line) && m_col > int(col)))
+ if (m_line > int(line) || (m_line == int(line) && m_col >= int(col)))
{
if(m_line == int(line))
m_col -= col;