[Pkg-voip-commits] [sflphone] 04/05: Imported Debian patch 1.4.1-0.2

[Victor Seva Lopez]

This is an automated email from the git hooks/post-receive script.

maniac-guest pushed a commit to branch master
in repository sflphone.

commit 092771ffb155cb8b95d57d398e9a0938dd77faf0
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Jul 23 20:22:55 2015 +0200

    Imported Debian patch 1.4.1-0.2
---
 debian/changelog                                   | 14 ++++++
 debian/patches/gcc-5.patch                         | 21 ++++++++
 .../remove-nonexistant-kde-include-dir.patch       | 58 ++++++++++++++++++++++
 debian/patches/series                              |  2 +
 4 files changed, 95 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 425b8f8..8245787 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <sramacher at debian.org>  Thu, 23 Jul 2015 20:22:55 +0200
+
 sflphone (1.4.1-0.1) unstable; urgency=medium
 
   [ Francois Marier ]
diff --git a/debian/patches/gcc-5.patch b/debian/patches/gcc-5.patch
new file mode 100644
index 0000000..e0cd491
--- /dev/null
+++ b/debian/patches/gcc-5.patch
@@ -0,0 +1,21 @@
+Description: Fix build with gcc 5
+Author: Brett Johnson <brett at 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 --git a/debian/patches/remove-nonexistant-kde-include-dir.patch b/debian/patches/remove-nonexistant-kde-include-dir.patch
new file mode 100644
index 0000000..648b1c9
--- /dev/null
+++ b/debian/patches/remove-nonexistant-kde-include-dir.patch
@@ -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 <plugwash at 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 --git a/debian/patches/series b/debian/patches/series
index 1445cda..06de569 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 02_target_s390.patch
 fix_tls.patch
 pj_project_status.patch
+remove-nonexistant-kde-include-dir.patch
+gcc-5.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/sflphone.git