diff --git a/digikam-5.0.0-beta3-no_pedantic.patch b/digikam-5.0.0-beta3-no_pedantic.patch new file mode 100644 index 0000000..79edcce --- /dev/null +++ b/digikam-5.0.0-beta3-no_pedantic.patch @@ -0,0 +1,14 @@ +diff -up digikam-5.0.0-beta3/extra/kipi-plugins/panorama/CMakeLists.txt.pedantic digikam-5.0.0-beta3/extra/kipi-plugins/panorama/CMakeLists.txt +--- digikam-5.0.0-beta3/extra/kipi-plugins/panorama/CMakeLists.txt.pedantic 2016-01-17 17:21:32.000000000 -0600 ++++ digikam-5.0.0-beta3/extra/kipi-plugins/panorama/CMakeLists.txt 2016-03-13 20:31:01.859266879 -0500 +@@ -9,6 +9,10 @@ if (POLICY CMP0063) + cmake_policy(SET CMP0063 NEW) + endif (POLICY CMP0063) + ++while(CMAKE_CXX_FLAGS MATCHES "-pedantic") ++ string(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") ++endwhile() ++ + add_definitions(-DTRANSLATION_DOMAIN=\"kipiplugin_panorama\") + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/importwizard diff --git a/digikam.spec b/digikam.spec index b599cb1..e70d1d9 100644 --- a/digikam.spec +++ b/digikam.spec @@ -16,6 +16,7 @@ Source10: digikam-import.desktop ## upstreamable patches Patch2: digikam-5.0.0-beta3-gcc6.patch +Patch3: digikam-5.0.0-beta3-no_pedantic.patch ## upstream patches @@ -159,6 +160,7 @@ BuildArch: noarch %setup -q -n %{name}-%{version}%{?beta:-%{beta}} %patch2 -p1 -b .gcc6 +%patch3 -p1 -b .no_pedantic %build