diff --git a/apitrace.spec b/apitrace.spec index dfb4d0e..7fede05 100644 --- a/apitrace.spec +++ b/apitrace.spec @@ -3,7 +3,7 @@ Name: apitrace Version: 7.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Tools for tracing OpenGL License: MIT @@ -14,6 +14,8 @@ Source2: qapitrace.appdata.xml # Unbundle gtest Patch0: apitrace-7.1_gtest.patch +# Don't add '-nn' to the moc options, it ends up in the CFLAGS +Patch1: apitrace_moc-options.patch BuildRequires: cmake BuildRequires: qt5-qtbase-devel @@ -60,8 +62,7 @@ This package contains qapitrace, the Graphical frontend for apitrace. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 # Remove bundled libraries, except khronos headers and libbacktrace rm -rf `ls -1 thirdparty | grep -Ev "(khronos|md5|libbacktrace)"` @@ -75,7 +76,7 @@ chmod -x retrace/glretrace_main.cpp %build %cmake . -make %{?_smp_mflags} +%make_build %install @@ -123,8 +124,10 @@ make check %{_datadir}/appdata/qapitrace.appdata.xml - %changelog +* Mon Aug 07 2017 Sandro Mani - 7.1-7 +- Don't add -nn to the moc options + * Wed Aug 02 2017 Fedora Release Engineering - 7.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/apitrace_moc-options.patch b/apitrace_moc-options.patch new file mode 100644 index 0000000..acb4034 --- /dev/null +++ b/apitrace_moc-options.patch @@ -0,0 +1,12 @@ +diff -rupN apitrace-7.1/gui/CMakeLists.txt apitrace-7.1-new/gui/CMakeLists.txt +--- apitrace-7.1/gui/CMakeLists.txt 2015-11-23 23:19:57.000000000 +0100 ++++ apitrace-7.1-new/gui/CMakeLists.txt 2017-08-07 18:50:40.782451889 +0200 +@@ -80,8 +80,6 @@ set(qapitrace_UIS + ) + + set (CMAKE_AUTOMOC ON) +-# Silence `Note: No relevant classes found. No output generated.` +-set (CMAKE_AUTOMOC_MOC_OPTIONS "-nn") + + QT5_WRAP_UI(qapitrace_UIS_H ${qapitrace_UIS}) + set(CMAKE_INCLUDE_CURRENT_DIR ON)