summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-mobilephone/obexftp/ChangeLog6
-rw-r--r--app-mobilephone/obexftp/files/obexftp-0.21-as-needed.patch33
2 files changed, 32 insertions, 7 deletions
diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog
index 5bf047737256..5f3f91d274aa 100644
--- a/app-mobilephone/obexftp/ChangeLog
+++ b/app-mobilephone/obexftp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-mobilephone/obexftp
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.23 2007/04/29 21:22:37 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.24 2007/05/01 06:29:35 mrness Exp $
+
+ 01 May 2007; Alin Năstac <mrness@gentoo.org>
+ files/obexftp-0.21-as-needed.patch:
+ Replace as-needed patch (#176264).
29 Apr 2007; Alin Năstac <mrness@gentoo.org>
+files/obexftp-0.21-as-needed.patch, obexftp-0.21.ebuild:
diff --git a/app-mobilephone/obexftp/files/obexftp-0.21-as-needed.patch b/app-mobilephone/obexftp/files/obexftp-0.21-as-needed.patch
index b949f4f51a13..15595782e0ed 100644
--- a/app-mobilephone/obexftp/files/obexftp-0.21-as-needed.patch
+++ b/app-mobilephone/obexftp/files/obexftp-0.21-as-needed.patch
@@ -1,10 +1,31 @@
+diff -Nru obexftp-0.21.orig/multicobex/Makefile.am obexftp-0.21/multicobex/Makefile.am
+--- obexftp-0.21.orig/multicobex/Makefile.am 2007-04-28 20:13:54.000000000 +0200
++++ obexftp-0.21/multicobex/Makefile.am 2007-04-30 13:39:36.000000000 +0200
+@@ -4,7 +4,7 @@
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/includes
+
+-LDADD = @OPENOBEX_LIBS@ \
++libmulticobex_la_LIBADD = @OPENOBEX_LIBS@ \
+ ../bfb/libbfb.la
+
+ multicobexincludedir = $(includedir)/multicobex
diff -Nru obexftp-0.21.orig/obexftp/Makefile.am obexftp-0.21/obexftp/Makefile.am
--- obexftp-0.21.orig/obexftp/Makefile.am 2007-04-28 20:13:54.000000000 +0200
-+++ obexftp-0.21/obexftp/Makefile.am 2007-04-28 22:25:00.000000000 +0200
-@@ -26,3 +26,6 @@
-
- libobexftp_la_LDFLAGS = -version-info $(OBEXFTP_VERSION)
++++ obexftp-0.21/obexftp/Makefile.am 2007-04-30 14:04:22.000000000 +0200
+@@ -4,11 +4,10 @@
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/includes
-+libobexftp_la_LIBADD = ../multicobex/libmulticobex.la \
+-LDADD = @OPENOBEX_LIBS@
+-# @BLUETOOTH_LIBS@ \
+-# @USB_LIBS@ \
+-# ../multicobex/libmulticobex.la \
+-# ../bfb/libbfb.la
++libobexftp_la_LIBADD = @OPENOBEX_LIBS@ \
++ @BLUETOOTH_LIBS@ \
++ ../multicobex/libmulticobex.la \
+ ../bfb/libbfb.la
-+
+
+ obexftpincludedir = $(includedir)/obexftp
+