diff -Nru kdenetwork-4.8.4/debian/changelog kdenetwork-4.8.4/debian/changelog --- kdenetwork-4.8.4/debian/changelog 2013-06-30 16:55:01.000000000 +0000 +++ kdenetwork-4.8.4/debian/changelog 2013-08-17 18:24:14.000000000 +0000 @@ -1,3 +1,9 @@ +kdenetwork (4:4.8.4-3+rpi1) jessie-staging; urgency=low + + * Disable jingle to avoid build failure. + + -- Peter Michael Green Sat, 17 Aug 2013 18:23:05 +0000 + kdenetwork (4:4.8.4-3) unstable; urgency=low * Remove setiud bit to the kppp binary. (Closes: #709972) diff -Nru kdenetwork-4.8.4/debian/kopete.install kdenetwork-4.8.4/debian/kopete.install --- kdenetwork-4.8.4/debian/kopete.install 2013-06-30 16:55:01.000000000 +0000 +++ kdenetwork-4.8.4/debian/kopete.install 2013-08-17 21:14:07.000000000 +0000 @@ -1,4 +1,3 @@ -usr/bin/googletalk-call usr/bin/kopete usr/bin/kopete_latexconvert.sh usr/bin/winpopup-install diff -Nru kdenetwork-4.8.4/debian/patches/disable-jingle.patch kdenetwork-4.8.4/debian/patches/disable-jingle.patch --- kdenetwork-4.8.4/debian/patches/disable-jingle.patch 1970-01-01 00:00:00.000000000 +0000 +++ kdenetwork-4.8.4/debian/patches/disable-jingle.patch 2013-08-17 20:38:14.000000000 +0000 @@ -0,0 +1,50 @@ +Description: Disable jingle to avoid build failure. +Author: Peter Michael Green + +Index: kdenetwork-4.8.4/kopete/protocols/CMakeLists.txt +=================================================================== +--- kdenetwork-4.8.4.orig/kopete/protocols/CMakeLists.txt 2013-08-17 20:22:58.000000000 +0000 ++++ kdenetwork-4.8.4/kopete/protocols/CMakeLists.txt 2013-08-17 20:38:09.000000000 +0000 +@@ -19,27 +19,27 @@ + option(WITH_meanwhile "Enable Kopete meanwhile protocol" ON) + option(WITH_skype "Enable Kopete Skype protocol" ON) + +-if(LIBORTP_FOUND AND SPEEX_FOUND AND ALSA_FOUND AND WITH_JINGLE) +- message(STATUS "Building jingle support") +- set(BUILD_JINGLE TRUE) +-else(LIBORTP_FOUND AND SPEEX_FOUND AND ALSA_FOUND AND WITH_JINGLE) ++#if(LIBORTP_FOUND AND SPEEX_FOUND AND ALSA_FOUND AND WITH_JINGLE) ++# message(STATUS "Building jingle support") ++# set(BUILD_JINGLE TRUE) ++#else(LIBORTP_FOUND AND SPEEX_FOUND AND ALSA_FOUND AND WITH_JINGLE) + message(STATUS "Not building jingle support (recommended)") + set(BUILD_JINGLE FALSE) +-endif(LIBORTP_FOUND AND SPEEX_FOUND AND ALSA_FOUND AND WITH_JINGLE) ++#endif(LIBORTP_FOUND AND SPEEX_FOUND AND ALSA_FOUND AND WITH_JINGLE) + + # TODO: remove LIBORTP_FOUND and MEDIASTREAMER_FOUND if google libjingle filetransfer will be supported +-if(SSL_FOUND OR WIN32) +- if(EXPAT_FOUND AND LIBORTP_FOUND AND MEDIASTREAMER_FOUND AND WITH_GOOGLETALK) +- message(STATUS "Building Google Talk libjingle support") +- set(BUILD_GOOGLETALK TRUE) +- else(EXPAT_FOUND AND LIBORTP_FOUND AND MEDIASTREAMER_FOUND AND WITH_GOOGLETALK) +- message(STATUS "Not building Google Talk libjingle support") +- set(BUILD_GOOGLETALK FALSE) +- endif(EXPAT_FOUND AND LIBORTP_FOUND AND MEDIASTREAMER_FOUND AND WITH_GOOGLETALK) +-else(SSL_FOUND OR WIN32) ++#if(SSL_FOUND OR WIN32) ++# if(EXPAT_FOUND AND LIBORTP_FOUND AND MEDIASTREAMER_FOUND AND WITH_GOOGLETALK) ++# message(STATUS "Building Google Talk libjingle support") ++# set(BUILD_GOOGLETALK TRUE) ++# else(EXPAT_FOUND AND LIBORTP_FOUND AND MEDIASTREAMER_FOUND AND WITH_GOOGLETALK) ++# message(STATUS "Not building Google Talk libjingle support") ++# set(BUILD_GOOGLETALK FALSE) ++# endif(EXPAT_FOUND AND LIBORTP_FOUND AND MEDIASTREAMER_FOUND AND WITH_GOOGLETALK) ++#else(SSL_FOUND OR WIN32) + message(STATUS "Not building Google Talk libjingle support") + set(BUILD_GOOGLETALK FALSE) +-endif(SSL_FOUND OR WIN32) ++#endif(SSL_FOUND OR WIN32) + + if(MEDIASTREAMER_FOUND AND LIBORTP_FOUND AND WITH_WLM_MEDIASTREAMER) + message(STATUS "Building Windows Live Messenger voice clip support") diff -Nru kdenetwork-4.8.4/debian/patches/series kdenetwork-4.8.4/debian/patches/series --- kdenetwork-4.8.4/debian/patches/series 2013-06-30 16:55:01.000000000 +0000 +++ kdenetwork-4.8.4/debian/patches/series 2013-08-17 20:22:58.000000000 +0000 @@ -1,3 +1,4 @@ kdenetwork-4.7.97-fix-for-g++47.patch upstream_r1353735.diff add_libpthread_to_krfb.diff +disable-jingle.patch