bump to 0.24.2

3 files changed, 81 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1fa0de46122..6d8f3f5e1b4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,29 @@
 pkgbase = obexftp
 	pkgdesc = A tool for transfer files to/from any OBEX enabled device
-	pkgver = 0.24
-	pkgrel = 12
+	pkgver = 0.24.2
+	pkgrel = 1
 	url = http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp
 	arch = x86_64
 	license = GPL
 	makedepends = cmake
 	makedepends = asciidoc
 	makedepends = xmlto
-	makedepends = fuse2
 	makedepends = swig
 	makedepends = ruby
 	makedepends = tk
 	depends = openobex
+	depends = expat
+	depends = fuse2
 	optdepends = ruby: ruby bindings
 	optdepends = tk: TCL/Tk bindings
+	provides = obexfs
+	replaces = obexfs
 	options = !makeflags
 	options = !docs
-	source = http://downloads.sourceforge.net/openobex/obexftp-0.24-Source.tar.gz
-	md5sums = 31a50dbbd09c63cbb5399772aaff7936
+	source = http://downloads.sourceforge.net/openobex/obexftp-0.24.2-Source.tar.gz
+	source = explicitly-link-libbfb-and-libmulticobex.patch
+	sha256sums = d40fb48e0a0eea997b3e582774b29f793919a625d54b87182e31a3f3d1c989a3
+	sha256sums = b2bdc9c9ad1894864d77531549be6f921f8d04344c64185ca053cc677c609a50
 
 pkgname = obexftp
 
diff --git a/PKGBUILD b/PKGBUILD
index bd9a561cb5aa..856b6dda2354 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,37 @@
-# $Id: PKGBUILD 277856 2018-01-03 07:03:59Z foutrelis $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Maintainer: xiretza <xiretza+aur@gmail.com>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 pkgname=obexftp
-pkgver=0.24
-pkgrel=12
+pkgver=0.24.2
+pkgrel=1
 pkgdesc="A tool for transfer files to/from any OBEX enabled device"
 arch=('x86_64')
 url="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
 license=('GPL')
-depends=('openobex')
-makedepends=('cmake' 'asciidoc' 'xmlto' 'fuse2' 'swig' 'ruby' 'tk')
+provides=('obexfs')
+replaces=('obexfs')
+depends=('openobex' 'expat' 'fuse2')
+makedepends=('cmake' 'asciidoc' 'xmlto' 'swig' 'ruby' 'tk')
 optdepends=('ruby: ruby bindings'
             'tk: TCL/Tk bindings')
 options=('!makeflags' '!docs')
-source=("http://downloads.sourceforge.net/openobex/${pkgname}-${pkgver}-Source.tar.gz")
-md5sums=('31a50dbbd09c63cbb5399772aaff7936')
+source=("http://downloads.sourceforge.net/openobex/${pkgname}-${pkgver}-Source.tar.gz"
+        "explicitly-link-libbfb-and-libmulticobex.patch")
+sha256sums=('d40fb48e0a0eea997b3e582774b29f793919a625d54b87182e31a3f3d1c989a3'
+            'b2bdc9c9ad1894864d77531549be6f921f8d04344c64185ca053cc677c609a50')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}-Source"
+  patch -p1 < "${srcdir}/explicitly-link-libbfb-and-libmulticobex.patch"
+}
 
 build() {
   cd "${srcdir}/"
 
   mkdir build
   cd build
-  cmake ../${pkgname}-${pkgver}-Source \
+  cmake "../${pkgname}-${pkgver}-Source" \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/explicitly-link-libbfb-and-libmulticobex.patch b/explicitly-link-libbfb-and-libmulticobex.patch
new file mode 100644
index 000000000000..78a8a7426320
--- /dev/null
+++ b/explicitly-link-libbfb-and-libmulticobex.patch
@@ -0,0 +1,53 @@
+diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
+index b5c84e4..63af134 100644
+--- a/apps/CMakeLists.txt
++++ b/apps/CMakeLists.txt
+@@ -5,14 +5,23 @@ add_definitions( -DVERSION="${obexftp_VERSION}" )
+ add_definitions ( -DHAVE_USB )
+ 
+ add_executable ( obexftp_app obexftp.c )
+-target_link_libraries ( obexftp_app obexftp )
++target_link_libraries ( obexftp_app
++  PRIVATE multicobex
++  PRIVATE bfb
++  obexftp
++)
+ set_target_properties ( obexftp_app PROPERTIES
+   OUTPUT_NAME obexftp
+ )
+ 
+ 
+ add_executable ( obexftpd_app obexftpd.c )
+-target_link_libraries ( obexftpd_app obexftp openobex )
++target_link_libraries ( obexftpd_app
++  PRIVATE multicobex
++  PRIVATE bfb
++  obexftp
++  openobex
++)
+ set_target_properties ( obexftpd_app PROPERTIES
+   OUTPUT_NAME obexftpd
+ )
+diff --git a/fuse/CMakeLists.txt b/fuse/CMakeLists.txt
+index 0c80d3d..ff5e3cd 100644
+--- a/fuse/CMakeLists.txt
++++ b/fuse/CMakeLists.txt
+@@ -13,6 +13,8 @@ if ( Fuse_FOUND )
+   )
+ 
+   target_link_libraries ( obexfs
++    PRIVATE multicobex
++    PRIVATE bfb
+     obexftp
+     ${Fuse_LIBRARIES}
+     ${EXPAT_LIBRARIES}
+@@ -23,6 +25,8 @@ if ( Fuse_FOUND )
+   )
+ 
+   target_link_libraries ( obexautofs
++    PRIVATE multicobex
++    PRIVATE bfb
+     obexftp
+     ${Fuse_LIBRARIES}
+   )
+