Control: tags 778115 + pending Control: tags 787390 + pending Dear maintainer,
I've prepared an NMU for sflphone (versioned as 1.4.1-0.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru sflphone-1.4.1/debian/changelog sflphone-1.4.1/debian/changelog --- sflphone-1.4.1/debian/changelog 2014-10-18 05:04:46.000000000 +0200 +++ sflphone-1.4.1/debian/changelog 2015-07-23 20:23:16.000000000 +0200 @@ -1,3 +1,17 @@ +sflphone (1.4.1-0.2) unstable; urgency=medium + + * Non-maintainer upload. + + [ Peter Michael Green ] + * 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) + + [ Brett Johnson ] + * Fix build with GCC 5. (Closes: #778115) + + -- Sebastian Ramacher <sramac...@debian.org> Thu, 23 Jul 2015 20:22:55 +0200 + sflphone (1.4.1-0.1) unstable; urgency=medium [ Francois Marier ] diff -Nru sflphone-1.4.1/debian/patches/gcc-5.patch sflphone-1.4.1/debian/patches/gcc-5.patch --- sflphone-1.4.1/debian/patches/gcc-5.patch 1970-01-01 01:00:00.000000000 +0100 +++ sflphone-1.4.1/debian/patches/gcc-5.patch 2015-07-23 20:22:53.000000000 +0200 @@ -0,0 +1,21 @@ +Description: Fix build with gcc 5 +Author: Brett Johnson <br...@hp.com> +Bug-Debian: https://bugs.debian.org/778115 +Last-Update: 2015-07-23 + +--- sflphone-1.4.1.orig/daemon/libs/pjproject-2.2.1/pjlib/include/pj/compat/ctype.h ++++ sflphone-1.4.1/daemon/libs/pjproject-2.2.1/pjlib/include/pj/compat/ctype.h +@@ -41,9 +41,11 @@ + # define toupper(c) (((c) >= 'a' && (c) <= 'z') ? (c)-('a'-'A') : (c)) + #endif + +-#ifndef isblank ++#ifndef __USE_ISOC99 ++# ifndef isblank + # define isblank(c) (c==' ' || c=='\t') +-#endif ++# endif ++#endif /* __USE_ISOC99 */ + + + #endif /* __PJ_COMPAT_CTYPE_H__ */ 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 01:00:00.000000000 +0100 +++ sflphone-1.4.1/debian/patches/remove-nonexistant-kde-include-dir.patch 2015-07-23 20:06:34.000000000 +0200 @@ -0,0 +1,58 @@ +Description: Remove non-existent KDE directory from include dirs list + Prevent build failure with cc1plus: error: /usr/include/qt4/KDE: No such file + or directory [-Werror] +Author: Peter Michael Green <plugw...@raspbian.org> +Bug-Debian: https://bugs.debian.org/787390 +Last-Update: 2015-07-23 + +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 05:04:46.000000000 +0200 +++ sflphone-1.4.1/debian/patches/series 2015-07-23 20:22:19.000000000 +0200 @@ -1,3 +1,5 @@ 02_target_s390.patch fix_tls.patch pj_project_status.patch +remove-nonexistant-kde-include-dir.patch +gcc-5.patch
signature.asc
Description: Digital signature
