[gentoo-commits] gentoo-x86 commit in net-misc/smbc/files: smbc-1.2.2-cflags.patch smbc-1.2.2-size_t.patch

[Jeroen Roovers (jer)]

jer         09/04/28 17:13:09

  Added:                smbc-1.2.2-cflags.patch smbc-1.2.2-size_t.patch
  Log:
  Convert to EAPI=2. Run autoreconf. Do not DEPEND on system packages. Set RDEPEND. Use CFLAGS. Remove separator comments. Apply Debian patch to build on amd64. Marked ~hppa too.
  (Portage version: 2.2_rc31/cvs/Linux i686)

Revision  Changes    Path
1.1                  net-misc/smbc/files/smbc-1.2.2-cflags.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/smbc/files/smbc-1.2.2-cflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/smbc/files/smbc-1.2.2-cflags.patch?rev=1.1&content-type=text/plain

Index: smbc-1.2.2-cflags.patch
===================================================================
Do not define CFLAGS

--- smbc-1.2.2/src/Makefile.am.orig	2005-06-29 14:14:02.000000000 +0200
+++ smbc-1.2.2/src/Makefile.am	2009-04-28 18:18:26.000000000 +0200
@@ -18,7 +18,7 @@
               smb-ext.c smb-ext.h
 
 smbc_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wall
-CFLAGS = -O3
+#CFLAGS = -O3
 
 if GDB
   smbc_CFLAGS += -ggdb -g



1.1                  net-misc/smbc/files/smbc-1.2.2-size_t.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/smbc/files/smbc-1.2.2-size_t.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/smbc/files/smbc-1.2.2-size_t.patch?rev=1.1&content-type=text/plain

Index: smbc-1.2.2-size_t.patch
===================================================================
Patch to enable running on amd64 (borrowed from http://bugs.debian.org/366580)

--- smbc-1.2.2.orig/src/convert.c
+++ smbc-1.2.2/src/convert.c
@@ -98,8 +98,9 @@
 
   char *inbuf  = (char*) src;
   char *outbuf = param->dst;
-  int  inbytesleft  = src_len - 1;
-  int  outbytesleft = param->dst_len - 1;
+  /* iconv requires size_t and not int ! */
+  size_t  inbytesleft  = src_len - 1;
+  size_t  outbytesleft = param->dst_len - 1;
   bzero(param->dst, param->dst_len);
   // Need some error handling here
   iconv(param->cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);