Hello community, here is the log from the commit of package telepathy-qt4 for openSUSE:Factory checked in at 2013-10-19 18:52:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/telepathy-qt4 (Old) and /work/SRC/openSUSE:Factory/.telepathy-qt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "telepathy-qt4" Changes: -------- --- /work/SRC/openSUSE:Factory/telepathy-qt4/telepathy-qt4.changes 2013-09-25 14:39:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.telepathy-qt4.new/telepathy-qt4.changes 2013-10-19 18:52:55.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Oct 19 13:32:36 UTC 2013 - [email protected] + +- Added fix-compilation-on-new-versions-of-cmake.patch from upstream, + fixes build with cmake >= 2.8.12 + +------------------------------------------------------------------- New: ---- fix-compilation-on-new-versions-of-cmake.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-qt4.spec ++++++ --- /var/tmp/diff_new_pack.UGhl5k/_old 2013-10-19 18:53:01.000000000 +0200 +++ /var/tmp/diff_new_pack.UGhl5k/_new 2013-10-19 18:53:01.000000000 +0200 @@ -37,6 +37,8 @@ Patch2: search-for-telepathy-farstream-0.4.diff # PATCH-FIX-UPSTREAM Fix-storing-avatars.patch -- fix storing avatars, so that they are not stored millions of times each (fdo#47647) Patch3: Fix-storing-avatars.patch +# PATCH-FIX-UPSTREAM fix-compilation-on-new-versions-of-cmake.patch +Patch4: fix-compilation-on-new-versions-of-cmake.patch BuildRequires: cmake BuildRequires: dbus-1-python BuildRequires: doxygen @@ -47,18 +49,18 @@ BuildRequires: pkgconfig(telepathy-glib) %if %farstream %if %gstreamer1 -BuildRequires: pkgconfig(telepathy-farstream) BuildRequires: pkgconfig(farstream-0.2) BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) +BuildRequires: pkgconfig(telepathy-farstream) %else -BuildRequires: pkgconfig(telepathy-farstream-0.4) BuildRequires: pkgconfig(farstream-0.1) BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) +BuildRequires: pkgconfig(telepathy-farstream-0.4) %endif %endif -BuildRoot: %{_tmppath}/telepathy-qt-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Telepathy-Qt4 is a high-level binding for Telepathy, similar to telepathy-glib but for Qt 4. @@ -113,6 +115,7 @@ %endif %endif %patch3 -p1 +%patch4 -p1 %build export CXXFLAGS="%{optflags}" ++++++ fix-compilation-on-new-versions-of-cmake.patch ++++++ >From 05fe3f4980bbc6b016e25dcf07e44afe29e377c0 Mon Sep 17 00:00:00 2001 From: David Edmundson <[email protected]> Date: Sun, 29 Sep 2013 22:19:27 +0000 Subject: Fix compilation on new versions of cmake Recent cmake has changed the argument count to qt4_create_moc_command, we need to adjust accordingly Reviewed-by: Dario Freddi <[email protected]> --- diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake index c2eac76..b3131f0 100644 --- a/cmake/modules/FindQt.cmake +++ b/cmake/modules/FindQt.cmake @@ -74,10 +74,18 @@ ENDMACRO(QT_GET_MOC_FLAGS) MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options) IF(QT_VERSION_MAJOR MATCHES 4) - QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") + IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "") + ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") + ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) ELSE(QT_VERSION_MAJOR MATCHES 4) IF(QT_VERSION_MAJOR MATCHES 5) - QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") + IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "") + ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") + ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) ENDIF(QT_VERSION_MAJOR MATCHES 5) ENDIF(QT_VERSION_MAJOR MATCHES 4) ENDMACRO(QT_CREATE_MOC_COMMAND) -- cgit v0.9.0.2-2-gbebe -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
