jer 14/09/14 14:13:05
Modified: obexftp-0.23-fixruby.patch
obexftp-0.23-gentoo.patch
Added: obexftp-0.24-python_sitedir.patch
obexftp-0.24-config.patch
obexftp-0.24-enable_bluetooth.patch
Log:
Version bump (bug #522750).
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.2 app-mobilephone/obexftp/files/obexftp-0.23-fixruby.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.23-fixruby.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.23-fixruby.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.23-fixruby.patch?r1=1.1&r2=1.2
Index: obexftp-0.23-fixruby.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.23-fixruby.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- obexftp-0.23-fixruby.patch 11 Jun 2009 16:06:31 -0000 1.1
+++ obexftp-0.23-fixruby.patch 14 Sep 2014 14:13:05 -0000 1.2
@@ -1,7 +1,5 @@
-Index: obexftp-0.23/swig/ruby/Makefile.am
-===================================================================
---- obexftp-0.23.orig/swig/ruby/Makefile.am
-+++ obexftp-0.23/swig/ruby/Makefile.am
+--- a/swig/ruby/Makefile.am
++++ b/swig/ruby/Makefile.am
@@ -12,7 +12,7 @@ Makefile.ruby: extconf.rb
PREFIX=$(prefix) $(RUBY) $< --with-obexftp-include=$(top_srcdir)
1.3 app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch?r1=1.2&r2=1.3
Index: obexftp-0.23-gentoo.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- obexftp-0.23-gentoo.patch 11 Jun 2009 16:06:31 -0000 1.2
+++ obexftp-0.23-gentoo.patch 14 Sep 2014 14:13:05 -0000 1.3
@@ -1,6 +1,5 @@
-diff -Nru obexftp-0.23.orig/obexftp/client.c obexftp-0.23/obexftp/client.c
---- obexftp-0.23.orig/obexftp/client.c 2009-02-17 18:27:48.000000000 +0000
-+++ obexftp-0.23/obexftp/client.c 2009-03-22 16:12:05.000000000 +0000
+--- a/obexftp/client.c
++++ b/obexftp/client.c
@@ -51,8 +51,6 @@
#ifdef HAVE_BLUETOOTH
@@ -10,9 +9,8 @@
#endif /* HAVE_BLUETOOTH */
#include <openobex/obex.h>
-diff -Nru obexftp-0.23.orig/apps/obexftp.c obexftp-0.23/apps/obexftp.c
---- obexftp-0.23.orig/apps/obexftp.c 2009-02-17 18:27:48.000000000 +0000
-+++ obexftp-0.23/apps/obexftp.c 2009-03-22 16:19:29.000000000 +0000
+--- a/apps/obexftp.c
++++ b/apps/obexftp.c
@@ -29,6 +29,8 @@
#include <sys/types.h>
1.1
app-mobilephone/obexftp/files/obexftp-0.24-python_sitedir.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.24-python_sitedir.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.24-python_sitedir.patch?rev=1.1&content-type=text/plain
Index: obexftp-0.24-python_sitedir.patch
===================================================================
--- a/swig/python/CMakeLists.txt
+++ b/swig/python/CMakeLists.txt
@@ -40,11 +40,13 @@
OUTPUT_VARIABLE PYTHON_PREFIX
)
file ( TO_CMAKE_PATH "${PYTHON_PREFIX}" PYTHON_PREFIX )
+if ( NOT PYTHON_SITE_DIR )
execute_process (
COMMAND ${PYTHON_EXECUTABLE} -c
"import site, sys; sys.stdout.write(site.getsitepackages()[-1])"
OUTPUT_VARIABLE PYTHON_SITE_DIR
)
+endif ( PYTHON_SITE_DIR )
file ( TO_CMAKE_PATH "${PYTHON_SITE_DIR}" PYTHON_SITE_DIR )
string ( REGEX REPLACE "^${PYTHON_PREFIX}/" ""
PYTHON_SITE_DIR "${PYTHON_SITE_DIR}"
1.1 app-mobilephone/obexftp/files/obexftp-0.24-config.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.24-config.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.24-config.patch?rev=1.1&content-type=text/plain
Index: obexftp-0.24-config.patch
===================================================================
--- a/apps/obexftp.c
+++ b/apps/obexftp.c
@@ -43,8 +43,6 @@
#include <common.h>
-#include <config.h>
-
#ifdef HAVE_SYS_TIMES_H
#include <sys/times.h>
#endif
1.1
app-mobilephone/obexftp/files/obexftp-0.24-enable_bluetooth.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.24-enable_bluetooth.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/obexftp/files/obexftp-0.24-enable_bluetooth.patch?rev=1.1&content-type=text/plain
Index: obexftp-0.24-enable_bluetooth.patch
===================================================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,11 +52,13 @@
#
# some code is only included if bluetooth is available
#
+if ( ENABLE_BLUETOOTH )
find_package ( Bluetooth )
if ( Bluetooth_FOUND )
include_directories ( ${Bluetooth_INCLUDE_DIRS} )
add_definitions ( -DHAVE_BLUETOOTH -DHAVE_SDP )
endif ( Bluetooth_FOUND )
+endif ( ENABLE_BLUETOOTH )
add_subdirectory ( bfb )
add_subdirectory ( multicobex )
