From 6ee1f9ab0fbde2e02427f186561fe92d22095a9c Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Sun, 24 Nov 2019 21:41:10 -0600 Subject: [PATCH] obexftp: unmark nocross Signed-off-by: Nathan Owens --- srcpkgs/obexftp/patches/fix-cross.patch | 50 +++++++++++++++++++++++++ srcpkgs/obexftp/template | 4 +- 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/srcpkgs/obexftp/patches/fix-cross.patch b/srcpkgs/obexftp/patches/fix-cross.patch index 6f28fd9450..2e0acf2557 100644 --- a/srcpkgs/obexftp/patches/fix-cross.patch +++ b/srcpkgs/obexftp/patches/fix-cross.patch @@ -27,3 +27,53 @@ index 008241d..be233aa 100644 add_library ( bfb +diff --git apps/CMakeLists.txt apps/CMakeLists.txt +index b5c84e4..e43aaeb 100644 +--- apps/CMakeLists.txt ++++ apps/CMakeLists.txt +@@ -5,14 +5,21 @@ 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 ++ multicobex ++ 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 ++ multicobex ++ bfb ++ obexftp ++ openobex ) + set_target_properties ( obexftpd_app PROPERTIES + OUTPUT_NAME obexftpd + ) +diff --git fuse/CMakeLists.txt fuse/CMakeLists.txt +index 0c80d3d..bba052b 100644 +--- fuse/CMakeLists.txt ++++ fuse/CMakeLists.txt +@@ -14,6 +14,8 @@ if ( Fuse_FOUND ) + + target_link_libraries ( obexfs + obexftp ++ multicobex ++ bfb + ${Fuse_LIBRARIES} + ${EXPAT_LIBRARIES} + ) +@@ -24,6 +26,8 @@ if ( Fuse_FOUND ) + + target_link_libraries ( obexautofs + obexftp ++ multicobex ++ bfb + ${Fuse_LIBRARIES} + ) + diff --git a/srcpkgs/obexftp/template b/srcpkgs/obexftp/template index 2990176ac7..9e4123be13 100644 --- a/srcpkgs/obexftp/template +++ b/srcpkgs/obexftp/template @@ -8,13 +8,11 @@ hostmakedepends="pkg-config" makedepends="openobex-devel fuse-devel libbluetooth-devel expat-devel" short_desc="OBEX transfer utilities" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-only" homepage="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp" distfiles="${SOURCEFORGE_SITE}/openobex/${pkgname}-${version}-Source.tar.gz" checksum=d40fb48e0a0eea997b3e582774b29f793919a625d54b87182e31a3f3d1c989a3 -nocross="undefined reference to 'cobex_ctrans'" - post_install() { # Do not require 'bluetooth', does not exist. sed -i '/Requires:/s/bluetooth//' ${DESTDIR}/usr/lib/pkgconfig/obexftp.pc