[ktp-call-ui] fix FTBFS when using compat-telepathy-farstream
Rex Dieter
rdieter at fedoraproject.org
Tue Dec 18 17:35:05 UTC 2012
commit 00204c0daab947f820a64cf551ad16f3cc77a547
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Tue Dec 18 11:34:03 2012 -0600
fix FTBFS when using compat-telepathy-farstream
Don't directly rely on 'pkg-config telepathy-farstream'
but use instead: 'pkg-config TelepathyQt4Farstream'
ktp-call-ui-0.5.2-farstream_compat.patch | 27 +++++++++++++++++++++++++++
ktp-call-ui.spec | 8 +++++++-
2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/ktp-call-ui-0.5.2-farstream_compat.patch b/ktp-call-ui-0.5.2-farstream_compat.patch
new file mode 100644
index 0000000..ecacd3e
--- /dev/null
+++ b/ktp-call-ui-0.5.2-farstream_compat.patch
@@ -0,0 +1,27 @@
+diff -up ktp-call-ui-0.5.2/libqtf/CMakeLists.txt.farstream_compat ktp-call-ui-0.5.2/libqtf/CMakeLists.txt
+--- ktp-call-ui-0.5.2/libqtf/CMakeLists.txt.farstream_compat 2012-12-15 20:05:38.000000000 -0600
++++ ktp-call-ui-0.5.2/libqtf/CMakeLists.txt 2012-12-18 11:30:50.110625464 -0600
+@@ -2,12 +2,12 @@
+ # since gnome people like to include as many headers as possible
+ # in their public headers instead of doing forward declarations.
+ find_package(PkgConfig REQUIRED)
+-pkg_check_modules(TP_FARSTREAM REQUIRED telepathy-farstream)
++pkg_check_modules(TP_QT4_FARSTREAM REQUIRED TelepathyQt4Farstream)
+ pkg_check_modules(FARSTREAM REQUIRED farstream-0.1)
+
+ include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+- ${TP_FARSTREAM_INCLUDE_DIRS}
++ ${TP_QT4_FARSTREAM_INCLUDE_DIRS}
+ ${FARSTREAM_INCLUDE_DIRS}
+ ${TELEPATHY_QT4_FARSTREAM_INCLUDE_DIR}
+ )
+@@ -22,7 +22,7 @@ kde4_add_library(qtf STATIC qtf.cpp)
+
+ target_link_libraries(qtf
+ ${QTGSTREAMER_LIBRARIES}
+- ${TP_FARSTREAM_LDFLAGS}
++ ${TP_QT4_FARSTREAM_LDFLAGS}
+ ${FARSTREAM_LDFLAGS}
+ ${TELEPATHY_QT4_FARSTREAM_LIBRARIES}
+ )
diff --git a/ktp-call-ui.spec b/ktp-call-ui.spec
index 9120917..fffb891 100644
--- a/ktp-call-ui.spec
+++ b/ktp-call-ui.spec
@@ -9,11 +9,15 @@ License: GPLv2+
URL: https://projects.kde.org/projects/extragear/network/telepathy/%{name}
Source0: http://download.kde.org/unstable/kde-telepathy/%{version}/src/%{name}-%{version}.tar.bz2
+# don't directly rely on 'pkg-config telepathy-farstream'
+# but use instead: 'pkg-config TelepathyQt4Farstream'
+Patch1: ktp-call-ui-0.5.2-farstream_compat.patch
+
BuildRequires: gettext
BuildRequires: kdelibs4-devel
BuildRequires: ktp-common-internals-devel >= %{version}
BuildRequires: pkgconfig(QtGStreamer-0.10)
-BuildRequires: pkgconfig(telepathy-farstream)
+BuildRequires: pkgconfig(TelepathyQt4Farstream)
Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
Requires: ktp-accounts-kcm
@@ -24,6 +28,8 @@ Requires: ktp-accounts-kcm
%prep
%setup -q -n ktp-call-ui-%{version}
+%patch1 -p1 -b .farstream_compat
+
%build
mkdir -p %{_target_platform}
More information about the scm-commits
mailing list