[Midnightbsd-cvs] mports [15909] U trunk/devel/gvfs/files: patch
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Feb 26 20:03:41 EST 2014
Revision: 15909
http://svnweb.midnightbsd.org/mports/?rev=15909
Author: laffer1
Date: 2014-02-26 20:03:40 -0500 (Wed, 26 Feb 2014)
Log Message:
-----------
patch
Modified Paths:
--------------
trunk/devel/gvfs/Makefile
trunk/devel/gvfs/files/patch-configure
Added Paths:
-----------
trunk/devel/gvfs/files/patch-config.h.in
trunk/devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c
Property Changed:
----------------
trunk/devel/gvfs/files/patch-Makefile.in
trunk/devel/gvfs/files/patch-client_Makefile.in
trunk/devel/gvfs/files/patch-client_gvfsfusedaemon.c
trunk/devel/gvfs/files/patch-configure
trunk/devel/gvfs/files/patch-daemon_gvfswritechannel.c
trunk/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c
Modified: trunk/devel/gvfs/Makefile
===================================================================
--- trunk/devel/gvfs/Makefile 2014-02-27 00:55:30 UTC (rev 15908)
+++ trunk/devel/gvfs/Makefile 2014-02-27 01:03:40 UTC (rev 15909)
@@ -2,7 +2,7 @@
PORTNAME= gvfs
PORTVERSION= 1.12.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -9,6 +9,7 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= GNOME virtual file system
+
LICENSE= lgpl
LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \
@@ -16,10 +17,9 @@
gcrypt:${PORTSDIR}/security/libgcrypt \
gnome-keyring:${PORTSDIR}/security/libgnome-keyring
-USES= gettext
+USES= gettext gmake pathfix pkgconfig
USE_XZ= yes
-USE_GNOME= glib20 gnomehack gnomeprefix intlhack intltool
-USE_GMAKE= yes
+USE_GNOME= glib20 gnomeprefix intlhack intltool
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
@@ -89,4 +89,10 @@
PLIST_SUB+= HAL="@comment "
.endif
+post-install:
+ @${STRIP_CMD} ${PREFIX}/lib/lib*.so.0
+ @${STRIP_CMD} ${PREFIX}/lib/gio/modules/lib*.so
+ @${MKDIR} ${DATADIR}/remote-volume-monitors
+ ${TOUCH} ${DATADIR}/remote-volume-monitors/.keep
+
.include <bsd.port.mk>
Index: trunk/devel/gvfs/files/patch-Makefile.in
===================================================================
--- trunk/devel/gvfs/files/patch-Makefile.in 2014-02-27 00:55:30 UTC (rev 15908)
+++ trunk/devel/gvfs/files/patch-Makefile.in 2014-02-27 01:03:40 UTC (rev 15909)
Property changes on: trunk/devel/gvfs/files/patch-Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/devel/gvfs/files/patch-client_Makefile.in
===================================================================
--- trunk/devel/gvfs/files/patch-client_Makefile.in 2014-02-27 00:55:30 UTC (rev 15908)
+++ trunk/devel/gvfs/files/patch-client_Makefile.in 2014-02-27 01:03:40 UTC (rev 15909)
Property changes on: trunk/devel/gvfs/files/patch-client_Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/devel/gvfs/files/patch-client_gvfsfusedaemon.c
===================================================================
--- trunk/devel/gvfs/files/patch-client_gvfsfusedaemon.c 2014-02-27 00:55:30 UTC (rev 15908)
+++ trunk/devel/gvfs/files/patch-client_gvfsfusedaemon.c 2014-02-27 01:03:40 UTC (rev 15909)
Property changes on: trunk/devel/gvfs/files/patch-client_gvfsfusedaemon.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Added: trunk/devel/gvfs/files/patch-config.h.in
===================================================================
--- trunk/devel/gvfs/files/patch-config.h.in (rev 0)
+++ trunk/devel/gvfs/files/patch-config.h.in 2014-02-27 01:03:40 UTC (rev 15909)
@@ -0,0 +1,12 @@
+--- config.h.in.orig 2012-05-15 20:07:21.000000000 +0200
++++ config.h.in 2014-01-17 19:49:23.000000000 +0100
+@@ -51,6 +51,9 @@
+ /* Define to 1 if gphoto2 is available */
+ #undef HAVE_GPHOTO2
+
++/* define to 1 if gphoto2.5 is available */
++#undef HAVE_GPHOTO25
++
+ /* Define to 1 if you have the `grantpt' function. */
+ #undef HAVE_GRANTPT
+
Modified: trunk/devel/gvfs/files/patch-configure
===================================================================
--- trunk/devel/gvfs/files/patch-configure 2014-02-27 00:55:30 UTC (rev 15908)
+++ trunk/devel/gvfs/files/patch-configure 2014-02-27 01:03:40 UTC (rev 15909)
@@ -1,29 +1,103 @@
---- configure.orig 2010-05-28 10:24:40.000000000 +0200
-+++ configure 2010-05-28 10:25:59.000000000 +0200
-@@ -16253,7 +16253,7 @@
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-larchive $LIBS"
-+LIBS="-larchive -lcrypto -lmd $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+--- configure.orig 2014-01-17 19:42:49.000000000 +0100
++++ configure 2014-01-17 19:43:03.000000000 +0100
+@@ -17233,6 +17233,100 @@
-@@ -16298,7 +16298,7 @@
- if test x$with_archive_libs != x/usr/lib; then
- ARCHIVE_LIBS="-L$with_archive_libs -larchive"
- else
-- ARCHIVE_LIBS="-larchive"
-+ ARCHIVE_LIBS="-larchive -lcrypto -lmd"
- fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for archive_entry_filetype in -larchive" >&5
-@@ -16307,7 +16307,7 @@
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-larchive $LIBS"
-+LIBS="-larchive -lcrypto -lmd $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+ $as_echo "#define HAVE_GPHOTO2 1" >>confdefs.h
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPHOTO2" >&5
++$as_echo_n "checking for GPHOTO2... " >&6; }
++
++if test -n "$GPHOTO2_CFLAGS"; then
++ pkg_cv_GPHOTO2_CFLAGS="$GPHOTO2_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgphoto2 >= 2.5.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libgphoto2 >= 2.5.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_GPHOTO2_CFLAGS=`$PKG_CONFIG --cflags "libgphoto2 >= 2.5.0" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$GPHOTO2_LIBS"; then
++ pkg_cv_GPHOTO2_LIBS="$GPHOTO2_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgphoto2 >= 2.5.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libgphoto2 >= 2.5.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_GPHOTO2_LIBS=`$PKG_CONFIG --libs "libgphoto2 >= 2.5.0" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GPHOTO2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgphoto2 >= 2.5.0" 2>&1`
++ else
++ GPHOTO2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgphoto2 >= 2.5.0" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GPHOTO2_PKG_ERRORS" >&5
++
++ as_fn_error $? "Package requirements (libgphoto2 >= 2.5.0) were not met:
++
++$GPHOTO2_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables GPHOTO2_CFLAGS
++and GPHOTO2_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details." "$LINENO" 5
++elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables GPHOTO2_CFLAGS
++and GPHOTO2_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details" "$LINENO" 5; }
++else
++ GPHOTO2_CFLAGS=$pkg_cv_GPHOTO2_CFLAGS
++ GPHOTO2_LIBS=$pkg_cv_GPHOTO2_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++$as_echo "#define HAVE_GPHOTO25 1" >>confdefs.h
++
++
++fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Not building with gphoto2 support. Need OS tweaks in hal volume monitor." >&5
+ $as_echo "$as_me: WARNING: Not building with gphoto2 support. Need OS tweaks in hal volume monitor." >&2;}
Property changes on: trunk/devel/gvfs/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Added: trunk/devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c
===================================================================
--- trunk/devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c (rev 0)
+++ trunk/devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c 2014-02-27 01:03:40 UTC (rev 15909)
@@ -0,0 +1,44 @@
+--- daemon/gvfsbackendgphoto2.c.orig 2012-05-16 02:01:50.000000000 +0800
++++ daemon/gvfsbackendgphoto2.c 2014-01-18 01:43:32.000000000 +0800
+@@ -1647,7 +1647,9 @@
+ return;
+ }
+
++#ifndef HAVE_GPHOTO25
+ DEBUG (" '%s' '%s' '%s'", info.name, info.path, info.library_filename);
++#endif
+
+ /* set port */
+ rc = gp_camera_set_port_info (gphoto2_backend->camera, info);
+@@ -2590,7 +2592,11 @@
+ }
+ }
+
++#ifdef HAVE_GPHOTO25
++ rc = gp_camera_folder_put_file (gphoto2_backend->camera, dir, new_name, GP_FILE_TYPE_NORMAL, file_dest, gphoto2_backend->context);
++#else
+ rc = gp_camera_folder_put_file (gphoto2_backend->camera, dir, file_dest, gphoto2_backend->context);
++#endif
+ if (rc != 0)
+ goto out;
+
+@@ -3222,14 +3228,18 @@
+ if (rc != 0)
+ goto out;
+
+- gp_file_set_type (file, GP_FILE_TYPE_NORMAL);
+ gp_file_set_name (file, write_handle->name);
+ gp_file_set_mtime (file, time (NULL));
+ gp_file_set_data_and_size (file,
+ dup_for_gphoto2 (write_handle->data, write_handle->size),
+ write_handle->size);
+
++#ifdef HAVE_GPHOTO25
++ rc = gp_camera_folder_put_file (gphoto2_backend->camera, write_handle->dir, write_handle->name, GP_FILE_TYPE_NORMAL, file, gphoto2_backend->context);
++#else
++ gp_file_set_type (file, GP_FILE_TYPE_NORMAL);
+ rc = gp_camera_folder_put_file (gphoto2_backend->camera, write_handle->dir, file, gphoto2_backend->context);
++#endif
+ if (rc != 0)
+ {
+ gp_file_unref (file);
Index: trunk/devel/gvfs/files/patch-daemon_gvfswritechannel.c
===================================================================
--- trunk/devel/gvfs/files/patch-daemon_gvfswritechannel.c 2014-02-27 00:55:30 UTC (rev 15908)
+++ trunk/devel/gvfs/files/patch-daemon_gvfswritechannel.c 2014-02-27 01:03:40 UTC (rev 15909)
Property changes on: trunk/devel/gvfs/files/patch-daemon_gvfswritechannel.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c
===================================================================
--- trunk/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c 2014-02-27 00:55:30 UTC (rev 15908)
+++ trunk/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c 2014-02-27 01:03:40 UTC (rev 15909)
Property changes on: trunk/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list