Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-mobilephone/obexftp/files: obexftp-0.23-gentoo.patch
Date: Sun, 22 Mar 2009 16:53:17
Message-Id: E1LlQux-0004mX-Hh@stork.gentoo.org
1 mrness 09/03/22 16:52:59
2
3 Added: obexftp-0.23-gentoo.patch
4 Log:
5 Fix compile error when bluetooth support is disabled.
6 (Portage version: 2.1.6.7/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch?rev=1.1&content-type=text/plain
13
14 Index: obexftp-0.23-gentoo.patch
15 ===================================================================
16 diff -Nru obexftp-0.23.orig/obexftp/client.c obexftp-0.23/obexftp/client.c
17 --- obexftp-0.23.orig/obexftp/client.c 2009-02-17 18:27:48.000000000 +0000
18 +++ obexftp-0.23/obexftp/client.c 2009-03-22 16:12:05.000000000 +0000
19 @@ -51,8 +51,6 @@
20
21 #ifdef HAVE_BLUETOOTH
22 #include "bt_kit.h"
23 -#else
24 -#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
25 #endif /* HAVE_BLUETOOTH */
26
27 #include <openobex/obex.h>
28 diff -Nru obexftp-0.23.orig/apps/obexftp.c obexftp-0.23/apps/obexftp.c
29 --- obexftp-0.23.orig/apps/obexftp.c 2009-02-17 18:27:48.000000000 +0000
30 +++ obexftp-0.23/apps/obexftp.c 2009-03-22 16:19:29.000000000 +0000
31 @@ -29,6 +29,8 @@
32
33 #include <sys/types.h>
34
35 +#include <config.h>
36 +
37 #ifdef HAVE_SYS_TIMES_H
38 #include <sys/times.h>
39 #endif
40 diff -Nru obexftp-0.23.orig/swig/ruby/extconf.rb obexftp-0.23/swig/ruby/extconf.rb
41 --- obexftp-0.23.orig/swig/ruby/extconf.rb 2009-02-17 18:27:48.000000000 +0000
42 +++ obexftp-0.23/swig/ruby/extconf.rb 2009-03-22 16:19:56.000000000 +0000
43 @@ -21,10 +21,6 @@
44 end
45
46 dir_config('obexftp')
47 -if have_library('openobex', 'OBEX_Init') and
48 - find_library('bfb', 'bfb_io_open', '../../bfb/.libs') and
49 - find_library('multicobex', 'cobex_ctrans', '../../multicobex/.libs') and
50 - find_library('obexftp', 'obexftp_open', '../../obexftp/.libs')
51 create_makefile('obexftp')
52
53 # hack 2: strip all rpath references
54 @@ -33,7 +29,3 @@
55 out.puts line.gsub(/-Wl,-R'[^']*'/, '')
56 end
57 end
58 -else
59 - puts 'obex libs not found'
60 -end
61 -