update obexftp to latest stable version

6 files changed, 23 insertions, 51 deletions

diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile
index 5cea2518e..53dda3cb0 100644
--- a/package/obexftp/Makefile
+++ b/package/obexftp/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		obexftp
-PKG_VERSION:=		0.23
-PKG_RELEASE:=		4
-PKG_HASH:=		44a74ff288d38c0f75354d6bc2efe7d6dec10112eaff2e7b10e292b0d2105b36
+PKG_VERSION:=		0.24
+PKG_RELEASE:=		1
+PKG_HASH:=		b907965608bf0e60c69bc45f074ce1a2ffeb809b4502a7082c6d95e3c73dfe6b
 PKG_DESCR:=		bluetooth ftp application
 PKG_SECTION:=		sys/misc
 PKG_DEPENDS:=		openobex libobexftp
@@ -20,24 +20,15 @@ PKG_SUBPKGS:=		OBEXFTP LIBOBEXFTP
 PKGSC_LIBOBEXFTP:=	libs/net
 PKGSD_LIBOBEXFTP:=	obex ftp library
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}-Source.tar.gz
+WRKDIST=		$(WRKDIR)/${PKG_NAME}-${PKG_VERSION}-Source
 
 include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,OBEXFTP,obexftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBOBEXFTP,libobexftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBOBEXFTP},${PKGSC_LIBOBEXFTP},${PKG_OPTS}))
 
-ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
-XAKE_FLAGS+=		STATIC_CFLAGS=-all-static
-endif
-
-CONFIGURE_ENV+=		OPENOBEX_CFLAGS="-I${STAGING_TARGET_DIR}/usr/include" \
-			OPENOBEX_LIBS="-L${STAGING_TARGET_DIR}/usr/lib \
-			    -lopenobex -liconv"
-CONFIGURE_ARGS+=	--disable-perl \
-			--disable-ruby \
-			--disable-tcl \
-			--disable-python
+CONFIG_STYLE:=          cmake
 
 obexftp-install:
 	${INSTALL_DIR} ${IDIR_OBEXFTP}/usr/bin
diff --git a/package/obexftp/patches/patch-apps_Makefile_in b/package/obexftp/patches/patch-apps_Makefile_in
deleted file mode 100644
index b1b463899..000000000
--- a/package/obexftp/patches/patch-apps_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- obexftp-0.23.orig/apps/Makefile.in	2009-02-17 19:28:04.000000000 +0100
-+++ obexftp-0.23/apps/Makefile.in	2009-11-22 20:11:46.056591008 +0100
-@@ -77,7 +77,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(STATIC_CFLAGS) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(discovery_SOURCES) $(obexftp_SOURCES) $(obexftpd_SOURCES)
- DIST_SOURCES = $(discovery_SOURCES) $(obexftp_SOURCES) \
diff --git a/package/obexftp/patches/patch-configure b/package/obexftp/patches/patch-configure
deleted file mode 100644
index f9102ae87..000000000
--- a/package/obexftp/patches/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- obexftp-0.23.orig/configure	2009-02-17 19:28:02.000000000 +0100
-+++ obexftp-0.23/configure	2009-06-04 21:52:11.000000000 +0200
-@@ -22551,7 +22551,7 @@ fi
- if test "$ac_bluetooth_enabled" = yes; then
- 
-         case $host in
--        *-*-linux*)
-+        *)
- 
- 
- pkg_failed=no
diff --git a/package/obexftp/patches/patch-ltmain_sh b/package/obexftp/patches/patch-ltmain_sh
deleted file mode 100644
index 2f96170e4..000000000
--- a/package/obexftp/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- obexftp-0.23.orig/ltmain.sh	2008-02-08 01:54:46.000000000 +0100
-+++ obexftp-0.23/ltmain.sh	2011-01-16 13:40:07.000000000 +0100
-@@ -1676,7 +1676,7 @@ EOF
-       # -F/path gives path to uninstalled frameworks, gcc on darwin
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.
diff --git a/package/obexftp/patches/patch-obexftp_CMakeLists_txt b/package/obexftp/patches/patch-obexftp_CMakeLists_txt
new file mode 100644
index 000000000..8e3e65526
--- /dev/null
+++ b/package/obexftp/patches/patch-obexftp_CMakeLists_txt
@@ -0,0 +1,14 @@
+--- obexftp-0.24-Source.orig/obexftp/CMakeLists.txt	2013-03-05 21:43:50.000000000 +0100
++++ obexftp-0.24-Source/obexftp/CMakeLists.txt	2015-06-10 16:41:41.000000000 +0200
+@@ -24,11 +24,6 @@ set ( obexftp_HEADERS
+   ${obexftp_PUBLIC_HEADERS}
+ )
+ 
+-find_package ( Iconv REQUIRED )
+-add_definitions ( -DHAVE_ICONV )
+-if ( ICONV_USES_CONST )
+-  add_definitions ( -DICONV_CONST=const )
+-endif ( ICONV_USES_CONST )
+ find_file ( HAVE_LANGINFO_H NAMES langinfo.h )
+ if ( HAVE_LANGINFO_H )
+   add_definitions ( -DHAVE_LANGINFO_H )
diff --git a/package/obexftp/patches/patch-obexftp_client_c b/package/obexftp/patches/patch-obexftp_client_c
index f4c90143b..89adf344c 100644
--- a/package/obexftp/patches/patch-obexftp_client_c
+++ b/package/obexftp/patches/patch-obexftp_client_c
@@ -1,6 +1,6 @@
---- obexftp-0.23.orig/obexftp/client.c	2009-02-17 19:27:48.000000000 +0100
-+++ obexftp-0.23/obexftp/client.c	2013-12-22 09:35:39.000000000 +0100
-@@ -51,8 +51,6 @@
+--- obexftp-0.24-Source.orig/obexftp/client.c	2013-03-05 21:43:50.000000000 +0100
++++ obexftp-0.24-Source/obexftp/client.c	2015-06-10 16:35:52.000000000 +0200
+@@ -47,8 +47,6 @@
  
  #ifdef HAVE_BLUETOOTH
  #include "bt_kit.h"