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

omit knotify hack, fix in qt instead

This commit is contained in:
Rex Dieter 2011-10-28 22:42:37 -05:00
parent 47ce31f297
commit 28f81c0ef4
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kdelibs-4.7.2-knotify_qt48_qurl.patch
View File

@ -1,16 +0,0 @@
diff -up kdelibs-4.7.2/knotify/config/knotifyconfigactionswidget.cpp.qt48 kdelibs-4.7.2/knotify/config/knotifyconfigactionswidget.cpp
--- kdelibs-4.7.2/knotify/config/knotifyconfigactionswidget.cpp.qt48 2011-05-20 15:24:54.000000000 -0500
+++ kdelibs-4.7.2/knotify/config/knotifyconfigactionswidget.cpp 2011-10-26 14:18:14.000278236 -0500
@@ -129,6 +129,12 @@ void KNotifyConfigActionsWidget::slotPla
if ( soundURL.isRelative() )
{
QString soundString = soundURL.toLocalFile();
+ // hack around http://bugs.kde.org/285028
+ if ( soundString.isEmpty() )
+ {
+ soundURL.setUrl("file:" + soundURL.url());
+ soundString = soundURL.toLocalFile();
+ }
// we need a way to get the application name in order to ba able to do this :
/*QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile);
search = KGlobal::mainComponent().dirs()->findResource("data", search);

10
kdelibs.spec
View File

@ -23,7 +23,7 @@
Summary: KDE Libraries
Version: 4.7.2
Release: 4%{?dist}
Release: 5%{?dist}
Name: kdelibs
Epoch: 6
@ -124,10 +124,6 @@ Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch
# https://git.reviewboard.kde.org/r/101231/
Patch51: kdelibs-4.6.2-uri_mimetypes.patch
# workaround Qt 4.8 QUrl.toLocalFile behavior change
# http://bugzilla.redhat.com/749213
Patch52: kdelibs-4.7.2-knotify_qt48_qurl.patch
## upstream
# fix nepomuk queries *not* using wide-unicode
Patch100: kdelibs-4.7.2-nepomuk_unicode.patch
@ -323,7 +319,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
# upstreamable patches
%patch50 -p1 -b .knewstuff2_gpg2
%patch51 -p1 -b .uri_mimetypes
%patch52 -p1 -b .knotify_qt48_qurl
# upstream patches
%patch100 -p1 -b .nepomuk_unicode
@ -579,6 +574,9 @@ rm -rf %{buildroot}
%changelog
* Thu Oct 27 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.2-5
- omit knotify hack, fix in qt instead
* Wed Oct 26 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.2-4
- fix knotify, workaround Qt 4.8 QUrl.toLocalFile behavior change (#749213)