[audex] Fix building against kde 4.5.

Adam Tkac atkac at fedoraproject.org
Fri Aug 20 13:29:57 UTC 2010


commit e88977e0be505d9d1074c5d07f50db1d30a17e9e
Author: Adam Tkac <atkac at redhat.com>
Date:   Fri Aug 20 15:29:43 2010 +0200

    Fix building against kde 4.5.
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 audex-kde45-build.patch |   12 ++++++++++++
 audex.spec              |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/audex-kde45-build.patch b/audex-kde45-build.patch
new file mode 100644
index 0000000..e4d8c5d
--- /dev/null
+++ b/audex-kde45-build.patch
@@ -0,0 +1,12 @@
+diff -up audex/models/cddamodel.h.build audex/models/cddamodel.h
+--- audex/models/cddamodel.h.build	2010-08-20 15:22:28.891144472 +0200
++++ audex/models/cddamodel.h	2010-08-20 15:22:34.652104520 +0200
+@@ -240,7 +240,7 @@ private slots:
+ 
+ private:
+   QString _device;
+-  KCompactDisc::KCompactDisc *compact_disc;
++  KCompactDisc *compact_disc;
+   KCDDB::Client *cddb;
+   KCDDB::CDInfo cd_info;
+   CachedImage *_cover;
diff --git a/audex.spec b/audex.spec
index 0dba5c7..e85a7a6 100644
--- a/audex.spec
+++ b/audex.spec
@@ -1,6 +1,6 @@
 Name:           audex
 Version:        0.72
-Release:        0.7.beta1%{?dist}
+Release:        0.8.beta1%{?dist}
 Summary:        Audio ripper
 Group:          Applications/Multimedia
 License:        GPLv3+
@@ -8,6 +8,7 @@ URL:            http://opensource.maniatek.de/audex/
 Source0:        http://opensource.maniatek.de/audex/files/audex-%{version}b1.tar.bz2
 Patch0:         KDE_4_4_compile_fix.patch
 Patch1:		dso-linking.patch
+Patch2:		audex-kde45-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs4-devel desktop-file-utils gettext
@@ -23,6 +24,7 @@ may change on the way to its first stable 1.0-release.
 %setup -qn audex
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -70,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_datadir}/kde4/apps/audex
 
 %changelog
+* Fri Aug 20 2010 Adam Tkac <atkac redhat com> 0.72-0.8.beta1
+- fix building against kde 4.5
+
 * Tue Mar 03 2010 Roland Wolters <wolters.liste at gmx.net> 0.72-0.7.beta1
 - Fix compile bug
 


More information about the scm-commits mailing list