* Sun Aug 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-7

- buildsys_phonon patch (to be compatible with newer kde-qt.git qt builds)
This commit is contained in:
Rex Dieter 2009-08-23 18:43:21 +00:00
parent 92b7cabdc5
commit 201bc8f9b4
2 changed files with 22 additions and 1 deletions

View File

@ -0,0 +1,15 @@
diff -up kdelibs-4.3.0/cmake/modules/FindQt4.cmake.phonon kdelibs-4.3.0/cmake/modules/FindQt4.cmake
--- kdelibs-4.3.0/cmake/modules/FindQt4.cmake.phonon 2009-06-03 06:54:39.000000000 -0500
+++ kdelibs-4.3.0/cmake/modules/FindQt4.cmake 2009-08-23 13:20:43.382639081 -0500
@@ -739,9 +739,10 @@ IF (QT4_QMAKE_FOUND)
)
# Set QT_PHONON_INCLUDE_DIR
- FIND_PATH(QT_PHONON_INCLUDE_DIR phonon
+ FIND_PATH(QT_PHONON_INCLUDE_DIR Phonon
PATHS
${QT_INCLUDE_DIR}/phonon
+ ${QT_HEADERS_DIR}/phonon
NO_DEFAULT_PATH
)

View File

@ -4,7 +4,7 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.3.0
Release: 6%{?dist}
Release: 7%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@ -94,6 +94,7 @@ Patch103: kdelibs-4.3.1-copyurls.patch
Patch104: kdelibs-4.3.1-copyrename.patch
# http://bugs.kde.org/200815
Patch105: kdelibs-4.3.1-toolbarEditCrash.patch
Patch106: kdelibs-4.3.1-buildsys_phonon.patch
BuildRequires: qt4-devel >= 4.5.0
# qt4%{_?_isa} isn't provided yet -- Rex
@ -234,6 +235,8 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch103 -p0 -b .copyurls
%patch104 -p0 -b .copyrename
%patch105 -p0 -b .toolbarEditCrash
%patch106 -p1 -b .buildsys_phonon
%build
@ -415,6 +418,9 @@ rm -rf %{buildroot}
%changelog
* Sun Aug 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-7
- buildsys_phonon patch (to be compatible with newer kde-qt.git qt builds)
* Wed Aug 19 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.3.0-6
- fix crash when editting toolbars (kdebug:200815)