- (Only|Not)ShowIn=KDE3 patch (helps #446466)
This commit is contained in:
parent
7c8f77e4b3
commit
fbcc4de434
41
kdelibs-3.5.9-KDE3.patch
Normal file
41
kdelibs-3.5.9-KDE3.patch
Normal 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;
|
||||||
|
}
|
||||||
|
|
@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
Summary: K Desktop Environment 3 - Libraries
|
Summary: K Desktop Environment 3 - Libraries
|
||||||
Version: 3.5.9
|
Version: 3.5.9
|
||||||
Release: 10%{?dist}
|
Release: 11%{?dist}
|
||||||
|
|
||||||
%if 0%{?fedora} > 8
|
%if 0%{?fedora} > 8
|
||||||
Name: kdelibs3
|
Name: kdelibs3
|
||||||
@ -69,6 +69,8 @@ Patch48: kdelibs-3.5.8-kspell-hunspell.patch
|
|||||||
Patch49: kdelibs-3.5.8-kspell2-enchant.patch
|
Patch49: kdelibs-3.5.8-kspell2-enchant.patch
|
||||||
Patch50: kdelibs-3.5.8-kspell2-no-ispell.patch
|
Patch50: kdelibs-3.5.8-kspell2-no-ispell.patch
|
||||||
Patch51: kdelibs-3.5.9-cupsserverbin.patch
|
Patch51: kdelibs-3.5.9-cupsserverbin.patch
|
||||||
|
# initial support for (Only|Not)ShowIn=KDE3
|
||||||
|
Patch52: kdelibs-3.5.9-KDE3.patch
|
||||||
|
|
||||||
# use /etc/kde in addition to /usr/share/config, borrowed from debian
|
# use /etc/kde in addition to /usr/share/config, borrowed from debian
|
||||||
Patch100: kdelibs-3.5.5-kstandarddirs.patch
|
Patch100: kdelibs-3.5.5-kstandarddirs.patch
|
||||||
@ -241,6 +243,7 @@ format for easy browsing
|
|||||||
%patch50 -p1 -b .no-ispell
|
%patch50 -p1 -b .no-ispell
|
||||||
%endif
|
%endif
|
||||||
%patch51 -p1 -b .cupsserverbin
|
%patch51 -p1 -b .cupsserverbin
|
||||||
|
%patch52 -p1 -b .KDE3
|
||||||
|
|
||||||
%patch100 -p1 -b .kstandarddirs
|
%patch100 -p1 -b .kstandarddirs
|
||||||
%patch101 -p1 -b .libtool-shlibext
|
%patch101 -p1 -b .libtool-shlibext
|
||||||
@ -575,7 +578,10 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu May 18 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-10
|
* 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
|
- fix kresources.desktop: NoDisplay=true
|
||||||
|
|
||||||
* Mon Apr 14 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-8
|
* Mon Apr 14 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-8
|
||||||
|
Loading…
Reference in New Issue
Block a user