obexftp: fix install.

BlackArch · Nov 17, 2024 · ce3ef75 · ce3ef75
1 parent 4db043b
commit ce3ef75
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 4 deletions.
diff --git a/packages/obexftp/PKGBUILD b/packages/obexftp/PKGBUILD
@@ -8,13 +8,21 @@ pkgdesc='A tool for transfer files to/from any OBEX enabled device.'
 arch=('x86_64' 'aarch64')
 url='http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp'
 license=('GPL')
-depends=('openobex')
+depends=('openobex' 'expat' 'fuse2')
 makedepends=('cmake' 'asciidoc' 'xmlto' 'fuse2' '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")
-sha512sums=('91a5d7e52c00bbaf24837384ceadc987a89297e672b246df1370bbd669fae05459281bc46bb60ba562607bfbead321926cdf11422059cd918819d80321e190c2')
+source=("http://downloads.sourceforge.net/openobex/$pkgname-$pkgver-Source.tar.gz"
+        'explicitly-link-libbfb-and-libmulticobex.patch')
+sha512sums=('91a5d7e52c00bbaf24837384ceadc987a89297e672b246df1370bbd669fae05459281bc46bb60ba562607bfbead321926cdf11422059cd918819d80321e190c2'
+            '0f7bf40bde282faa6e6c5fc9bab4d5f4d95c9c09581b2e5bfa2f7490714da09c41c3b02789c3ddd7bb2be5d5960aa59587796685a4a250b7f60095237ce77eba')
+
+prepare() {
+  cd "$pkgname-$pkgver-Source"
+
+  patch -p1 < "$srcdir/explicitly-link-libbfb-and-libmulticobex.patch"
+}
 
 build() {
   mkdir -p build
@@ -23,12 +31,15 @@ build() {
 
   cmake "../$pkgname-$pkgver-Source" \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=OFF \
+    -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_INSTALL_SBINDIR=bin \
     -DENABLE_PERL=YES \
     -DENABLE_PYTHON=YES \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+    -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 \
+    -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
     -DENABLE_RUBY=YES \
     -DENABLE_TCL=YES
 

diff --git a/packages/obexftp/explicitly-link-libbfb-and-libmulticobex.patch b/packages/obexftp/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}
+   )
+