[SCM] KDE Network module packaging branch, master, updated. debian/4.8.4-1-3-g41566b1

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdenetwork.git;a=commitdiff;h=dcc509c

The following commit has been merged in the master branch:
commit dcc509c1fca277b45ace363fcf14382d33f5ac91
Author: Pino Toscano <pino at debian.org>
Date:   Tue Jun 4 15:47:41 2013 +0200

    fix building with Linux kernels >= 3.9
    
    backport upstream r1353735
---
 debian/changelog                      |    3 +++
 debian/patches/series                 |    1 +
 debian/patches/upstream_r1353735.diff |   32 ++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63ff878..3a37ad0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kdenetwork (4:4.8.4-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport upstream r1353735 to fix building with Linux kernels >= 3.9;
+    patch upstream_r1353735.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 04 Jun 2013 15:39:10 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index b64f8fb..f06da80 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 kdenetwork-4.7.97-fix-for-g++47.patch
+upstream_r1353735.diff
diff --git a/debian/patches/upstream_r1353735.diff b/debian/patches/upstream_r1353735.diff
new file mode 100644
index 0000000..6d302c5
--- /dev/null
+++ b/debian/patches/upstream_r1353735.diff
@@ -0,0 +1,32 @@
+Author: Michael Palimaka <kensington at gentoo.org>
+Description: Fix build with V4L and recent kernels.
+ .
+ REVIEW: 7072
+ BUG: 319455
+Applied-Upstream: 4.10.4, commit:1353735
+
+Index: kdenetwork/kopete/libkopete/avdevice/videodevice.cpp
+===================================================================
+--- kdenetwork/kopete/libkopete/avdevice/videodevice.cpp	(revision 1353734)
++++ kdenetwork/kopete/libkopete/avdevice/videodevice.cpp	(revision 1353735)
+@@ -3050,7 +3050,9 @@
+ 		case V4L2_CID_AUDIO_TREBLE: 		return I18N_NOOP("Treble");
+ 		case V4L2_CID_AUDIO_MUTE: 		return I18N_NOOP("Mute");
+ 		case V4L2_CID_AUDIO_LOUDNESS: 		return I18N_NOOP("Loudness");
++#ifdef V4L2_CID_BLACK_LEVEL		// deprecated, likely to be removed soon
+ 		case V4L2_CID_BLACK_LEVEL:		return I18N_NOOP("Black Level");
++#endif
+ 		case V4L2_CID_AUTO_WHITE_BALANCE:	return I18N_NOOP("Automatic White Balance");
+ 		case V4L2_CID_DO_WHITE_BALANCE:		return I18N_NOOP("Do White Balance");
+ 		case V4L2_CID_RED_BALANCE:		return I18N_NOOP("Red Balance");
+@@ -3061,8 +3063,10 @@
+ 		case V4L2_CID_GAIN:			return I18N_NOOP("Gain");
+ 		case V4L2_CID_HFLIP:			return I18N_NOOP("Horizontal Flip");
+ 		case V4L2_CID_VFLIP:			return I18N_NOOP("Vertical Flip");
++#ifdef V4L2_CID_HCENTER			// removed in kernel 3.9
+ 		case V4L2_CID_HCENTER:			return I18N_NOOP("Horizontal Center");
+ 		case V4L2_CID_VCENTER:			return I18N_NOOP("Vertical Center");
++#endif
+ #ifdef V4L2_CID_POWER_LINE_FREQUENCY	// since kernel 2.6.25
+ 		case V4L2_CID_POWER_LINE_FREQUENCY:	return I18N_NOOP("Power Line Frequency");
+ 		case V4L2_CID_HUE_AUTO:			return I18N_NOOP("Automatic Hue");

-- 
KDE Network module packaging