tags 787390 +patch thanks
make[4]: Entering directory '/«PKGBUILDDIR»/kde/build' [ 18%] Building CXX object src/lib/CMakeFiles/qtsflphone.dir/call.cpp.o cc1plus: error: /usr/include/qt4/KDE: No such file or directory [-Werror] cc1plus: all warnings being treated as errors make[4]: *** [src/lib/CMakeFiles/qtsflphone.dir/call.cpp.o] Error 1 src/lib/CMakeFiles/qtsflphone.dir/build.make:388: recipe for target 'src/lib/CMakeFiles/qtsflphone.dir/call.cpp.o' failed
Removing ${KDE4_INCLUDES} from various CMakeLists.txt files fixed the build failure in raspbian stretch. It has not been tested beyond that but I would be surprised if it did not also fix the build failure for Debian.
While I was working on the fix I ran into problems with the clean target not cleaning up properly. I fixed a load of non-removed binaries but then ran into a load of existing files that had been modified by the build process which I didn't investigate further.
I've uploaded the fix to raspbian, a debdiff is attatched. No intent to NMU in Debian.
diff -Nru sflphone-1.4.1/debian/changelog sflphone-1.4.1/debian/changelog --- sflphone-1.4.1/debian/changelog 2014-10-18 03:04:46.000000000 +0000 +++ sflphone-1.4.1/debian/changelog 2015-06-23 00:04:18.000000000 +0000 @@ -1,3 +1,12 @@ +sflphone (1.4.1-0.1+rpi1) stretch-staging; urgency=medium + + * Remove "KDE" from include dirs list to hopefully prevent build failure with + cc1plus: error: /usr/include/qt4/KDE: No such file or directory [-Werror] + (Closes: 787390) + * Partially fix clean target. + + -- Peter Michael Green <plugw...@raspbian.org> Mon, 22 Jun 2015 21:59:20 +0000 + sflphone (1.4.1-0.1) unstable; urgency=medium [ Francois Marier ] diff -Nru sflphone-1.4.1/debian/patches/remove-nonexistant-kde-include-dir.patch sflphone-1.4.1/debian/patches/remove-nonexistant-kde-include-dir.patch --- sflphone-1.4.1/debian/patches/remove-nonexistant-kde-include-dir.patch 1970-01-01 00:00:00.000000000 +0000 +++ sflphone-1.4.1/debian/patches/remove-nonexistant-kde-include-dir.patch 2015-06-23 00:03:56.000000000 +0000 @@ -0,0 +1,79 @@ +Description: <short summary of the patch> + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + sflphone (1.4.1-0.1+rpi1) stretch-staging; urgency=medium + . + * Remove "KDE" from include dirs list to hopefully prevent build failure with + cc1plus: error: /usr/include/qt4/KDE: No such file or directory [-Werror] + (Closes: 787390) +Author: Peter Michael Green <plugw...@raspbian.org> +Bug-Debian: https://bugs.debian.org/787390 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: https://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +Index: sflphone-1.4.1/kde/CMakeLists.txt +=================================================================== +--- sflphone-1.4.1.orig/kde/CMakeLists.txt ++++ sflphone-1.4.1/kde/CMakeLists.txt +@@ -39,7 +39,7 @@ ELSE() + + MESSAGE("cmake install prefix is : ${CMAKE_INSTALL_PREFIX}") + +- INCLUDE_DIRECTORIES (${KDE4_INCLUDES} ${QT_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) ++ INCLUDE_DIRECTORIES (${QT_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) + + INCLUDE ( ${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake ) + INCLUDE( ${QT_USE_FILE} ) +Index: sflphone-1.4.1/kde/src/CMakeLists.txt +=================================================================== +--- sflphone-1.4.1.orig/kde/src/CMakeLists.txt ++++ sflphone-1.4.1/kde/src/CMakeLists.txt +@@ -71,7 +71,7 @@ ADD_DEFINITIONS("-std=c++0x") + add_subdirectory( lib ) + + #Make sure it can access DBUS autogenerated files +-include_directories(SYSTEM ${KDE4_INCLUDES} ${CMAKE_BINARY_DIR}) ++include_directories(SYSTEM ${CMAKE_BINARY_DIR}) + include_directories(${CMAKE_CURRENT_BINARY_DIR}/lib ) + + #Build KDE specific files +Index: sflphone-1.4.1/kde/src/klib/CMakeLists.txt +=================================================================== +--- sflphone-1.4.1.orig/kde/src/klib/CMakeLists.txt ++++ sflphone-1.4.1/kde/src/klib/CMakeLists.txt +@@ -29,7 +29,7 @@ INCLUDE ( KDE4Defaults ) + + set(GENERIC_LIB_VERSION "1.4.1") + +-include_directories(SYSTEM ${QT_INCLUDES} ${KDE4_INCLUDES} ) ++include_directories(SYSTEM ${QT_INCLUDES}) + INCLUDE_DIRECTORIES (${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}) + + #File to compile +Index: sflphone-1.4.1/kde/src/klib/dataengine/CMakeLists.txt +=================================================================== +--- sflphone-1.4.1.orig/kde/src/klib/dataengine/CMakeLists.txt ++++ sflphone-1.4.1/kde/src/klib/dataengine/CMakeLists.txt +@@ -7,7 +7,6 @@ add_definitions (${QT_DEFINITIONS} ${KDE + include_directories( + ${CMAKE_SOURCE_DIR} + ${CMAKE_BINARY_DIR} +- ${KDE4_INCLUDES} + ) + + diff -Nru sflphone-1.4.1/debian/patches/series sflphone-1.4.1/debian/patches/series --- sflphone-1.4.1/debian/patches/series 2014-10-18 03:04:46.000000000 +0000 +++ sflphone-1.4.1/debian/patches/series 2015-06-22 22:10:16.000000000 +0000 @@ -1,3 +1,4 @@ 02_target_s390.patch fix_tls.patch pj_project_status.patch +remove-nonexistant-kde-include-dir.patch diff -Nru sflphone-1.4.1/debian/rules sflphone-1.4.1/debian/rules --- sflphone-1.4.1/debian/rules 2014-10-18 03:01:51.000000000 +0000 +++ sflphone-1.4.1/debian/rules 2015-06-23 00:00:41.000000000 +0000 @@ -33,6 +33,8 @@ cd gnome && [ ! -f Makefile ] || $(MAKE) distclean cd kde && [ ! -f Makefile ] || $(MAKE) distclean cd plugins && [ ! -f Makefile ] || $(MAKE) distclean + rm -rf kde/build plugins/build* + rm -rf daemon/libs/pjproject-2.2.1/pjsip-apps/build/output dh_auto_clean override_dh_auto_install:
