Fix broken compilation when build with -irda -bluetooth (#156824).

Package-Manager: portage-2.1.1-r1

4 files changed, 64 insertions, 13 deletions

diff --git a/app-mobilephone/gammu/ChangeLog b/app-mobilephone/gammu/ChangeLog
index 491b77e34035..1148047bfce2 100644
--- a/app-mobilephone/gammu/ChangeLog
+++ b/app-mobilephone/gammu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/gammu
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.27 2006/12/01 07:01:04 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.28 2006/12/01 19:12:13 mrness Exp $
+
+  01 Dec 2006; Alin Năstac <mrness@gentoo.org>
+  +files/gammu-1.09.00-sony-obexmode.patch, gammu-1.09.00.ebuild:
+  Fix broken compilation when build with -irda -bluetooth (#156824).
 
 *gammu-1.09.00 (01 Dec 2006)
 
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index 89063d277e73..3a0c164a86af 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -33,6 +33,10 @@ AUX gammu-1.09.00-backup-limits.patch 670 RMD160 f25b16358239d2c0cfa53bb84f363ee
 MD5 8adb6de417327f1bf1dd28f926b71435 files/gammu-1.09.00-backup-limits.patch 670
 RMD160 f25b16358239d2c0cfa53bb84f363ee015a3e197 files/gammu-1.09.00-backup-limits.patch 670
 SHA256 2636564839c48e1bf5d0d119fd01c3a2f983cd795a773e715a5c604adbcc5111 files/gammu-1.09.00-backup-limits.patch 670
+AUX gammu-1.09.00-sony-obexmode.patch 1922 RMD160 31b695bf1a8db12cb13ef0d6d0b0513e14372ef2 SHA1 99cf7614a3e298a8d67ad5c7463afa038f172c37 SHA256 ec2a8987a77e0ebbf2a710a609de1d6c3cb02d70ab62e3473f972dea9eb73eaf
+MD5 94860c53c9b09454e4a9920c5c5a0bc6 files/gammu-1.09.00-sony-obexmode.patch 1922
+RMD160 31b695bf1a8db12cb13ef0d6d0b0513e14372ef2 files/gammu-1.09.00-sony-obexmode.patch 1922
+SHA256 ec2a8987a77e0ebbf2a710a609de1d6c3cb02d70ab62e3473f972dea9eb73eaf files/gammu-1.09.00-sony-obexmode.patch 1922
 DIST gammu-1.05.00.tar.gz 1017137 RMD160 9133425dec6b2a7ea0186cdb97e07af469a25049 SHA1 44c48096a513650c0deabfe6717369c89f269924 SHA256 da95d899bd610b367457c631c91bf2f018da3fa0dc51fad98093e81dbe6bd6b6
 DIST gammu-1.06.00.tar.gz 1014476 RMD160 4f85c761968ad045b68f8e61b014789b32542d2f SHA1 54bd9dae3583eccab725d216875110df69e1e466 SHA256 b922563007de16a301874023aa47ae36605d91394bb00877e0ecbf579f92617b
 DIST gammu-1.07.00.tar.gz 1081816 RMD160 630bd52bf7fc611014a0827350adb0c7aba42fc7 SHA1 96c2d9af9cfdb0288a818439f7bcaaaac714c293 SHA256 d1acd0fd5b7bd81baf41d99af1a0bb5a276332b1fc88c5262389ca16ff9b4a03
@@ -54,14 +58,14 @@ EBUILD gammu-1.08.00.ebuild 1371 RMD160 34f05697f1ae0bce5ffd51c2f8b2ca1af1095f02
 MD5 01e88390e2a843c925785879688697cd gammu-1.08.00.ebuild 1371
 RMD160 34f05697f1ae0bce5ffd51c2f8b2ca1af1095f02 gammu-1.08.00.ebuild 1371
 SHA256 ac5829b18d0be75f68ae75dc60c0c3c480a79476c477edb2240f1568c808b22b gammu-1.08.00.ebuild 1371
-EBUILD gammu-1.09.00.ebuild 1374 RMD160 56917888ae3664f5a63f9a99a53449315185e735 SHA1 de3ea0fbad3efd25f6ed65f6b2cc829194a81937 SHA256 824f583fd0c8ea9bc946e71045c7f86327f2ca97462b5b62fe0313bf3ad288f0
-MD5 0001be238c6ff4cd1e63783345d30f42 gammu-1.09.00.ebuild 1374
-RMD160 56917888ae3664f5a63f9a99a53449315185e735 gammu-1.09.00.ebuild 1374
-SHA256 824f583fd0c8ea9bc946e71045c7f86327f2ca97462b5b62fe0313bf3ad288f0 gammu-1.09.00.ebuild 1374
-MISC ChangeLog 7342 RMD160 47ae41a8607b6d4cb48622a9e16183b355033467 SHA1 66028c5c4d583cd7dc6acd3abc307f9cd7f30f70 SHA256 7c77ac5fa14a417d64479eda8ce3e505da6ea1f033f161b97c3bcdd210c99240
-MD5 12114bbee7e0c54b74f661adaaefe862 ChangeLog 7342
-RMD160 47ae41a8607b6d4cb48622a9e16183b355033467 ChangeLog 7342
-SHA256 7c77ac5fa14a417d64479eda8ce3e505da6ea1f033f161b97c3bcdd210c99240 ChangeLog 7342
+EBUILD gammu-1.09.00.ebuild 1421 RMD160 b055ccefe1fee710a738b5a920da0e99d1e7f76c SHA1 456556e8d7a85e9dde460fac4e712e0ada4bb80a SHA256 f93f363a98007649ecbde7950faf98da6f5d435890e2143fd274558d28e18282
+MD5 4c61b4c677a445c6550dbb349bb461e2 gammu-1.09.00.ebuild 1421
+RMD160 b055ccefe1fee710a738b5a920da0e99d1e7f76c gammu-1.09.00.ebuild 1421
+SHA256 f93f363a98007649ecbde7950faf98da6f5d435890e2143fd274558d28e18282 gammu-1.09.00.ebuild 1421
+MISC ChangeLog 7526 RMD160 7e025e7bc050d4238bef16ed57d50dfa56520949 SHA1 1af5c033ee7571ce30c993da874693ff81eb9403 SHA256 40dc0584ea4f78886366d2414505690c3c28075034f9c991ab836e24486b72bb
+MD5 636c91578af1c302c2c164bc4b351334 ChangeLog 7526
+RMD160 7e025e7bc050d4238bef16ed57d50dfa56520949 ChangeLog 7526
+SHA256 40dc0584ea4f78886366d2414505690c3c28075034f9c991ab836e24486b72bb ChangeLog 7526
 MISC metadata.xml 165 RMD160 1bf9089beacb19ba770d553d02356566ecd76892 SHA1 866903a1177187bfcc803fb62e0e3be2a2674481 SHA256 576ea680ccc744a6279987ce542f52f215515a2b4e95bd08c61a66bba9af1c57
 MD5 8e1fd49c29f85eea8da87d6e7de450c6 metadata.xml 165
 RMD160 1bf9089beacb19ba770d553d02356566ecd76892 metadata.xml 165
@@ -84,7 +88,7 @@ SHA256 804c2d37b8718f6e7ebe90ee008ca9e7b219011787ef9da288a4d38cd9fa2a05 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFb9M+3sf9c6kjmR8RAuA6AKCtPdUmEPR+xSSFh9Fi0oaNBixnAgCghPl5
-qegyl4xap3ssW64Spjm5yz8=
-=Llk4
+iD8DBQFFcH6i3sf9c6kjmR8RAqitAJwJeBeod5JOl5lY7nJJyV3qxGR61ACgpdno
++8Z02XkRD1Ij12ukzWjQjuY=
+=1goO
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gammu/files/gammu-1.09.00-sony-obexmode.patch b/app-mobilephone/gammu/files/gammu-1.09.00-sony-obexmode.patch
new file mode 100644
index 000000000000..f5cba9cfe6e8
--- /dev/null
+++ b/app-mobilephone/gammu/files/gammu-1.09.00-sony-obexmode.patch
@@ -0,0 +1,42 @@
+diff -Nru gammu-1.09.00.orig/common/gsmstate.h gammu-1.09.00/common/gsmstate.h
+--- gammu-1.09.00.orig/common/gsmstate.h	2006-11-25 01:22:48.000000000 +0200
++++ gammu-1.09.00/common/gsmstate.h	2006-12-01 20:54:46.524624062 +0200
+@@ -134,7 +134,7 @@
+ #ifdef GSM_ENABLE_ALCABUS
+ #  include "protocol/alcatel/alcabus.h"
+ #endif
+-#if defined(GSM_ENABLE_IRDAOBEX) || defined(GSM_ENABLE_BLUEOBEX)
++#if defined(GSM_ENABLE_IRDAOBEX) || defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_SONYERICSSON)
+ #  include "protocol/obex/obex.h"
+ #endif
+ #if defined(GSM_ENABLE_BLUEGNAPBUS) || defined(GSM_ENABLE_IRDAGNAPBUS)
+@@ -326,7 +326,7 @@
+ #ifdef GSM_ENABLE_ALCABUS
+ 	extern GSM_Protocol_Functions ALCABUSProtocol;
+ #endif
+-#if defined(GSM_ENABLE_IRDAOBEX) || defined(GSM_ENABLE_BLUEOBEX)
++#if defined(GSM_ENABLE_IRDAOBEX) || defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_SONYERICSSON)
+ 	extern GSM_Protocol_Functions OBEXProtocol;
+ #endif
+ #if defined(GSM_ENABLE_BLUEGNAPBUS) || defined(GSM_ENABLE_IRDAGNAPBUS)
+@@ -356,7 +356,7 @@
+ #ifdef GSM_ENABLE_ALCABUS
+ 		GSM_Protocol_ALCABUSData	ALCABUS;
+ #endif
+-#if defined(GSM_ENABLE_IRDAOBEX) || defined(GSM_ENABLE_BLUEOBEX)
++#if defined(GSM_ENABLE_IRDAOBEX) || defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_SONYERICSSON)
+ 		GSM_Protocol_OBEXData		OBEX;
+ #endif
+ #if defined(GSM_ENABLE_BLUEGNAPBUS) || defined(GSM_ENABLE_IRDAGNAPBUS)
+diff -Nru gammu-1.09.00.orig/common/protocol/obex/obex.c gammu-1.09.00/common/protocol/obex/obex.c
+--- gammu-1.09.00.orig/common/protocol/obex/obex.c	2003-12-12 01:32:00.000000000 +0200
++++ gammu-1.09.00/common/protocol/obex/obex.c	2006-12-01 20:55:03.773702063 +0200
+@@ -6,7 +6,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
++#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) || defined(GSM_ENABLE_SONYERICSSON)
+ 
+ #include "../../gsmcomon.h"
+ #include "obex.h"
diff --git a/app-mobilephone/gammu/gammu-1.09.00.ebuild b/app-mobilephone/gammu/gammu-1.09.00.ebuild
index 68ab5acedd80..452c5e9d77bd 100644
--- a/app-mobilephone/gammu/gammu-1.09.00.ebuild
+++ b/app-mobilephone/gammu/gammu-1.09.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.09.00.ebuild,v 1.1 2006/12/01 07:01:04 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.09.00.ebuild,v 1.2 2006/12/01 19:12:13 mrness Exp $
 
 inherit eutils
 
@@ -25,6 +25,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-backup-limits.patch"
 	epatch "${FILESDIR}/${P}-as-needed.patch"
+	epatch "${FILESDIR}/${P}-sony-obexmode.patch"
 }
 
 src_compile() {