commit telepathy-qt4 for openSUSE:Factory
Hello community,
here is the log from the commit of package telepathy-qt4 for openSUSE:Factory
checked in at 2017-08-10 13:46:04
Comparing /work/SRC/openSUSE:Factory/telepathy-qt4 (Old)
and /work/SRC/openSUSE:Factory/.telepathy-qt4.new (New)
Package is "telepathy-qt4"
Thu Aug 10 13:46:04 2017 rev:9 rq:513705 version:0.9.6.1
Changes:
--- /work/SRC/openSUSE:Factory/telepathy-qt4/telepathy-qt4.changes
2015-11-24 22:29:39.0 +0100
+++ /work/SRC/openSUSE:Factory/.telepathy-qt4.new/telepathy-qt4.changes
2017-08-10 13:46:13.631028182 +0200
@@ -1,0 +2,5 @@
+Tue Aug 1 12:46:54 UTC 2017 - wba...@tmo.at
+
+- Fix package summaries (boo#956209)
+
+---
Other differences:
--
++ telepathy-qt4.spec ++
--- /var/tmp/diff_new_pack.v99c3Y/_old 2017-08-10 13:46:14.986837311 +0200
+++ /var/tmp/diff_new_pack.v99c3Y/_new 2017-08-10 13:46:15.014833369 +0200
@@ -74,7 +74,7 @@
Telepathy-Qt4 is a high-level binding for Telepathy, similar to telepathy-glib
but for Qt 4.
%package -n %{libname}-%{major}
-Summary:Library for performing syntax highlighting in Qt documents
+Summary:Qt4 bindings for the Telepathy Library
Group: Development/Tools/Other
Provides: %{name} = %{version}
Obsoletes: %{name} < %{version}
@@ -84,7 +84,7 @@
%if 0%{?farstream}
%package -n %{libname}-farstream%{major}
-Summary:Library for performing syntax highlighting in Qt documents
+Summary:Qt4 bindings for the Telepathy Library
Group: Development/Tools/Other
Obsoletes: %{libname}-farsight%{major}
commit telepathy-qt4 for openSUSE:Factory
Hello community,
here is the log from the commit of package telepathy-qt4 for openSUSE:Factory
checked in at 2015-11-24 22:29:38
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
2014-09-12 15:25:00.0 +0200
+++ /work/SRC/openSUSE:Factory/.telepathy-qt4.new/telepathy-qt4.changes
2015-11-24 22:29:39.0 +0100
@@ -1,0 +2,34 @@
+Sat Nov 21 08:59:24 UTC 2015 - m...@suse.com
+
+- Update to 0.9.6.1
+ Fixes:
+* Fixed illegal C++ statement in one of service interfaces.
+- Add fix-farstream-compilation-with-gstreamer-1.5.1.patch
+ * Fix compilation with GStreamer >= 1.5.1, only apply to openSUSE
+version >= 13.1
+- Add fix-compilation-with-old-cmake.patch
+ * Fix build with old cmake in earlier openSUSE version
+
+---
+Sat Nov 21 08:55:08 UTC 2015 - m...@suse.com
+
+- Update to 0.9.6
+ Enhancements:
+* Added TP_QT_VERSION and TP_QT_VERSION_CHECK macros
+ - Can be used like #if (TP_QT_VERSION == TP_QT_VERSION_CHECK(0, 9, 6))
+ - Absence of the TP_QT_VERSION macros indicates previous versions
+(might be useful for service bindings compatibility)
+* Added client side support for conference calls
+* Implemented numerous interfaces for service bindings
+
+ API changes:
+* Refactored service-side bindings API
+ - BaseConnection createChannel() and ensureChannel() methods
+now accept request map instead of several extracted values.
+ - BaseChannel::create() arguments reordered in natural way.
+
+ Fixes:
+* Fixed CallContent interfaces exposing (required for DTMF)
+* fd.0 #86312: Fixed condition in adaptor methods generation
+
+---
Old:
telepathy-qt-0.9.5.tar.gz
New:
fix-compilation-with-old-cmake.patch
fix-farstream-compilation-with-gstreamer-1.5.1.patch
telepathy-qt-0.9.6.1.tar.gz
Other differences:
--
++ telepathy-qt4.spec ++
--- /var/tmp/diff_new_pack.wmFepe/_old 2015-11-24 22:29:40.0 +0100
+++ /var/tmp/diff_new_pack.wmFepe/_new 2015-11-24 22:29:40.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package telepathy-qt4
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
%endif
Name: telepathy-qt4
-Version:0.9.5
+Version:0.9.6.1
Release:0
Summary:Qt4 bindings for the Telepathy Library
License:LGPL-2.1+
@@ -39,6 +39,10 @@
Patch1: search-for-farstream0.2.diff
# PATCH-FIX-UPSTREAM search-for-telepathy-farstream-0.4.diff -- searches for
telepathy-farstream-0.4
Patch2: search-for-telepathy-farstream-0.4.diff
+# PATCH-FIX-UPSTREAM fix-farstream-compilation-with-gstreamer-1.5.1.patch
m...@suse.com
+Patch3: fix-farstream-compilation-with-gstreamer-1.5.1.patch
+# PATCH-FIX-OPENSUSE fix-compilation-with-old-cmake.patch m...@suse.com --
somehow old cmake do not like relative path
+Patch4: fix-compilation-with-old-cmake.patch
BuildRequires: cmake
BuildRequires: dbus-1-python
BuildRequires: doxygen
@@ -113,6 +117,9 @@
%patch0 -Rp1
%patch1 -p1
%patch2 -p1
+%patch4 -p1
+%else
+%patch3 -p1
%endif
%build
++ fix-compilation-with-old-cmake.patch ++
Index: b/TelepathyQt/CMakeLists.txt
===
--- a/TelepathyQt/CMakeLists.txt
+++ b/TelepathyQt/CMakeLists.txt
@@ -775,7 +775,6 @@ target_link_libraries(telepathy-qt${QT_V
${QT_QTNETWORK_LIBRARY}
${QT_QTXML_LIBRARY}
${TP_QT_LIBRARY_LINKER_FLAGS})
-target_include_directories(telepathy-qt${QT_VERSION_MAJOR} PUBLIC
"$
Date: Tue, 29 Sep 2015 20:52:15 +0200
Subject: [PATCH] Farstream: gst/gstconfig.h can be in LIBDIR, search for it
explicitly
Since GStreamer-1.5.1 config header file moved to LIBDIR.
Reviewed-by: Alexandr Akulich
---
TelepathyQt/Farstream/CMakeLists.txt
commit telepathy-qt4 for openSUSE:Factory
Hello community,
here is the log from the commit of package telepathy-qt4 for openSUSE:Factory
checked in at 2014-09-12 15:24:56
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
2014-08-27 22:18:32.0 +0200
+++ /work/SRC/openSUSE:Factory/.telepathy-qt4.new/telepathy-qt4.changes
2014-09-12 15:25:00.0 +0200
@@ -1,0 +2,16 @@
+Tue Sep 9 22:31:08 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Update to 0.9.5:
+ * Added more service side bindings
+ * Service bindings now enabled by default
+ * Bump Farstream version
+ * Allow subclass of Tp::ReceivedMessage
+ * Workaround invalid channelRequests when delegating, fdo#77986
+- Rebase, reorder and apply search-for-farstream0.2.diff,
+ search-for-gstreamer1.0.diff and
+ search-for-telepathy-farstream-0.4.diff only for
+ openSUSE 13.1 and older
+- Provide telepathy-qt4-service-devel-static, due to newly enabled
+ service library
+
+---
Old:
telepathy-qt-0.9.4.tar.gz
New:
telepathy-qt-0.9.5.tar.gz
Other differences:
--
++ telepathy-qt4.spec ++
--- /var/tmp/diff_new_pack.LCxn1E/_old 2014-09-12 15:25:01.0 +0200
+++ /var/tmp/diff_new_pack.LCxn1E/_new 2014-09-12 15:25:01.0 +0200
@@ -26,17 +26,17 @@
%endif
Name: telepathy-qt4
-Version:0.9.4
+Version:0.9.5
Release:0
Summary:Qt4 bindings for the Telepathy Library
License:LGPL-2.1+
Group: Development/Tools/Other
Url:http://telepathy.freedesktop.org/
Source:
http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM search-for-farstream0.2.diff -- searches for
farstream0.2, instead of deprecated 0.1
-Patch0: search-for-farstream0.2.diff
# PATCH-FIX-UPSTREAM search-for-gstreamer1.0.diff -- searches for
gstreamer1.0, which is only required for includes
-Patch1: search-for-gstreamer1.0.diff
+Patch0: search-for-gstreamer1.0.diff
+# PATCH-FIX-UPSTREAM search-for-farstream0.2.diff -- searches for
farstream0.2, instead of deprecated 0.1
+Patch1: search-for-farstream0.2.diff
# PATCH-FIX-UPSTREAM search-for-telepathy-farstream-0.4.diff -- searches for
telepathy-farstream-0.4
Patch2: search-for-telepathy-farstream-0.4.diff
BuildRequires: cmake
@@ -47,8 +47,8 @@
BuildRequires: libxml2-devel
BuildRequires: python-xml
BuildRequires: pkgconfig(telepathy-glib)
-%if %farstream
-%if %gstreamer1
+%if 0%{?farstream}
+%if 0%{?gstreamer1}
BuildRequires: pkgconfig(farstream-0.2)
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
@@ -78,7 +78,7 @@
%description -n %{libname}-%{major}
Telepathy-Qt4 is a high-level binding for Telepathy, similar to telepathy-glib
but for Qt 4.
-%if %farstream
+%if 0%{?farstream}
%package -n %{libname}-farstream%{major}
Summary:Library for performing syntax highlighting in Qt documents
Group: Development/Tools/Other
@@ -92,9 +92,10 @@
Summary:Header files, libraries and development documentation for
%{name}
Group: Development/Libraries/C and C++
Requires: %{libname}-%{major} = %{version}
-%if %farstream
+Provides: %{name}-service-devel-static = %{version}
+%if 0%{?farstream}
Requires: %{libname}-farstream%{major} = %{version}
-%if %gstreamer1
+%if 0%{?gstreamer1}
Requires: pkgconfig(gstreamer-1.0)
Requires: pkgconfig(gstreamer-plugins-base-1.0)
%else
@@ -108,16 +109,11 @@
%prep
%setup -q -n telepathy-qt-%{version}
-%if 0%{?suse_version} = 1230
-%if %farstream
-%if %gstreamer1
-%patch0 -p1
+%if 0%{?suse_version} = 1310
+%patch0 -Rp1
%patch1 -p1
-%else
%patch2 -p1
%endif
-%endif
-%endif
%build
export CXXFLAGS=%{optflags}
@@ -141,7 +137,7 @@
%postun -n %{libname}-%{major} -p /sbin/ldconfig
-%if %farstream
+%if 0%{?farstream}
%post -n %{libname}-farstream%{major} -p /sbin/ldconfig
%postun -n %{libname}-farstream%{major} -p /sbin/ldconfig
@@ -151,7 +147,7 @@
%defattr(-,root,root)
%{_libdir}/libtelepathy-qt4.so.*
-%if %farstream
+%if 0%{?farstream}
%files -n %{libname}-farstream%{major}
%defattr(-,root,root)
%{_libdir}/libtelepathy-qt4-farstream.so.*
@@ -162,9 +158,12 @@
%doc AUTHORS ChangeLog README COPYING HACKING NEWS
%{_includedir}/telepathy-qt4/
%{_libdir}/libtelepathy-qt4.so
+%{_libdir}/libtelepathy-qt4-service.a
%{_libdir}/pkgconfig/TelepathyQt4.pc
%{_libdir}/cmake/TelepathyQt4/
-%if %farstream
+%{_libdir}/cmake/TelepathyQt4Service/
commit telepathy-qt4 for openSUSE:Factory
Hello community,
here is the log from the commit of package telepathy-qt4 for openSUSE:Factory
checked in at 2014-08-27 22:18:19
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
2014-06-26 08:00:27.0 +0200
+++ /work/SRC/openSUSE:Factory/.telepathy-qt4.new/telepathy-qt4.changes
2014-08-27 22:18:32.0 +0200
@@ -1,0 +2,5 @@
+Wed Jul 23 21:48:52 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Enable farstream package for Factory/13.2 (and build with gst1.0 API)
+
+---
Other differences:
--
++ telepathy-qt4.spec ++
--- /var/tmp/diff_new_pack.ryF1ej/_old 2014-08-27 22:18:33.0 +0200
+++ /var/tmp/diff_new_pack.ryF1ej/_new 2014-08-27 22:18:33.0 +0200
@@ -18,12 +18,12 @@
%define libname libtelepathy-qt4
%define major 2
-%if 0%{?suse_version} 1320
%define farstream 1
+%if 0%{?suse_version} 1310
+%define gstreamer1 1
%else
-%define farstream 0
-%endif
%define gstreamer1 0
+%endif
Name: telepathy-qt4
Version:0.9.4
@@ -57,10 +57,9 @@
BuildRequires: pkgconfig(farstream-0.1)
BuildRequires: pkgconfig(gstreamer-0.10)
BuildRequires: pkgconfig(gstreamer-plugins-base-0.10)
-%if 0%{?suse_version} 1220
+%if 0%{?suse_version} = 1310
BuildRequires: pkgconfig(telepathy-farstream-0.4)
-%endif
-%if 0%{?suse_version} == 1220
+%else
BuildRequires: pkgconfig(telepathy-farstream)
%endif
%endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit telepathy-qt4 for openSUSE:Factory
Hello community,
here is the log from the commit of package telepathy-qt4 for openSUSE:Factory
checked in at 2014-06-26 08:00:20
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-11-11 14:53:13.0 +0100
+++ /work/SRC/openSUSE:Factory/.telepathy-qt4.new/telepathy-qt4.changes
2014-06-26 08:00:27.0 +0200
@@ -1,0 +2,17 @@
+Thu Jun 19 20:59:18 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Update to 0.9.4
+ + Enhancements:
+ * fdo#63098: add method Account::createDbusTubeRoom
+ + Fixes:
+ * fdo#46241: Fixed linking in farstream and farsight
+ * Require tp-glib 0.18 and fix 0.19-ism
+ * fdo#47647: Fixed storing avatars, so that they are not stored
+ millions of times each.
+ * fdo#62711: Fixed stack overflow in SimpleObserver::create
+ * Fix compilation and running against release Qt5
+- Drop patches included in this release:
+ Fix-storing-avatars.patch
+ fix-compilation-on-new-versions-of-cmake.patch
+
+---
Old:
Fix-storing-avatars.patch
fix-compilation-on-new-versions-of-cmake.patch
telepathy-qt-0.9.3.tar.gz
New:
telepathy-qt-0.9.4.tar.gz
Other differences:
--
++ telepathy-qt4.spec ++
--- /var/tmp/diff_new_pack.pmhEhe/_old 2014-06-26 08:00:28.0 +0200
+++ /var/tmp/diff_new_pack.pmhEhe/_new 2014-06-26 08:00:28.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package telepathy-qt4
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
%define gstreamer1 0
Name: telepathy-qt4
-Version:0.9.3
+Version:0.9.4
Release:0
Summary:Qt4 bindings for the Telepathy Library
License:LGPL-2.1+
@@ -39,10 +39,6 @@
Patch1: search-for-gstreamer1.0.diff
# PATCH-FIX-UPSTREAM search-for-telepathy-farstream-0.4.diff -- searches for
telepathy-farstream-0.4
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
@@ -123,8 +119,6 @@
%endif
%endif
%endif
-%patch3 -p1
-%patch4 -p1
%build
export CXXFLAGS=%{optflags}
++ telepathy-qt-0.9.3.tar.gz - telepathy-qt-0.9.4.tar.gz ++
618660 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit telepathy-qt4 for openSUSE:Factory
Hello community,
here is the log from the commit of package telepathy-qt4 for openSUSE:Factory
checked in at 2013-11-11 14:53:12
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-10-19 18:52:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.telepathy-qt4.new/telepathy-qt4.changes
2013-11-11 14:53:13.0 +0100
@@ -1,0 +2,5 @@
+Fri Oct 25 21:45:15 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Build farstream for openSUSE versions older than 13.2
+
+---
Other differences:
--
++ telepathy-qt4.spec ++
--- /var/tmp/diff_new_pack.4KLL6E/_old 2013-11-11 14:53:14.0 +0100
+++ /var/tmp/diff_new_pack.4KLL6E/_new 2013-11-11 14:53:14.0 +0100
@@ -18,7 +18,11 @@
%define libname libtelepathy-qt4
%define major 2
+%if 0%{?suse_version} 1320
+%define farstream 1
+%else
%define farstream 0
+%endif
%define gstreamer1 0
Name: telepathy-qt4
@@ -57,8 +61,13 @@
BuildRequires: pkgconfig(farstream-0.1)
BuildRequires: pkgconfig(gstreamer-0.10)
BuildRequires: pkgconfig(gstreamer-plugins-base-0.10)
+%if 0%{?suse_version} 1220
BuildRequires: pkgconfig(telepathy-farstream-0.4)
%endif
+%if 0%{?suse_version} == 1220
+BuildRequires: pkgconfig(telepathy-farstream)
+%endif
+%endif
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit telepathy-qt4 for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.telepathy-qt4.new/telepathy-qt4.changes
2013-10-19 18:52:55.0 +0200
@@ -1,0 +2,6 @@
+Sat Oct 19 13:32:36 UTC 2013 - hrvoje.sen...@gmail.com
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.UGhl5k/_new 2013-10-19 18:53:01.0 +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 k...@davidedmundson.co.uk
Date: Sun, 29 Sep 2013 22:19:27 +
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 dario.fre...@ispirata.com
---
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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
