fix knotify, workaround Qt 4.8 QUrl.toLocalFile behavior change (#749213)
This commit is contained in:
parent
34dd4a96ae
commit
47ce31f297
16
kdelibs-4.7.2-knotify_qt48_qurl.patch
Normal file
16
kdelibs-4.7.2-knotify_qt48_qurl.patch
Normal file
@ -0,0 +1,16 @@
|
||||
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
10
kdelibs.spec
@ -23,7 +23,7 @@
|
||||
|
||||
Summary: KDE Libraries
|
||||
Version: 4.7.2
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
@ -124,6 +124,10 @@ 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
|
||||
@ -319,6 +323,7 @@ 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
|
||||
@ -574,6 +579,9 @@ rm -rf %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Oct 26 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.2-4
|
||||
- fix knotify, workaround Qt 4.8 QUrl.toLocalFile behavior change (#749213)
|
||||
|
||||
* Tue Oct 25 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.2-3
|
||||
- no_libkactivities toggle, -devel: Provides: libkactivities-devel
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user