Fix link error when mysql is enabled an postgres is disabled. Correct some printf formats.

(Portage version: 2.1.2.2)

5 files changed, 113 insertions, 5 deletions

diff --git a/app-mobilephone/gammu/ChangeLog b/app-mobilephone/gammu/ChangeLog
index 9cdfc7f4af91..e586899dff00 100644
--- a/app-mobilephone/gammu/ChangeLog
+++ b/app-mobilephone/gammu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-mobilephone/gammu
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.34 2007/03/26 21:29:40 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.35 2007/03/31 08:10:26 mrness Exp $
+
+*gammu-1.10.0-r1 (31 Mar 2007)
+
+  31 Mar 2007; Alin Năstac <mrness@gentoo.org>
+  +files/gammu-1.10.0-configure.patch, +files/gammu-1.10.0-printf.patch,
+  -gammu-1.10.0.ebuild, +gammu-1.10.0-r1.ebuild:
+  Fix link error when mysql is enabled an postgres is disabled. Correct some
+  printf formats.
 
   26 Mar 2007; Alin Năstac <mrness@gentoo.org> gammu-1.10.0.ebuild:
   Add postgres USE flag (#172315).
diff --git a/app-mobilephone/gammu/files/digest-gammu-1.10.0 b/app-mobilephone/gammu/files/digest-gammu-1.10.0-r1
index 132cdd0def8c..132cdd0def8c 100644
--- a/app-mobilephone/gammu/files/digest-gammu-1.10.0
+++ b/app-mobilephone/gammu/files/digest-gammu-1.10.0-r1
diff --git a/app-mobilephone/gammu/files/gammu-1.10.0-configure.patch b/app-mobilephone/gammu/files/gammu-1.10.0-configure.patch
new file mode 100644
index 000000000000..7b345cf988ef
--- /dev/null
+++ b/app-mobilephone/gammu/files/gammu-1.10.0-configure.patch
@@ -0,0 +1,19 @@
+diff -Nru gammu-1.10.0.orig/cfg/autoconf/configure.in gammu-1.10.0/cfg/autoconf/configure.in
+--- gammu-1.10.0.orig/cfg/autoconf/configure.in	2007-02-23 22:50:00.000000000 +0200
++++ gammu-1.10.0/cfg/autoconf/configure.in	2007-03-31 10:30:33.000000000 +0300
+@@ -115,13 +115,11 @@
+         ])
+ AC_ARG_ENABLE(pgsql,
+         [  --disable-pgsql         Disable postgreSQL support in SMSD],
+-        [pgsql="no"
+-         SMSD_LIBS=],
++        [pgsql="no"],
+         [AC_CHECK_HEADERS(postgresql/libpq-fe.h,
+             [pgsql="yes"
+              SMSD_LIBS="$SMSD_LIBS -L$(pg_config --libdir) -lpq"],
+-            [pgsql="no"
+-             SMSD_LIBS="$SMSD_LIBS"])
++            [pgsql="no"])
+         ])
+ AC_SUBST(SMSD_LIBS)
+ 
diff --git a/app-mobilephone/gammu/files/gammu-1.10.0-printf.patch b/app-mobilephone/gammu/files/gammu-1.10.0-printf.patch
new file mode 100644
index 000000000000..6c3e8ec92145
--- /dev/null
+++ b/app-mobilephone/gammu/files/gammu-1.10.0-printf.patch
@@ -0,0 +1,71 @@
+diff -Nru gammu-1.10.0.orig/common/phone/obex/obexgen.c gammu-1.10.0/common/phone/obex/obexgen.c
+--- gammu-1.10.0.orig/common/phone/obex/obexgen.c	2007-02-23 22:50:03.000000000 +0200
++++ gammu-1.10.0/common/phone/obex/obexgen.c	2007-03-31 10:40:37.000000000 +0300
+@@ -354,7 +354,7 @@
+ 	do {
+ 		OBEXGEN_FindNextDir(File, &Pos, req);
+ 		if (DirOnly && Pos == UnicodeLength(File)) break;
+-		smprintf(s,"Changing path down to %s (%d, %d)\n", DecodeUnicodeString(req), Pos, UnicodeLength(File));
++		smprintf(s,"Changing path down to %s (%u, %zu)\n", DecodeUnicodeString(req), Pos, UnicodeLength(File));
+ 		error=OBEXGEN_ChangePath(s, req, 2);
+ 		if (error != ERR_NONE) return error;
+ 		if (Pos == UnicodeLength(File)) break;
+diff -Nru gammu-1.10.0.orig/common/service/backup/backtext.c gammu-1.10.0/common/service/backup/backtext.c
+--- gammu-1.10.0.orig/common/service/backup/backtext.c	2007-02-23 22:50:03.000000000 +0200
++++ gammu-1.10.0/common/service/backup/backtext.c	2007-03-31 10:38:31.000000000 +0300
+@@ -193,7 +193,7 @@
+ 		strcat(paramname,"Unicode");
+ 		readvalue = ReadCFGText(file_info, section, paramname, UseUnicode);
+ 		if (readvalue!=NULL) {
+-			dbgprintf("%s %i\n",readvalue,strlen(readvalue));
++			dbgprintf("%s %zu\n",readvalue,strlen(readvalue));
+ 			DecodeHexBin (myvalue, readvalue, strlen(readvalue));
+ 			myvalue[strlen(readvalue)/2]=0;
+ 			myvalue[strlen(readvalue)/2+1]=0;
+diff -Nru gammu-1.10.0.orig/common/service/sms/gsmems.c gammu-1.10.0/common/service/sms/gsmems.c
+--- gammu-1.10.0.orig/common/service/sms/gsmems.c	2007-02-23 22:50:04.000000000 +0200
++++ gammu-1.10.0/common/service/sms/gsmems.c	2007-03-31 10:39:47.000000000 +0300
+@@ -93,7 +93,7 @@
+ 				}
+ 				Len += CopiedText;
+ 				if (Len == UnicodeLength(Entry->Buffer)) break;
+-				dbgprintf("%i %i\n",Len,UnicodeLength(Entry->Buffer));
++				dbgprintf("%u %zu\n",Len,UnicodeLength(Entry->Buffer));
+ 			}
+ 			break;
+ 		case SMS_EMSPredefinedSound:
+@@ -530,7 +530,7 @@
+ 	for (i=0;i<SMS->Number;i++) {
+ 		dbgprintf("UDH length %i\n",SMS->SMS[i].UDH.Length);
+ 		DumpMessage(&di, SMS->SMS[i].UDH.Text, SMS->SMS[i].UDH.Length);
+-		dbgprintf("SMS length %i\n",UnicodeLength(SMS->SMS[i].Text)*2);
++		dbgprintf("SMS length %zu\n",UnicodeLength(SMS->SMS[i].Text)*2);
+ 		DumpMessage(&di, SMS->SMS[i].Text, UnicodeLength(SMS->SMS[i].Text)*2);
+ 	}
+ #endif
+diff -Nru gammu-1.10.0.orig/gammu/gammu.c gammu-1.10.0/gammu/gammu.c
+--- gammu-1.10.0.orig/gammu/gammu.c	2007-02-23 22:50:05.000000000 +0200
++++ gammu-1.10.0/gammu/gammu.c	2007-03-31 10:37:39.000000000 +0300
+@@ -7769,14 +7769,14 @@
+ 		}
+ 	}
+ 
+-	printf("GSM_SMSMessage  - %i\n",sizeof(GSM_SMSMessage));
+-	printf("GSM_SMSC        - %i\n",sizeof(GSM_SMSC));
+-	printf("GSM_SMS_State   - %i\n",sizeof(GSM_SMS_State));
+-	printf("GSM_UDHHeader   - %i\n",sizeof(GSM_UDHHeader));
+-	printf("bool            - %i\n",sizeof(bool));
+-	printf("GSM_DateTime    - %i\n",sizeof(GSM_DateTime));
+-	printf("int             - %i\n",sizeof(int));
+-	printf("GSM_NetworkInfo - %i\n",sizeof(GSM_NetworkInfo));
++	printf("GSM_SMSMessage  - %zu\n",sizeof(GSM_SMSMessage));
++	printf("GSM_SMSC        - %zu\n",sizeof(GSM_SMSC));
++	printf("GSM_SMS_State   - %zu\n",sizeof(GSM_SMS_State));
++	printf("GSM_UDHHeader   - %zu\n",sizeof(GSM_UDHHeader));
++	printf("bool            - %zu\n",sizeof(bool));
++	printf("GSM_DateTime    - %zu\n",sizeof(GSM_DateTime));
++	printf("int             - %zu\n",sizeof(int));
++	printf("GSM_NetworkInfo - %zu\n",sizeof(GSM_NetworkInfo));
+ 	dt.Year = 2005;
+ 	dt.Month = 2;
+ 	dt.Day=29;
diff --git a/app-mobilephone/gammu/gammu-1.10.0.ebuild b/app-mobilephone/gammu/gammu-1.10.0-r1.ebuild
index bdead82d5733..bd82b28563ba 100644
--- a/app-mobilephone/gammu/gammu-1.10.0.ebuild
+++ b/app-mobilephone/gammu/gammu-1.10.0-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.10.0.ebuild,v 1.2 2007/03/26 21:29:40 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.10.0-r1.ebuild,v 1.1 2007/03/31 08:10:26 mrness Exp $
+
+inherit eutils
 
 DESCRIPTION="a fork of the gnokii project, a tool to handle your cellular phone"
 HOMEPAGE="http://www.gammu.org"
@@ -15,13 +17,21 @@ RDEPEND="bluetooth? ( net-wireless/bluez-libs )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )"
 DEPEND="${RDEPEND}
-	irda? ( virtual/os-headers )"
+	irda? ( virtual/os-headers )
+	sys-devel/autoconf-wrapper
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-configure.patch"
+	epatch "${FILESDIR}/${P}-printf.patch"
+}
 
 src_compile() {
 	local myconf=""
 	use debug && myconf="${myconf} --enable-debug"
-	use bluetooth && myconf="${myconf} --with-bluedir=/usr/lib" \
-		|| myconf="${myconf} --disable-bluetooth"
+	use bluetooth || myconf="${myconf} --disable-bluetooth"
 	use mysql || myconf="${myconf} --disable-mysql"
 	use postgres || myconf="${myconf} --disable-pgsql"
 	use irda || myconf="${myconf} --disable-irda"