[oe-commits] Martin Jansa : linphone: fix build without NLS enabled

[git version control]

Module: openembedded.git
Branch: master
Commit: 8ab2bb3f27d599cf1a5e801f12cf321b9889ff5c
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=8ab2bb3f27d599cf1a5e801f12cf321b9889ff5c

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon May  9 10:10:05 2011 +0200

linphone: fix build without NLS enabled

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../linphone-3.1.0/fix.unused.variable.patch       |   20 ++++++++++++++++++++
 recipes/linphone/linphone_3.1.0.bb                 |    3 ++-
 2 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/recipes/linphone/linphone-3.1.0/fix.unused.variable.patch b/recipes/linphone/linphone-3.1.0/fix.unused.variable.patch
new file mode 100644
index 0000000..22b31d8
--- /dev/null
+++ b/recipes/linphone/linphone-3.1.0/fix.unused.variable.patch
@@ -0,0 +1,20 @@
+define p only when NLS is enabled, otherwise it's not used and build fails:
+| cc1: warnings being treated as errors
+| main.c: In function 'main':
+| main.c:890:8: error: unused variable 'p'
+| make[2]: *** [main.o] Error 1
+| make[2]: Leaving directory `/OE/tmpdir-shr/work/armv4t-oe-linux-gnueabi/linphone-3.1.0-r3/linphone-3.1.0/gtk-glade'
+
+diff -uNr linphone-3.1.0.orig//gtk-glade/main.c linphone-3.1.0/gtk-glade/main.c
+--- linphone-3.1.0.orig//gtk-glade/main.c	2009-03-16 13:12:43.000000000 +0100
++++ linphone-3.1.0/gtk-glade/main.c	2011-05-09 09:53:34.877676870 +0200
+@@ -887,7 +887,9 @@
+ }
+ 
+ int main(int argc, char *argv[]){
++#ifdef ENABLE_NLS
+ 	void *p;
++#endif
+ 	const char *config_file;
+ 	const char *lang;
+ 
diff --git a/recipes/linphone/linphone_3.1.0.bb b/recipes/linphone/linphone_3.1.0.bb
index aa55b75..2e1ce8f 100644
--- a/recipes/linphone/linphone_3.1.0.bb
+++ b/recipes/linphone/linphone_3.1.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.linphone.org/?lang=us"
 SECTION = "x11/utils"
 LICENSE = "GPLv2"
 
-PR = "r3"
+PR = "r4"
 
 DEPENDS = "intltool libosip2 speex libogg alsa-lib readline libexosip2 gtk+ libglade"
 DEPENDS_${PN} = "liblinphone libglade gtk+"
@@ -23,6 +23,7 @@ PROVIDES += "linphone linphonec liblinphone"
 SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/3.1.x/sources/linphone-${PV}.tar.gz \
 	file://b64_assert.patch \
 	file://preferences-segv.patch \
+	file://fix.unused.variable.patch \
 	"
 
 S = "${WORKDIR}/linphone-${PV}"