diff --git a/obexftp/PKGBUILD b/obexftp/PKGBUILD index 3f3310c06..5c815f31e 100644 --- a/obexftp/PKGBUILD +++ b/obexftp/PKGBUILD @@ -12,8 +12,15 @@ provides=("obexfs=${pkgver}") replaces=('obexfs') conflicts=('obexfs') options=('!makeflags' '!docs') -source=(http://downloads.sourceforge.net/sourceforge/openobex/${pkgname}-${pkgver}-Source.tar.gz) -md5sums=('157a9d1b2ed220203f7084db906de73c') +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}/" diff --git a/obexftp/explicitly-link-libbfb-and-libmulticobex.patch b/obexftp/explicitly-link-libbfb-and-libmulticobex.patch new file mode 100644 index 000000000..78a8a7426 --- /dev/null +++ b/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} + ) + diff --git a/openobex/PKGBUILD b/openobex/PKGBUILD index 9ad8b2521..f0ad963ef 100644 --- a/openobex/PKGBUILD +++ b/openobex/PKGBUILD @@ -1,36 +1,34 @@ # # Platform Packages for Chakra, part of chakra-project.org # -# maintainer: Fabian Kosmale -# contributor (i686): Phil Miller -# contributor (x86_64): Manuel Tortosa pkgname=openobex -pkgver=1.7.1 +pkgver=1.7.2 pkgrel=1 pkgdesc="Implementation of the OBject EXchange (OBEX) protocol" url="http://dev.zuckschwerdt.org/openobex/" arch=('x86_64') license=('GPL' 'LGPL') depends=('libusbx' 'bluez-libs') -makedepends=('cmake' 'libxslt' 'docbook-xsl') +makedepends=('cmake' 'libxslt' 'doxygen' 'java-environment') options=('staticlibs' '!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-Source.tar.gz) -md5sums=('3181bfed9cb7db591605391068cb0085') +md5sums=('f6e0b6cb7dcfd731460a7e9a91429a3a') prepare() { sed -i 's|MODE="660", GROUP="plugdev"|TAG+="uaccess"|' ${pkgname}-${pkgver}-Source/udev/openobex.rules.in } build() { - [ -d build ] && rm -r build mkdir build cd build cmake ../${pkgname}-${pkgver}-Source \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_SBINDIR=/usr/bin \ + -DCMAKE_INSTALL_UDEVRULESDIR=/usr/lib/udev/rules.d make all openobex-apps }