diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2016-04-02 22:43:06 +0200 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2016-04-02 22:43:06 +0200 |
| commit | 32c64bad75e7cde881d32d7e102a6c317405ba39 (patch) | |
| tree | 0fdb35e660ab3c797b75c0b884d1380fec1f1237 /app-mobilephone/obexftp/files | |
| parent | media-plugins/gst-plugins-ximagesrc: x86 stable, bug 566378 (diff) | |
| download | gentoo-32c64bad75e7cde881d32d7e102a6c317405ba39.tar.gz gentoo-32c64bad75e7cde881d32d7e102a6c317405ba39.tar.bz2 gentoo-32c64bad75e7cde881d32d7e102a6c317405ba39.zip | |
app-mobilephone/obexftp: Force bluetooth support as it's not ready for being conditional (#529068), prevent installation on empty dir (#524866), apply multiple fixes from Fedora.
Package-Manager: portage-2.2.28
Diffstat (limited to 'app-mobilephone/obexftp/files')
3 files changed, 57 insertions, 0 deletions
diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-fuse.patch b/app-mobilephone/obexftp/files/obexftp-0.24-fuse.patch new file mode 100644 index 000000000000..260cfc2d9a56 --- /dev/null +++ b/app-mobilephone/obexftp/files/obexftp-0.24-fuse.patch @@ -0,0 +1,35 @@ +From 2cc82e0ab5a30eaab5461dcc4eed41b095edba3f Mon Sep 17 00:00:00 2001 +From: Hendrik Sattler <post@hendrik-sattler.de> +Date: Sun, 11 Aug 2013 20:27:29 +0200 +Subject: [PATCH] Install fuse apps + +--- + fuse/CMakeLists.txt | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/fuse/CMakeLists.txt b/fuse/CMakeLists.txt +index c31a5fc..7d5f7ea 100644 +--- a/fuse/CMakeLists.txt ++++ b/fuse/CMakeLists.txt +@@ -14,7 +14,6 @@ if ( Fuse_FOUND ) + ${Fuse_LIBRARIES} + ) + +- + add_executable ( obexautofs + obexautofs.c + ) +@@ -23,4 +22,10 @@ if ( Fuse_FOUND ) + obexftp + ${Fuse_LIBRARIES} + ) ++ ++ install ( TARGETS obexfs obexautofs ++ RUNTIME ++ DESTINATION ${CMAKE_INSTALL_BINDIR} ++ COMPONENT applications ++ ) + endif ( Fuse_FOUND ) +-- +1.7.1 + diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-norpath.patch b/app-mobilephone/obexftp/files/obexftp-0.24-norpath.patch new file mode 100644 index 000000000000..75a240177182 --- /dev/null +++ b/app-mobilephone/obexftp/files/obexftp-0.24-norpath.patch @@ -0,0 +1,11 @@ +--- obexftp-0.22/swig/perl/Makefile.PL.in.norpath 2007-07-11 21:22:30.000000000 +0200 ++++ obexftp-0.22/swig/perl/Makefile.PL.in 2007-08-06 20:17:39.000000000 +0200 +@@ -11,7 +11,7 @@ WriteMakefile( + 'INC' => q[-I@top_srcdir@ @CPPFLAGS@], + # Default value for LDDLFLAGS is $Config{lddlflags}="-shared -L/usr/local/lib" + # but we want rpath to be @libdir@ or @exec_prefix@/lib +- 'LDDLFLAGS' => q[-shared -Wl,-rpath=@prefix@/lib], ++ 'LDDLFLAGS' => q[-shared], + 'LIBS' => q[-L@top_builddir@/obexftp/.libs -lobexftp + -L@top_builddir@/multicobex/.libs -lmulticobex + -L@top_builddir@/bfb/.libs -lbfb diff --git a/app-mobilephone/obexftp/files/obexftp-0.24-pkgconfig_requires.patch b/app-mobilephone/obexftp/files/obexftp-0.24-pkgconfig_requires.patch new file mode 100644 index 000000000000..ded4a583330f --- /dev/null +++ b/app-mobilephone/obexftp/files/obexftp-0.24-pkgconfig_requires.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -71,7 +71,7 @@ + set ( exec_prefix "\${prefix}" ) + set ( libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}" ) + set ( includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}" ) +-set ( REQUIRES "bluetooth openobex" ) ++set ( REQUIRES "bluez openobex" ) + configure_file ( + ${CMAKE_CURRENT_SOURCE_DIR}/obexftp.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/obexftp.pc |