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

Package-Manager: portage-2.1.2.2

diff --git a/app-mobilephone/gammu/ChangeLog b/app-mobilephone/gammu/ChangeLog
index 9cdfc7f4af915f937a4296da6a9ab3af190ca026..e586899dff006855fda2f192e8afb6aabad7634f 100644 (file)
--- 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/Manifest b/app-mobilephone/gammu/Manifest
index c200ddb1fc4dea742dbbd6e99799740b339a2f59..8f19829de1e476fdaa38797b23e6953c2b00eddb 100644 (file)
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -21,6 +21,14 @@ AUX gammu-1.09.00-sony-obexmode.patch 1922 RMD160 31b695bf1a8db12cb13ef0d6d0b051
 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
+AUX gammu-1.10.0-configure.patch 722 RMD160 b839cf946b1990905641436f0bc7593ba24d0b10 SHA1 c7b35c57678070a0409fceea6fdf14d09105d29d SHA256 35d456347718962fd570bd1881935b8ff16c35cf8627bfb58dc2226f58142abd
+MD5 b1524e6627a3311b02616c7729d91e35 files/gammu-1.10.0-configure.patch 722
+RMD160 b839cf946b1990905641436f0bc7593ba24d0b10 files/gammu-1.10.0-configure.patch 722
+SHA256 35d456347718962fd570bd1881935b8ff16c35cf8627bfb58dc2226f58142abd files/gammu-1.10.0-configure.patch 722
+AUX gammu-1.10.0-printf.patch 3508 RMD160 a582283cb37f877d0d89b4a1c40a09b7a5593579 SHA1 2d265e150e0f180e9be3608ff05dc5f03795cad2 SHA256 b1ddb82767835a024673d0f3538cfea133734edd0fb64849471111659aac58bd
+MD5 bca646b2307be5cb608f7788ce389d2c files/gammu-1.10.0-printf.patch 3508
+RMD160 a582283cb37f877d0d89b4a1c40a09b7a5593579 files/gammu-1.10.0-printf.patch 3508
+SHA256 b1ddb82767835a024673d0f3538cfea133734edd0fb64849471111659aac58bd files/gammu-1.10.0-printf.patch 3508
 DIST gammu-1.08.00.tar.gz 1104688 RMD160 1297b9f5cc38c3cc8a90ac124e925181847f8c76 SHA1 798cf7c58443db7f73c1c70cb5a2c5332ebadf36 SHA256 1336fcf24b36dfba411e5147ba301d6f5c1b501ddbb2ae714de3196e65cc7b55
 DIST gammu-1.09.00.tar.gz 1137894 RMD160 e4eeaf685028f0624217ade365b4e4e21c3d3d7b SHA1 6d740b383b38ec1176aac6e569b68fd67d149374 SHA256 7746961a708f3b48bd31165b0fc99b051a35be60b49a6c51774fdf13a1c0bc65
 DIST gammu-1.10.0.tar.bz2 889856 RMD160 d17c5595782fde59c9b5f91bd4820fa01924979e SHA1 d33e62c12d3c34a26d5932649731442123b2bb49 SHA256 91062db1fd62095bdda21782e076157a343e0181e684738c2edbfff5fc860f64
@@ -32,14 +40,14 @@ EBUILD gammu-1.09.00.ebuild 1420 RMD160 261d9b22ce8ba50073b3e493b2f0bcf2c79848e8
 MD5 921d94badf698c401aab654b2c4da5a9 gammu-1.09.00.ebuild 1420
 RMD160 261d9b22ce8ba50073b3e493b2f0bcf2c79848e8 gammu-1.09.00.ebuild 1420
 SHA256 01ba910adf5d012bd43c78d348601bb9f84ae6abd9ce890d5b28e7be7c9d8cac gammu-1.09.00.ebuild 1420
-EBUILD gammu-1.10.0.ebuild 1274 RMD160 bf680d06271db8694f4c1953c37a4f5202ff5839 SHA1 bcdfcc7874457ed57fdd747d42f5fbe0be7af982 SHA256 c370b80c76a9cf7c2232b6eb1967cbe95b96f7c3340a95ab3227f395d16c924a
-MD5 b7d60188c2cf3a140627cc1477dc5521 gammu-1.10.0.ebuild 1274
-RMD160 bf680d06271db8694f4c1953c37a4f5202ff5839 gammu-1.10.0.ebuild 1274
-SHA256 c370b80c76a9cf7c2232b6eb1967cbe95b96f7c3340a95ab3227f395d16c924a gammu-1.10.0.ebuild 1274
-MISC ChangeLog 8305 RMD160 4e6e2ed9c89616ada2f3663a4d2fb07e2cec6cd4 SHA1 96da6bfee03e0892773e8b078f10c96d28b9b36a SHA256 59e9f38cc65592dace363002c4fb16c15a51c8974b4463722c85a9085989fe44
-MD5 0ee824a535208cae2d947ee52043bb77 ChangeLog 8305
-RMD160 4e6e2ed9c89616ada2f3663a4d2fb07e2cec6cd4 ChangeLog 8305
-SHA256 59e9f38cc65592dace363002c4fb16c15a51c8974b4463722c85a9085989fe44 ChangeLog 8305
+EBUILD gammu-1.10.0-r1.ebuild 1406 RMD160 21a1822d2bb88e0760bb7c77965058143e2d1ee8 SHA1 407bd3d9f573636efb9ab5edc62f193393edc1d2 SHA256 d55c8ef3bc5754644e07eeef911861dac3701ab794cf070658849b4203e2835d
+MD5 f4b67ff7af78522571c2544ba02be1f2 gammu-1.10.0-r1.ebuild 1406
+RMD160 21a1822d2bb88e0760bb7c77965058143e2d1ee8 gammu-1.10.0-r1.ebuild 1406
+SHA256 d55c8ef3bc5754644e07eeef911861dac3701ab794cf070658849b4203e2835d gammu-1.10.0-r1.ebuild 1406
+MISC ChangeLog 8603 RMD160 f95b7f436f0b92ce160beed72ab33d2d369dee30 SHA1 7f588c9e18b73bd13e39a8f4c259668ba292cf41 SHA256 6a3a9d79310f07d95686d1d622c440078880f6d6ff63c29cf017975d298bf23d
+MD5 25ab976471d023927c42e2aa77e89ca1 ChangeLog 8603
+RMD160 f95b7f436f0b92ce160beed72ab33d2d369dee30 ChangeLog 8603
+SHA256 6a3a9d79310f07d95686d1d622c440078880f6d6ff63c29cf017975d298bf23d ChangeLog 8603
 MISC metadata.xml 165 RMD160 1bf9089beacb19ba770d553d02356566ecd76892 SHA1 866903a1177187bfcc803fb62e0e3be2a2674481 SHA256 576ea680ccc744a6279987ce542f52f215515a2b4e95bd08c61a66bba9af1c57
 MD5 8e1fd49c29f85eea8da87d6e7de450c6 metadata.xml 165
 RMD160 1bf9089beacb19ba770d553d02356566ecd76892 metadata.xml 165
@@ -50,13 +58,13 @@ SHA256 5c9982fda1025fa621513066344919818a752774d253e0dc5966f3bf78fff99a files/di
 MD5 a879f7345cfa653ec653882d219b4234 files/digest-gammu-1.09.00 244
 RMD160 0929368f120241725727dd0511f1860e4b3cf2ef files/digest-gammu-1.09.00 244
 SHA256 804c2d37b8718f6e7ebe90ee008ca9e7b219011787ef9da288a4d38cd9fa2a05 files/digest-gammu-1.09.00 244
-MD5 5d51431f9c85b0a9aad7e3938578186f files/digest-gammu-1.10.0 241
-RMD160 e4562d22c8244b864608ae6ccf7b03c8f2af406c files/digest-gammu-1.10.0 241
-SHA256 960b834c451bea6bee63dd00e1993ff8a516ca714848ea8b37db9d74d7a7c59b files/digest-gammu-1.10.0 241
+MD5 5d51431f9c85b0a9aad7e3938578186f files/digest-gammu-1.10.0-r1 241
+RMD160 e4562d22c8244b864608ae6ccf7b03c8f2af406c files/digest-gammu-1.10.0-r1 241
+SHA256 960b834c451bea6bee63dd00e1993ff8a516ca714848ea8b37db9d74d7a7c59b files/digest-gammu-1.10.0-r1 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGCDtPJnxX6mF440QRAp0eAJ92kDyEWtumwrfwatwrg170LBcohQCeN0P9
-+uRkT0gESx3lf3jLy9ssPRs=
-=Y+aw
+iD8DBQFGDheAJnxX6mF440QRAoUMAKCYJ44UvwpWemp1SaDsocj8w+AzBgCfXS66
+0iix/GpR0CB2NV+zNlwnPEg=
+=i+0X
 -----END PGP SIGNATURE-----

diff --git a/app-mobilephone/gammu/files/digest-gammu-1.10.0 b/app-mobilephone/gammu/files/digest-gammu-1.10.0-r1
similarity index 100%
rename from app-mobilephone/gammu/files/digest-gammu-1.10.0
rename to 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 (file)
index 0000000..7b345cf
--- /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 (file)
index 0000000..6c3e8ec
--- /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
similarity index 77%
rename from app-mobilephone/gammu/gammu-1.10.0.ebuild
rename to app-mobilephone/gammu/gammu-1.10.0-r1.ebuild
index bdead82d573354b281036b3a104148f6755b0e31..bd82b28563ba757efe6bc807eb8cea62236301d5 100644 (file)
--- 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"